diff options
author | Sai Gandham <sg481n@att.com> | 2019-01-30 08:44:44 -0600 |
---|---|---|
committer | Sai Gandham <sg481n@att.com> | 2019-01-30 08:44:54 -0600 |
commit | a649fd1b3c8308b4c7cc2018965c93bff9d7eb54 (patch) | |
tree | 5e5982afe98473b5b926995937a184ed1d47f1db /shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFRealm.java | |
parent | 179f92f44f374c1a4e913adaa348ed22244fa0a3 (diff) |
Update shiro logging and sl4j init2.1.11
Issue-ID: AAF-655
Change-Id: I1e1439efbee5900c82a6065a0581faae15622581
Signed-off-by: Sai Gandham <sg481n@att.com>
Diffstat (limited to 'shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFRealm.java')
-rw-r--r-- | shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFRealm.java | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFRealm.java b/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFRealm.java index 091c22b..4b24c70 100644 --- a/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFRealm.java +++ b/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFRealm.java @@ -30,7 +30,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.TreeMap; -import org.apache.log4j.Logger; import org.apache.log4j.PropertyConfigurator; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationInfo; @@ -51,9 +50,12 @@ import org.onap.aaf.cadi.config.Config; import org.onap.aaf.cadi.filter.MapBathConverter; import org.onap.aaf.cadi.util.CSV; import org.onap.aaf.misc.env.APIException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class AAFRealm extends AuthorizingRealm { - final static Logger logger = Logger.getLogger(AAFRealm.class); + final static Logger logger = LoggerFactory.getLogger(AAFRealm.class); public static final String AAF_REALM = "AAFRealm"; @@ -78,11 +80,12 @@ public class AAFRealm extends AuthorizingRealm { String cadi_prop_files = access.getProperty(Config.CADI_PROP_FILES); if(cadi_prop_files==null) { String msg = Config.CADI_PROP_FILES + " in VM Args is required to initialize AAFRealm."; - access.log(Level.INIT,msg); + access.log(Level.DEBUG,msg); throw new RuntimeException(msg); } else { try { String log4jConfigFile = "./etc/org.ops4j.pax.logging.cfg"; + PropertyConfigurator.configure(log4jConfigFile); System.setOut(createLoggingProxy(System.out)); System.setErr(createLoggingProxy(System.err)); @@ -94,7 +97,6 @@ public class AAFRealm extends AuthorizingRealm { acon = AAFCon.newInstance(access); authn = acon.newAuthn(); authz = acon.newLur(authn); - final String csv = access.getProperty(Config.CADI_BATH_CONVERT); if(csv!=null) { try { @@ -122,12 +124,12 @@ public class AAFRealm extends AuthorizingRealm { idMap.put(oldID,newID); } } catch (IOException e) { - logger.error(e.getMessage(), e); +// access.log(e); } } } catch (APIException | CadiException | LocatorException e) { String msg = "Cannot initiate AAFRealm"; - logger.info(msg + " "+ e.getMessage(), e); + access.log(Level.INIT,msg,e.getMessage()); throw new RuntimeException(msg,e); } } @@ -145,15 +147,14 @@ public class AAFRealm extends AuthorizingRealm { @Override protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) throws AuthenticationException { - logger.debug("AAFRealm.doGetAuthenticationInfo :"+token); - final UsernamePasswordToken upt = (UsernamePasswordToken)token; final String user = upt.getUsername(); String authUser = user; final String password=new String(upt.getPassword()); String authPassword = password; - if(mbc!=null) { + if(mbc!=null) { try { + final String oldBath = "Basic " + Symm.base64noSplit.encode(user+':'+password); String bath = mbc.convert(access, oldBath); if(bath!=oldBath) { @@ -161,11 +162,13 @@ public class AAFRealm extends AuthorizingRealm { int colon = bath.indexOf(':'); if(colon>=0) { authUser = bath.substring(0, colon); - authPassword = bath.substring(colon+1); + authPassword = bath.substring(colon+1); + access.log(Level.DEBUG, authUser,"user authenticated"); + access.log(Level.DEBUG, authn.validate(authUser,authPassword)); } } } catch (IOException e) { - logger.error(e.getMessage(), e); + access.log(e); } } String err; @@ -173,11 +176,11 @@ public class AAFRealm extends AuthorizingRealm { err = authn.validate(authUser,authPassword); } catch (IOException e) { err = "Credential cannot be validated"; - logger.error(err, e); + access.log(Level.DEBUG, e, err); } if(err != null) { - logger.debug(err); + access.log(Level.DEBUG, err, " - Credential cannot be validated"); throw new AuthenticationException(err); } @@ -185,7 +188,9 @@ public class AAFRealm extends AuthorizingRealm { access, user, password + ); + } @Override @@ -202,7 +207,6 @@ public class AAFRealm extends AuthorizingRealm { @Override protected AAFAuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) { - logger.debug("AAFRealm.doGetAuthenthorizationInfo"); Principal bait = (Principal)principals.getPrimaryPrincipal(); Principal newBait = bait; if(idMap!=null) { @@ -218,7 +222,6 @@ public class AAFRealm extends AuthorizingRealm { } List<Permission> pond = new ArrayList<>(); authz.fishAll(newBait,pond); - return new AAFAuthorizationInfo(access,bait,pond); } |