From e3d3b435ac274cb94640301b5368eff440616c8e Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Thu, 25 Nov 2010 08:40:00 +0000
Subject: [PATCH] =?UTF-8?q?(Hoffentlich)=20der=20letzte=20Teil,=20der=20an?=
 =?UTF-8?q?gepasst=20werden=20muss,=20damit=20die=20parametrisierten=20Rel?=
 =?UTF-8?q?atedLinks=20funktionieren.=20Hier=20wird=20jetzt=20ebenfalls=20?=
 =?UTF-8?q?gepr=C3=BCft,=20ob=20au=C3=9Fer=20der=20OID=20noch=20weitere=20?=
 =?UTF-8?q?Parameter=20an=20die=20URL=20angeh=C3=A4ngt=20wurden.=20Diese?=
 =?UTF-8?q?=20werden=20dann=20auch=20an=20die=20erzeugte=20URL=20angeh?=
 =?UTF-8?q?=C3=A4ngt.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Mögliche Erweiterung: "Gefährliche" Parameter, z.B. output=xml, ausfiltern.


git-svn-id: https://svn.libreccm.org/ccm/trunk@635 8810af33-2d31-482b-a856-94f89814c4df
---
 .../com/arsdigita/web/OIDRedirectServlet.java | 42 +++++++++++++------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/ccm-core/src/com/arsdigita/web/OIDRedirectServlet.java b/ccm-core/src/com/arsdigita/web/OIDRedirectServlet.java
index ad666e909..2b5125faa 100755
--- a/ccm-core/src/com/arsdigita/web/OIDRedirectServlet.java
+++ b/ccm-core/src/com/arsdigita/web/OIDRedirectServlet.java
@@ -30,22 +30,21 @@ import com.arsdigita.kernel.URLFinderNotFoundException;
 
 import com.arsdigita.persistence.OID;
 import com.arsdigita.toolbox.ui.OIDParameter;
+import java.util.Map;
 
 import org.apache.log4j.Logger;
 
-
 public class OIDRedirectServlet extends BaseServlet {
-    
-    private static final Logger s_log = 
-        Logger.getLogger(OIDRedirectServlet.class);
 
+    private static final Logger s_log =
+                                Logger.getLogger(OIDRedirectServlet.class);
     public static final String OID_PARAM = "oid";
-
     private static final OIDParameter param = new OIDParameter(OID_PARAM);
 
+    @Override
     protected void doService(HttpServletRequest sreq,
                              HttpServletResponse sresp)
-        throws ServletException, IOException {
+            throws ServletException, IOException {
 
         OID oid = null;
         try {
@@ -55,19 +54,19 @@ public class OIDRedirectServlet extends BaseServlet {
             sresp.sendError(HttpServletResponse.SC_BAD_REQUEST);
             return;
         }
-        
+
         if (oid == null) {
             // fix for non-encoded OIDs,
             // put in content body text using the link functionality
             try {
                 oid = URLService.getNonencodedOID(sreq);
-            } catch (Exception e ) {
+            } catch (Exception e) {
                 // invalid OID value, return 400 Bad Request
                 sresp.sendError(HttpServletResponse.SC_BAD_REQUEST);
                 return;
             }
             if (s_log.isDebugEnabled()) {
-                s_log.debug("Tried to read non encoded OID, result: "+oid);
+                s_log.debug("Tried to read non encoded OID, result: " + oid);
             }
 
             if (oid == null) {
@@ -78,15 +77,34 @@ public class OIDRedirectServlet extends BaseServlet {
                 return;
             }
         }
-        
+
         try {
             String context = sreq.getParameter("context");
-            String url = URLService.locate(oid,context);
+            String url = URLService.locate(oid, context);
+
+            Map<?, ?> parameters = sreq.getParameterMap();
+            StringBuilder urlParams = new StringBuilder();
+            for (Map.Entry<?, ?> entry : parameters.entrySet()) {
+                if (!entry.getKey().equals("oid")) {
+                    if (urlParams.length() == 0) {
+                        urlParams.append('?');
+                    } else {
+                        urlParams.append('&');
+                    }
+                    String key = (String) entry.getKey();
+                    String[] value = (String[]) entry.getValue();
+                    if (value.length > 0) {
+                        urlParams.append(String.format("%s=%s", key, value[0]));
+                    }
+                }
+            }
+
+            url = url.concat(urlParams.toString());
 
             if (s_log.isDebugEnabled()) {
                 s_log.debug("Redirecting oid " + oid + " to " + url);
             }
-            
+
             throw new RedirectSignal(url, false);
         } catch (URLFinderNotFoundException ex) {
             if (s_log.isDebugEnabled()) {