[Yanel-commits] rev 44460 - public/yanel/trunk/src/contributions/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw

[michi at wyona.com]

Author: michi
Date: 2009-08-28 09:49:44 +0200 (Fri, 28 Aug 2009)
New Revision: 44460

Modified:
   public/yanel/trunk/src/contributions/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw/ForgotPassword.java
Log:
proxy implementation started

Modified: public/yanel/trunk/src/contributions/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw/ForgotPassword.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw/ForgotPassword.java	2009-08-28 07:07:17 UTC (rev 44459)
+++ public/yanel/trunk/src/contributions/resources/forgotpw/src/java/org/wyona/yanel/impl/resources/forgotpw/ForgotPassword.java	2009-08-28 07:49:44 UTC (rev 44460)
@@ -23,6 +23,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.StringWriter;
+import java.net.URL;
 import java.util.Date;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -363,12 +364,22 @@
      * Get forgot password URL which will be sent via E-Mail (also see YanelServlet#getRequestURLQS(HttpServletRequest, String, boolean))
      */
     public String getURL() throws Exception {
-        // TODO: Use proxy settings
         //https://192.168.1.69:8443/yanel" + request.getServletPath().toString()
-        java.net.URL url = new java.net.URL(request.getRequestURL().toString());
+        URL url = new URL(request.getRequestURL().toString());
         org.wyona.yanel.core.map.Realm realm = getRealm();
         if (realm.isProxySet()) {
-            log.warn("DEBUG: Proxy host name: " + realm.getProxyHostName());
+            // TODO: Finish proxy settings replacement
+
+            String proxyHostName = realm.getProxyHostName();
+            log.warn("DEBUG: Proxy host name: " + proxyHostName);
+            if (proxyHostName != null) {
+                url = new URL(url.getProtocol(), proxyHostName, url.getPort(), url.getFile());
+            }
+
+            String proxyPrefix = realm.getProxyPrefix();
+            if (proxyPrefix != null) {
+                url = new URL(url.getProtocol(), url.getHost(), url.getPort(), url.getFile().substring(proxyPrefix.length()));
+            }
         } else {
             log.warn("No proxy set.");
         }