[wsas-java-dev] svn commit r2621 - in trunk/wsas/java/modules/core/src/org/wso2/wsas: persistence security/pox transport

[svn at wso2.org]

Author: azeez
Date: Tue May 15 00:29:19 2007
New Revision: 2621

Modified:
   trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java
   trunk/wsas/java/modules/core/src/org/wso2/wsas/security/pox/POXSecurityHandler.java
   trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/WSASServlet.java
Log:
Fix for WSAS-228
Fix for WSAS-226 = Need to do a Fix on Rampart to handle invalid authentication



Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java	(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java	Tue May 15 00:29:19 2007
@@ -624,7 +624,7 @@
                     if (parameter.getParameterElement() != null) {
                         param.setValue(parameter.getParameterElement().toString());
                         param.setService(serviceDO);
-                        session.persist(param);
+//                        session.persist(param);
                     }
                 }
             }
@@ -1025,7 +1025,7 @@
                     if (parameter.getParameterElement() != null) {
                         paramDO.setValue(parameter.getParameterElement().toString());
                         paramDO.setServiceGroup(sgDO);
-                        session.persist(paramDO);
+//                        session.persist(paramDO);
                     }
                 }
             }

Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/security/pox/POXSecurityHandler.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/security/pox/POXSecurityHandler.java	(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/security/pox/POXSecurityHandler.java	Tue May 15 00:29:19 2007
@@ -20,6 +20,7 @@
 import org.apache.axiom.om.util.Base64;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.context.OperationContext;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.HandlerDescription;
 import org.apache.axis2.description.Parameter;
@@ -33,11 +34,12 @@
 import org.apache.ws.security.message.WSSecTimestamp;
 import org.apache.ws.security.message.WSSecUsernameToken;
 import org.w3c.dom.Document;
-import org.wso2.wsas.ServerConstants;
+import org.wso2.utils.ServerConfiguration;
 import org.wso2.wsas.persistence.PersistenceManager;
 import org.wso2.wsas.persistence.dataobject.ServiceDO;
 import org.wso2.wsas.persistence.dataobject.ServiceIdentifierDO;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
 /**
@@ -47,10 +49,11 @@
 public class POXSecurityHandler implements Handler {
 
     private static Log log = LogFactory.getLog(POXSecurityHandler.class);
-            
+
     private HandlerDescription description;
 
     private PersistenceManager pm = new PersistenceManager();
+
     /**
      * @see org.apache.axis2.engine.Handler#cleanup()
      */
@@ -76,21 +79,21 @@
 
         //Then check whether UT auth is enabled on the service
         AxisService service = msgCtx.getAxisService();
-        
-        if(service == null) {
+
+        if (service == null) {
             log.info("Service not dispatched");
             return InvocationResponse.CONTINUE;
         }
-        
+
         ServiceDO serviceDO = pm.getService(service.getName(), ServiceIdentifierDO.EMPTY_SERVICE_VERSION);
-        
+
         if (serviceDO != null) {
             if (!serviceDO.getIsUTAuthEnabled()) {
                 //TODO: We specifically have to checkx for UT auth
                 return InvocationResponse.CONTINUE;
             }
         } else {
-            log.warn("Serivce " + service.getName() + " is not persisted." );
+            log.warn("Serivce " + service.getName() + " is not persisted.");
             return InvocationResponse.CONTINUE;
         }
 
@@ -127,14 +130,16 @@
             //Throw an error
             if (username == null || password == null ||
                 password.trim().length() == 0 || username.trim().length() == 0) {
-                msgCtx.setProperty(ServerConstants.HTTPConstants.HTTP_RESPONSE_STATE,
-                                   "401");  // Unauthorized
+                OperationContext opCtx = msgCtx.getOperationContext();
+                opCtx.setProperty(org.apache.axis2.Constants.HTTP_RESPONSE_STATE,
+                                  String.valueOf(HttpServletResponse.SC_UNAUTHORIZED));
+                opCtx.setProperty(org.apache.axis2.Constants.HTTP_BASIC_AUTH_REALM,
+                                  ServerConfiguration.getInstance().getFirstProperty("Name"));
                 throw new AxisFault("Authentication Failure");
             }
 
-            Document doc;
-            doc = Axis2Util.getDocumentFromSOAPEnvelope(msgCtx.getEnvelope(),
-                                                        false);
+            Document doc = Axis2Util.getDocumentFromSOAPEnvelope(msgCtx.getEnvelope(),
+                                                                 false);
 
             WSSecHeader secHeader = new WSSecHeader();
             secHeader.insertSecurityHeader(doc);

Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/WSASServlet.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/WSASServlet.java	(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/transport/WSASServlet.java	Tue May 15 00:29:19 2007
@@ -105,9 +105,6 @@
 
         try {
             String requestURI = request.getRequestURI();
-            int indexOfServletPath =
-                    request.getContextPath().indexOf(configContext.getServiceContextPath());
-
             if (requestURI.indexOf("rss") >= 0) {
                 rssProcessor.process(request, response, configContext);
             }
@@ -144,11 +141,11 @@
                                    HttpServletResponse response) throws IOException,
                                                                         ServletException {
         if (!disableREST) {
-            new ProcessRESTRequest(HTTPConstants.HTTP_METHOD_GET,
-                                   request,
-                                   response).processURLRequest();
+            new RestRequestProcessor(HTTPConstants.HTTP_METHOD_GET,
+                                     request,
+                                     response).processURLRequest();
         } else {
-            disableRESTErrorMessage(response);
+            showRestDisabledErrorMessage(response);
         }
     }
 }