Issue #405 - reorganization

Author: pavels

authfilters/build.gradle

@@ -4,6 +4,7 @@ description "Authentication filters"
 dependencies {
     compile project(':common') 
     compile project(':security-core')
+    compile "org.brickred:socialauth:4.12"
     compile 'commons-codec:commons-codec:1.5'
 }
 

authfilters/src/main/java/cz/incad/kramerius/auth/AuthenticatedUsers.java

@@ -17,7 +17,7 @@
 /**
  * 
  */
-package cz.incad.Kramerius.security.basicauth;
+package cz.incad.kramerius.auth.basic;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -26,6 +26,7 @@
 import java.util.HashMap;
 import java.util.logging.Level;
 
+import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
@@ -37,10 +38,10 @@
 import biz.sourcecode.base64Coder.Base64Coder;
 
 import com.google.inject.Inject;
+import com.google.inject.Injector;
 import com.google.inject.Provider;
 import com.google.inject.name.Named;
 
-import cz.incad.Kramerius.backend.guice.K4GuiceFilter;
 import cz.incad.kramerius.processes.LRProcessManager;
 import cz.incad.kramerius.security.jaas.K4LoginModule;
 import cz.incad.kramerius.security.jaas.K4User;
@@ -49,7 +50,7 @@
  * Supporting basic authetnication filter
  * @author pavels
  */
-public class AuthFilter extends K4GuiceFilter{
+public class AuthFilter  implements Filter {
 
     private static final String AUTH_TOKEN_HEADER_KEY = "auth-token";
     private static final String TOKEN_ATTRIBUTE_KEY = "token";
@@ -110,20 +111,16 @@ public void basicAuth(FilterChain arg2, HttpServletRequest request, HttpServletR
                         HttpServletRequest authenticated = BasicAuthenticatedHTTPServletProxy.newInstance(request, principal);
                         arg2.doFilter(authenticated, response);
                     } else {
-                    	arg2.doFilter(request, response);
-//                    	sendError(response);
+                        arg2.doFilter(request, response);
                     }
                 } else {
-                	arg2.doFilter(request, response);
-//                    sendError(response);
+                    arg2.doFilter(request, response);
                 }
             } else {
             	arg2.doFilter(request, response);
-//                sendError(response);
             }
         } else {
-        	arg2.doFilter(request, response);
-//            sendError(response);
+            arg2.doFilter(request, response);
         }
     }
 
@@ -134,8 +131,13 @@ public void sendError(HttpServletResponse response) throws IOException {
 
     @Override
     public void init(FilterConfig conf) throws ServletException {
-        super.init(conf);
-        LOGGER.info("initializing auth filter...");
+        Injector injector = getInjector(conf);
+        injector.injectMembers(this);
         this.realm = conf.getInitParameter("realm");
     }
+    
+    protected Injector getInjector(FilterConfig config) {
+        return (Injector) config.getServletContext().getAttribute(Injector.class.getName());
+    }
+
 }

authfilters/src/main/java/cz/incad/kramerius/auth/ExtAuthFilter.java

@@ -17,7 +17,7 @@
 /**
  * 
  */
-package cz.incad.Kramerius.security.basicauth;
+package cz.incad.kramerius.auth.basic;
 
 import java.io.BufferedReader;
 import java.io.IOException;