svn commit: [jahia] r14893 - /trunk/core/src/java/org/jahia/bin/filters/ntlm/NtlmHttpFilter.java

[knguyen]

Author: knguyen
Date: Mon Aug 14 11:33:30 2006
New Revision: 14893

URL: https://svndev.jahia.net/websvn/listing.php?sc=1&rev=14893&repname=jahia
Log:
temporary rollback change.

Modified:
    trunk/core/src/java/org/jahia/bin/filters/ntlm/NtlmHttpFilter.java

Modified: trunk/core/src/java/org/jahia/bin/filters/ntlm/NtlmHttpFilter.java
URL: 
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/java/org/jahia/bin/filters/ntlm/NtlmHttpFilter.java&rev=14893&repname=jahia
==============================================================================
--- trunk/core/src/java/org/jahia/bin/filters/ntlm/NtlmHttpFilter.java 
(original)
+++ trunk/core/src/java/org/jahia/bin/filters/ntlm/NtlmHttpFilter.java Mon Aug 
14 11:33:30 2006
@@ -79,7 +79,6 @@
     private String domainController;
     private boolean loadBalance;
     private boolean enableBasic;
-    private boolean useBasic;
     private boolean insecureBasic;
     private String realm;
     private boolean skipAuthentification;
@@ -108,8 +107,6 @@
         }
         enableBasic = Boolean.valueOf(
                 Config.getProperty("jcifs.http.enableBasic")).booleanValue();
-        useBasic = Boolean.valueOf(
-                Config.getProperty("jcifs.http.useBasic")).booleanValue();
         insecureBasic = Boolean.valueOf(
                 Config.getProperty("jcifs.http.insecureBasic")).booleanValue();
         realm = Config.getProperty("jcifs.http.basicRealm");
@@ -150,22 +147,10 @@
             }
         }
 
-        Boolean isBasicBool = (Boolean) request.getAttribute("isBasic");
-        if (isBasicBool == null) {
-            isBasicBool = new Boolean(false);
-        }
-        boolean useNtlmRequest = false;
-        if (ntlm != null) {
-            useNtlmRequest = true;
-        }
-        if (isBasicBool.booleanValue() && !useBasic) {
-            useNtlmRequest = false;
-        }
-
-        if (useNtlmRequest) {
-            chain.doFilter( new NtlmHttpServletRequest( req, ntlm ), response 
);
+        if (ntlm == null) {
+            chain.doFilter(req, response);   
         } else {
-            chain.doFilter(req, response);
+            chain.doFilter( new NtlmHttpServletRequest( req, ntlm ), response 
);
         }
     }
 
@@ -188,7 +173,6 @@
         NtlmPasswordAuthentication ntlm = null;
         msg = req.getHeader( "Authorization" );
         boolean offerBasic = enableBasic && (insecureBasic || req.isSecure());
-        boolean isBasic = false;
 
         if( msg != null && (msg.startsWith( "NTLM " ) ||
                     (offerBasic && msg.startsWith("Basic ")))) {
@@ -215,8 +199,6 @@
                 /* negotiation complete, remove the challenge object */
                 ssn.removeAttribute( "NtlmHttpChal" );
             } else {
-                req.setAttribute("isBasic", new Boolean(true));
-                isBasic = true;
                 String auth = new String(Base64.decode(msg.substring(6)),
                         "US-ASCII");
                 int index = auth.indexOf(':');
@@ -232,9 +214,7 @@
                 dc = UniAddress.getByName( domainController, true );
             }
             try {
-                if ((isBasic) && (!useBasic)) {
-                    return ntlm;
-                }
+
                 SmbSession.logon( dc, ntlm );
 
                 if( log.level > 2 ) {