greengerong#44 added provision for specifying protocol

prontoitlabs · prontoitlabs · commit f1297bbca600 · 2018-04-29T01:19:14.000+05:30
diff --git a/README.md b/README.md
@@ -54,6 +54,9 @@ example: someproxy,someproxy1
 Important for servers behind reverse proxy that need the public url to be used for pre-rendering.
 We usually set the original url in an http header which is added by the reverse proxy (similar to the more standard `x-forwarded-proto` and `x-forwarded-for`)
 
+### protocol
+If you specifically want to make sure that the Prerender service queries using http or https protocol, you can set the init-param `protocol` to `https` or `http` respectively.
+
 ### Using your own prerender service
 
 If you've deployed the prerender service on your own, set the `PRERENDER_SERVICE_URL` environment variable so that this package points there instead. Otherwise, it will default to the service already deployed at `http://service.prerender.io/`
diff --git a/src/main/java/com/github/greengerong/PreRenderSEOFilter.java b/src/main/java/com/github/greengerong/PreRenderSEOFilter.java
@@ -1,20 +1,23 @@
 package com.github.greengerong;
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 
 public class PreRenderSEOFilter implements Filter {
     public static final List<String> PARAMETER_NAMES = Lists.newArrayList("preRenderEventHandler", "proxy", "proxyPort",
             "prerenderToken", "forwardedURLHeader", "crawlerUserAgents", "extensionsToIgnore", "whitelist",
-            "blacklist", "prerenderServiceUrl");
+            "blacklist", "prerenderServiceUrl", "protocol");
     private PrerenderSeoService prerenderSeoService;
 
     @Override
diff --git a/src/main/java/com/github/greengerong/PrerenderConfig.java b/src/main/java/com/github/greengerong/PrerenderConfig.java
@@ -79,6 +79,10 @@ public String getPrerenderToken() {
     public String getForwardedURLHeader() {
         return config.get("forwardedURLHeader");
     }
+    
+    public String getProtocol() {
+        return config.get("protocol");
+    }
 
     public List<String> getCrawlerUserAgents() {
         List<String> crawlerUserAgents = Lists.newArrayList("baiduspider",
diff --git a/src/main/java/com/github/greengerong/PrerenderSeoService.java b/src/main/java/com/github/greengerong/PrerenderSeoService.java
@@ -179,12 +179,16 @@ private void copyRequestHeaders(HttpServletRequest servletRequest, HttpRequest p
     }
 
     private String getRequestURL(HttpServletRequest request) {
-        if (prerenderConfig.getForwardedURLHeader() != null) {
+        if (StringUtils.isNotEmpty(prerenderConfig.getForwardedURLHeader())) {
             String url = request.getHeader(prerenderConfig.getForwardedURLHeader());
-            if (url != null) {
+            if (StringUtils.isNotEmpty(url)) {
                 return url;
             }
         }
+        if (StringUtils.isNotEmpty(prerenderConfig.getProtocol())) {
+            String url = request.getRequestURL().toString();
+            return url.replace(request.getScheme(), prerenderConfig.getProtocol());
+        }
         return request.getRequestURL().toString();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -179,12 +179,16 @@ private void copyRequestHeaders(HttpServletRequest servletRequest, HttpRequest p`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`private String getRequestURL(HttpServletRequest request) {`
`182`		`- if (prerenderConfig.getForwardedURLHeader() != null) {`
	`182`	`+ if (StringUtils.isNotEmpty(prerenderConfig.getForwardedURLHeader())) {`
`183`	`183`	`String url = request.getHeader(prerenderConfig.getForwardedURLHeader());`
`184`		`- if (url != null) {`
	`184`	`+ if (StringUtils.isNotEmpty(url)) {`
`185`	`185`	`return url;`
`186`	`186`	`}`
`187`	`187`	`}`
	`188`	`+ if (StringUtils.isNotEmpty(prerenderConfig.getProtocol())) {`
	`189`	`+ String url = request.getRequestURL().toString();`
	`190`	`+ return url.replace(request.getScheme(), prerenderConfig.getProtocol());`
	`191`	`+ }`
`188`	`192`	`return request.getRequestURL().toString();`
`189`	`193`	`}`
`190`	`194`