/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 9183

Added by ben leinfelder over 9 years ago

remove portal servlet and configuration - no need for this if we are supporting auth tokens from authentication service.

     /**
      * This work was created by participants in the DataONE project, and is
      * jointly copyrighted by participating institutions in DataONE. For
      * more information on DataONE, see our web site at http://dataone.org.
+     *
      *   Copyright ${year}
+     *
      * Licensed under the Apache License, Version 2.0 (the "License");
      * you may not use this file except in compliance with the License.
      * You may obtain a copy of the License at
+     *
      *   http://www.apache.org/licenses/LICENSE-2.0
+     *
      * Unless required by applicable law or agreed to in writing, software
      * distributed under the License is distributed on an "AS IS" BASIS,
      * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      * See the License for the specific language governing permissions and
      * limitations under the License.
+     *
      * $Id$
      */
     package edu.ucsb.nceas.metacat.portal;
     import javax.servlet.http.HttpServletRequest;
     import javax.servlet.http.HttpServletResponse;
     import edu.uiuc.ncsa.myproxy.oa4mp.client.servlet.ClientServlet;
     import java.io.PrintWriter;
     /**
      * <p>Created by Jeff Gaynor<br>
      * on Aug 11, 2010 at  10:11:13 AM
      */
     public class FailureServlet extends ClientServlet {
         protected void doIt(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Throwable {
             clearCookie(httpServletRequest, httpServletResponse); // clear out old session info
             httpServletResponse.setContentType("text/html");
             PrintWriter printWriter = httpServletResponse.getWriter();
             printWriter.println("<html>\n" +
                     "<head><title>Failure</title></head>\n" +
                     "<body><h1>Uh-oh...</h1>" +
                     "<p>There was an error processing your request.</p>" +
                     "<form name=\"input\" action=\"");
             printWriter.println(httpServletRequest.getContextPath() + "/\" method=\"get\">");
             printWriter.println("Click to go back to the main page<br><br>\n" +
                     "<input type=\"submit\" value=\"Submit\" />\n" +
                     "</form>\n" +
                     "  </body>\n" +
                     "</html>");
+        }
+    }

     /**
      * This work was created by participants in the DataONE project, and is
      * jointly copyrighted by participating institutions in DataONE. For
      * more information on DataONE, see our web site at http://dataone.org.
+     *
      *   Copyright ${year}
+     *
      * Licensed under the Apache License, Version 2.0 (the "License");
      * you may not use this file except in compliance with the License.
      * You may obtain a copy of the License at
+     *
      *   http://www.apache.org/licenses/LICENSE-2.0
+     *
      * Unless required by applicable law or agreed to in writing, software
      * distributed under the License is distributed on an "AS IS" BASIS,
      * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      * See the License for the specific language governing permissions and
      * limitations under the License.
+     *
      * $Id$
      */
     package edu.ucsb.nceas.metacat.portal;
     import org.dataone.portal.PortalCertificateManager;
     import edu.uiuc.ncsa.myproxy.oa4mp.client.Asset;
     import edu.uiuc.ncsa.myproxy.oa4mp.client.AssetResponse;
     import edu.uiuc.ncsa.myproxy.oa4mp.client.servlet.ClientServlet;
     import edu.uiuc.ncsa.security.core.exceptions.GeneralException;
     import edu.uiuc.ncsa.security.servlet.JSPUtil;
     import javax.servlet.ServletConfig;
     import javax.servlet.ServletException;
     import javax.servlet.http.HttpServletRequest;
     import javax.servlet.http.HttpServletResponse;
     import java.io.PrintWriter;
     import java.security.cert.X509Certificate;
     import static edu.uiuc.ncsa.security.util.pkcs.CertUtil.toPEM;
     /**
      * <p>Created by Jeff Gaynor<br>
      * on Jul 31, 2010 at  3:29:09 PM
      */
     public class SuccessServlet extends ClientServlet {
     	public void init(ServletConfig config) throws ServletException {
     		super.init(config);
     		// TODO: anything needed?
+    	}
         protected void doIt(HttpServletRequest request, HttpServletResponse response) throws Throwable {
             String identifier = clearCookie(request, response);
             if (identifier == null) {
                 throw new ServletException("Error: No identifier for this delegation request was found. ");
+            }
             info("2.a. Getting token and verifier.");
             String token = request.getParameter(TOKEN_KEY);
             String verifier = request.getParameter(VERIFIER_KEY);
             if (token == null || verifier == null) {
                 warn("2.a. The token is " + (token==null?"null":token) + " and the verifier is " + (verifier==null?"null":verifier));
                 GeneralException ge = new GeneralException("Error: This servlet requires parameters for the token and verifier. It cannot be called directly.");
                 request.setAttribute("exception", ge);
                 JSPUtil.handleException(ge, request, response, "/pages/client-error.jsp");
                 return;
                 //throw ge;
+            }
             info("2.a Token and verifier found.");
             X509Certificate cert = null;
             AssetResponse assetResponse = null;
             try {
                 info("2.a. Getting the cert(s) from the service");
                 assetResponse = getOA4MPService().getCert(token, verifier);
                 X509Certificate[] certificates = assetResponse.getX509Certificates();
                 // update the asset to include the returned certificate
                 Asset asset = getOA4MPService().getEnvironment().getAssetStore().get(identifier);
                 asset.setCertificates(certificates);
                 getOA4MPService().getEnvironment().getAssetStore().save(asset);
                 cert = certificates[0];
             } catch (Throwable t) {
                 warn("2.a. Exception from the server: " + t.getCause().getMessage());
                 error("Exception while trying to get cert. message:" + t.getMessage());
                 request.setAttribute("exception", t);
                 JSPUtil.handleException(t, request, response, "/pages/client-error.jsp");
                 return;
                 //throw t;
+            }
             // add teh cookie for later request processing
         	PortalCertificateManager.getInstance().setCookie(identifier, response);
         	// find where we should end up
         	String target = (String) request.getSession().getAttribute("target");
         	if (target != null) {
         		// remove from the session once we use it
         		request.getSession().removeAttribute("target");
         		// send the redirect
         		response.sendRedirect(target);
         		return;
+        	}
         	// otherwise show us information
             response.setContentType("text/html");
             PrintWriter pw = response.getWriter();
             /* Put the key and certificate in the result, but allow them to be initially hidden. */
             String y = "<html>\n" +
                     "<style type=\"text/css\">\n" +
                     ".hidden { display: none; }\n" +
                     ".unhidden { display: block; }\n" +
                     "</style>\n" +
                     "<script type=\"text/javascript\">\n" +
                     "function unhide(divID) {\n" +
                     "    var item = document.getElementById(divID);\n" +
                     "    if (item) {\n" +
                     "        item.className=(item.className=='hidden')?'unhidden':'hidden';\n" +
                     "    }\n" +
                     "}\n" +
                     "</script>\n" +
                     "<body>\n" +
                     "<h1>Success!</h1>\n" +
                     "<p>You have successfully requested a DataONE certificate. It will be accessible for 18 hours using your cookie.</p>\n" +
                     "<ul>\n" +
                     "    <li><a href=\"javascript:unhide('showSubject');\">Show/Hide subject</a></li>\n" +
                     "    <div id=\"showSubject\" class=\"unhidden\">\n" +
                     "        <p><pre>" + cert.getSubjectDN().toString() + "</pre>\n" +
                     "    </div>\n" +
                     "    <li><a href=\"javascript:unhide('showCert');\">Show/Hide certificate</a></li>\n" +
                     "    <div id=\"showCert\" class=\"hidden\">\n" +
                     "        <p><pre>" + toPEM(cert) + "</pre>\n" +
                     "    </div>\n" +
                     "    <li><a href=\"javascript:unhide('showKey');\">Show/Hide private key</a></li>\n" +
                     "    <div id=\"showKey\" class=\"hidden\">\n" +
                     "        <p><pre>" + "hidden for security" + "</pre>\n" +
                     "    </div>\n" +
                     "\n" +
                     "</ul>\n" +
                     "<a href=" + request.getContextPath() + ">" +
                     "Return to portal" +
                     "</a> or " +
                     "<a href=" + target + ">" +
                     "Continue to target" +
                     "</a>" +
                     "</body>\n" +
                     "</html>";
             pw.println(y);
             pw.flush();
+        }
+    }

     /**
      * This work was created by participants in the DataONE project, and is
      * jointly copyrighted by participating institutions in DataONE. For
      * more information on DataONE, see our web site at http://dataone.org.
+     *
      *   Copyright ${year}
+     *
      * Licensed under the Apache License, Version 2.0 (the "License");
      * you may not use this file except in compliance with the License.
      * You may obtain a copy of the License at
+     *
      *   http://www.apache.org/licenses/LICENSE-2.0
+     *
      * Unless required by applicable law or agreed to in writing, software
      * distributed under the License is distributed on an "AS IS" BASIS,
      * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      * See the License for the specific language governing permissions and
      * limitations under the License.
+     *
      * $Id$
      */
     package edu.ucsb.nceas.metacat.portal;
     import javax.servlet.http.Cookie;
     import javax.servlet.http.HttpServletRequest;
     import javax.servlet.http.HttpServletResponse;
     import edu.uiuc.ncsa.myproxy.oa4mp.client.OA4MPResponse;
     import edu.uiuc.ncsa.myproxy.oa4mp.client.servlet.ClientServlet;
     import edu.uiuc.ncsa.myproxy.oa4mp.client.storage.AssetStoreUtil;
     import edu.uiuc.ncsa.security.core.Identifier;
     import edu.uiuc.ncsa.security.core.exceptions.ServerSideException;
     import edu.uiuc.ncsa.security.servlet.JSPUtil;
     /**
      * A very simple sample servlet showing how a portal can start delegation. This just does the
      * initial request then a redirect
      * so there is nothing to display to the user.
      * <p>Created by Jeff Gaynor<br>
      * on Jun 18, 2010 at  2:10:58 PM
      */
     public class StartRequest extends ClientServlet {
     	@Override
         protected void doIt(HttpServletRequest request, HttpServletResponse response) throws Throwable {
             info("1.a. Starting transaction");
             OA4MPResponse gtwResp = null;
             // Drumroll please: here is the work for this call.
             try {
                 Identifier id = AssetStoreUtil.createID();
                 gtwResp = getOA4MPService().requestCert(id);
                 // if there is a store, store something in it.
                 Cookie cookie = new Cookie(OA4MP_CLIENT_REQUEST_ID, id.getUri().toString());
                 response.addCookie(cookie);
             } catch (Throwable t) {
                 if (t instanceof ServerSideException) {
                     ServerSideException sse = (ServerSideException) t;
                     //nothing was, in fact, returned from the server.
                     if (!sse.isTrivial()) {
                         if (getCE().isDebugOn()) {
                             t.printStackTrace();
+                        }
                         for (String key : sse.getQueryParameters().keySet()) {
                             request.setAttribute(key, sse.getQueryParameters().get(key));
+                        }
                         String contextPath = request.getContextPath();
                         if (!contextPath.endsWith("/")) {
                             contextPath = contextPath + "/";
+                        }
                         request.setAttribute("action", contextPath);
                         JSPUtil.handleException(sse.getCause(), request, response, "/pages/client-error.jsp");
                         if (sse.getRedirect() != null) {
                             response.sendRedirect(sse.getRedirect().toString());
+                        }
                         return;
+                    }
                     JSPUtil.handleException(t, request, response, "/pages/client-error.jsp");
                     return;
+                }
                 throw t;
+            }
             String target = request.getParameter("target");
         	if (target != null) {
             	request.getSession().setAttribute("target", target);
+        	}
             response.sendRedirect(gtwResp.getRedirect().toString());
+        }
+    }

       </servlet-mapping>
       -->
     	<!-- begin MyProxy portal delegation section. Uncomment to enable MyProxy -->
     	<!--
     	<servlet>
             <servlet-name>startRequest</servlet-name>
             <servlet-class>edu.ucsb.nceas.metacat.portal.StartRequest</servlet-class>
             <load-on-startup>0</load-on-startup>
         </servlet>
         <servlet-mapping>
             <servlet-name>startRequest</servlet-name>
             <url-pattern>/startRequest</url-pattern>
         </servlet-mapping>
         <servlet>
             <servlet-name>ready</servlet-name>
             <servlet-class>edu.ucsb.nceas.metacat.portal.SuccessServlet</servlet-class>
             <load-on-startup>0</load-on-startup>
         </servlet>
         <servlet-mapping>
             <servlet-name>ready</servlet-name>
             <url-pattern>/ready</url-pattern>
         </servlet-mapping>
         <servlet>
             <servlet-name>error</servlet-name>
             <servlet-class>edu.ucsb.nceas.metacat.portal.FailureServlet</servlet-class>
             <load-on-startup>0</load-on-startup>
         </servlet>
         <servlet-mapping>
             <servlet-name>error</servlet-name>
             <url-pattern>/error</url-pattern>
         </servlet-mapping>
         <session-config>
           <session-timeout>30000</session-timeout>
         </session-config>
         <listener>
             <listener-class>edu.uiuc.ncsa.myproxy.oa4mp.client.loader.ClientBootstrapper</listener-class>
         </listener>
     	<context-param>
             <param-name>oa4mp:client.config.file</param-name>
             <param-value>/WEB-INF/oa4mp_client.xml</param-value>
         </context-param>
         -->
         <!-- end MyProxy section -->
        <!-- currently the W3C havent settled on a media type for WSDL;
         http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
         for now we go with the basic 'it's XML' response -->

Also available in: Unified diff

Project

General

Profile

Metacat

Revision 9183

Added by ben leinfelder over 9 years ago