diff --git a/step-web/src/main/webapp/downloads.jsp b/step-web/src/main/webapp/downloads.jsp
index f6a98ce2fa..245f3a41d4 100644
--- a/step-web/src/main/webapp/downloads.jsp
+++ b/step-web/src/main/webapp/downloads.jsp
@@ -130,7 +130,7 @@
.h {
font-weight: bold;
font-size: 36px;
- line-height: 1;
+ line-height: 1;
}
.p {
@@ -328,7 +328,8 @@ Note: Some users have experienced issues on later versions of Android (e.g., ve
else if (region === "region_asia_pacific") path = "https://stepbible-ap.s3-ap-southeast-1.amazonaws.com/";
else console.log("Unknown region selected: " + region);
var downloadPath = path + fileName + "." + fileExtension;
- window.location.href = downloadPath;
+ window.open(downloadPath)
+ window.location.href = "http://step.stepbible.org/verifyDownload.jsp#" + os.replace(/_.*$/,"");
}
else if (clickItemID === "exeInstruction") {
var os = $( "#step_os option:selected" ).val();
diff --git a/step-web/src/main/webapp/images/VerifyLinux.png b/step-web/src/main/webapp/images/VerifyLinux.png
new file mode 100644
index 0000000000..1784a720b1
Binary files /dev/null and b/step-web/src/main/webapp/images/VerifyLinux.png differ
diff --git a/step-web/src/main/webapp/images/VerifyMac1.png b/step-web/src/main/webapp/images/VerifyMac1.png
new file mode 100644
index 0000000000..2863a5b56f
Binary files /dev/null and b/step-web/src/main/webapp/images/VerifyMac1.png differ
diff --git a/step-web/src/main/webapp/images/VerifyMac2.png b/step-web/src/main/webapp/images/VerifyMac2.png
new file mode 100644
index 0000000000..e3b4ecd3ef
Binary files /dev/null and b/step-web/src/main/webapp/images/VerifyMac2.png differ
diff --git a/step-web/src/main/webapp/images/VerifyWindows1.png b/step-web/src/main/webapp/images/VerifyWindows1.png
new file mode 100644
index 0000000000..472b5f0928
Binary files /dev/null and b/step-web/src/main/webapp/images/VerifyWindows1.png differ
diff --git a/step-web/src/main/webapp/images/VerifyWindows2.png b/step-web/src/main/webapp/images/VerifyWindows2.png
new file mode 100644
index 0000000000..06237adc5c
Binary files /dev/null and b/step-web/src/main/webapp/images/VerifyWindows2.png differ
diff --git a/step-web/src/main/webapp/images/VerifyWindows3.png b/step-web/src/main/webapp/images/VerifyWindows3.png
new file mode 100644
index 0000000000..997603eff9
Binary files /dev/null and b/step-web/src/main/webapp/images/VerifyWindows3.png differ
diff --git a/step-web/src/main/webapp/verifyDownload.jsp b/step-web/src/main/webapp/verifyDownload.jsp
new file mode 100644
index 0000000000..fc71df81fd
--- /dev/null
+++ b/step-web/src/main/webapp/verifyDownload.jsp
@@ -0,0 +1,312 @@
+<%@page import="java.io.FileReader"%>
+<%@page import="java.io.BufferedReader"%>
+<%@ page import="com.google.inject.Injector" %>
+<%@ page import="java.util.Locale" %>
+<%@ page import="javax.servlet.jsp.jstl.core.Config" %>
+<%@ page import="com.tyndalehouse.step.core.service.AppManagerService" %>
+<%@ page import="com.tyndalehouse.step.core.models.ClientSession" %>
+<%@ page import="com.tyndalehouse.step.rest.controllers.SearchPageController" %>
+<%@ page contentType="text/html; charset=UTF-8" language="java" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%!
+ public String downloadVersion;
+ public String sha256sum_deb;
+ public String sha256sum_rpm;
+%>
+<%
+ if (downloadVersion == null) {
+ downloadVersion = "";
+ sha256sum_deb = "";
+ sha256sum_rpm = "";
+
+ try {
+ String pathOfServlet = getServletContext().getRealPath("/");
+ String[] pathOfServletSplits = pathOfServlet.split("[\\\\\\/]"); // Either \ for Windows or / characters for Linux
+ pathOfServlet = "/var/www/" + pathOfServletSplits[pathOfServletSplits.length - 1] + "_config.txt";
+ String prefixForThisTomcatContext = "DOWNLOAD_VERSION:";
+ String DebSHAString = "DEB_SHA256:";
+ String RpmSHAString = "RPM_SHA256:";
+ BufferedReader reader = new BufferedReader(new FileReader(pathOfServlet));
+ String line;
+ while ((line = reader.readLine()) != null) {
+ if (line.indexOf(prefixForThisTomcatContext) == 0) {
+ downloadVersion = line.substring(prefixForThisTomcatContext.length());
+ }
+ if (line.indexOf(DebSHAString) == 0) {
+ sha256sum_deb = line.substring(DebSHAString.length());
+ }
+ if (line.indexOf(RpmSHAString) == 0) {
+ sha256sum_rpm = line.substring(RpmSHAString.length());
+ }
+ }
+ reader.close();
+ }
+ catch (Exception e) {
+ downloadVersion = "";
+ sha256sum_deb = "";
+ sha256sum_rpm = "";
+ }
+ }
+
+ Injector injector = (Injector) pageContext.getServletContext().getAttribute(Injector.class.getName());
+ Locale locale = injector.getInstance(ClientSession.class).getLocale();
+ Config.set(session, Config.FMT_LOCALE, locale);
+ AppManagerService appManager = injector.getInstance(AppManagerService.class);
+ request.setAttribute("analyticsToken", Boolean.TRUE.equals(Boolean.getBoolean("step.development")) ? SearchPageController.DEV_TOKEN : SearchPageController.LIVE_TOKEN);
+%>
+
How to verify the STEPBible installer for Windows
+
+ The stepbible_<%= downloadVersion %>.exe file has been signed with a digital certificate to prove its authenticity.
+
+ + |
+ + | + + | +
+
|
+ + | + + | +
+
+ + If this is not what is displayed, do not run the executable. Instead, contact feedback@stepbible.org. + + + |
+ + | + + | +
How to verify the STEPBible installer for MacOS
+ + The MacOS download file can be verified as follows: +
+ + |
+ + | + + | +
+ +
+ + If this message is not present, do not continue. Instead, contact feedback@stepbible.org. + + + |
+ + | + + | +
How to verify the STEPBible installer for Linux
+ + The Linux download files can be verified by checking the sha256sum of the file, as follows: +
+ + + + stepbible_<%= downloadVersion %>.deb: +<%= sha256sum_deb %> ++ stepbible_<%= downloadVersion %>.rpm: +<%= sha256sum_rpm %> ++ + If your sha256sum does not match, do not run the executable. Instead, contact feedback@stepbible.org. + + |
+ + | + + | +