add service to URL

wyona · Jun 24, 2013 · ab23189 · ab23189
1 parent f0f4e0b
commit ab23189
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/webapp/src/java/org/wyona/yanel/servlet/security/impl/CASWebAuthenticatorImpl.java b/src/webapp/src/java/org/wyona/yanel/servlet/security/impl/CASWebAuthenticatorImpl.java
@@ -79,7 +79,7 @@ public void getXHTMLAuthenticationForm(HttpServletRequest request, HttpServletRe
     public HttpServletResponse doAuthenticate(HttpServletRequest request, HttpServletResponse response, Map map, String reservedPrefix, String xsltLoginScreenDefault, String servletContextRealPath, String sslPort) throws ServletException, IOException {
         String casTicket = request.getParameter("ticket");
         if (casTicket != null) {
-            String username = validate(casTicket);
+            String username = validate(casTicket, request);
             if (username != null) {
                 log.warn("TODO: Add username to session and hence consider user authenticated");
                 return null; // TODO: Redirect to original request
@@ -119,14 +119,15 @@ public HttpServletResponse doAuthenticate(HttpServletRequest request, HttpServle
     /**
      * Validate CAS ticket
      * @param ticket CAS ticket (e.g. ST-1-Heu3XnvrG3HcJ27RBfg7-cas01.example.org)
+     * @param request TODO
      * @return username associated with ticket when ticket is valid, return null otherwise
      */
-    private String validate(String ticket) {
-        log.warn("TODO: Validate ticket '" + ticket + "' at '" + validateURL + "'...");
+    private String validate(String ticket, HttpServletRequest request) {
         try {
-            URL url = new URL(validateURL + "?ticket=" + ticket);
-            DefaultHttpClient httpClient = getHttpClient(new URL(validateURL));
-            HttpGet httpGet = new HttpGet(validateURL);
+            String url = validateURL + "?ticket=" + ticket + "&service=" + encode(request);
+            log.warn("TODO: Validate ticket '" + ticket + "' at '" + validateURL + "' or rather requesting '" + url + "'...");
+            DefaultHttpClient httpClient = getHttpClient(new URL(url));
+            HttpGet httpGet = new HttpGet(url);
             HttpResponse response = httpClient.execute(httpGet);
             int statusCode = new Integer(response.getStatusLine().getStatusCode()).intValue();
             if (statusCode == 200) {