From ab366c30ab719b97430ecfb9e4df7f7df9e847cb Mon Sep 17 00:00:00 2001 From: z003u7fc Date: Mon, 19 Feb 2018 13:48:06 +0100 Subject: [PATCH] https://github.com/Waffle/waffle/pull/571 ++ synchronized tomcat8 + tomcat7 --- .../src/main/java/waffle/apache/MixedAuthenticator.java | 9 ++++----- .../src/main/java/waffle/apache/MixedAuthenticator.java | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Source/JNA/waffle-tomcat7/src/main/java/waffle/apache/MixedAuthenticator.java b/Source/JNA/waffle-tomcat7/src/main/java/waffle/apache/MixedAuthenticator.java index 25f566629b..8baaeb83b5 100644 --- a/Source/JNA/waffle-tomcat7/src/main/java/waffle/apache/MixedAuthenticator.java +++ b/Source/JNA/waffle-tomcat7/src/main/java/waffle/apache/MixedAuthenticator.java @@ -202,17 +202,16 @@ private boolean negotiate(final Request request, final HttpServletResponse respo this.log.debug("logged in user: {} ({})", windowsIdentity.getFqn(), windowsIdentity.getSidString()); - final GenericWindowsPrincipal windowsPrincipal = new GenericWindowsPrincipal(windowsIdentity, - this.principalFormat, this.roleFormat); + final GenericPrincipal genericPrincipal = createPrincipal(windowsIdentity); - this.log.debug("roles: {}", windowsPrincipal.getRolesString()); + this.log.debug("roles: {}", String.join(", ", genericPrincipal.getRoles())); // create a session associated with this request if there's none final HttpSession session = request.getSession(true); this.log.debug("session id: {}", session == null ? "null" : session.getId()); - this.register(request, response, windowsPrincipal, securityPackage, windowsPrincipal.getName(), null); - this.log.info("successfully logged in user: {}", windowsPrincipal.getName()); + this.register(request, response, genericPrincipal, securityPackage, genericPrincipal.getName(), null); + this.log.info("successfully logged in user: {}", genericPrincipal.getName()); } finally { windowsIdentity.dispose(); diff --git a/Source/JNA/waffle-tomcat8/src/main/java/waffle/apache/MixedAuthenticator.java b/Source/JNA/waffle-tomcat8/src/main/java/waffle/apache/MixedAuthenticator.java index e3dfcf387d..b393b59a10 100644 --- a/Source/JNA/waffle-tomcat8/src/main/java/waffle/apache/MixedAuthenticator.java +++ b/Source/JNA/waffle-tomcat8/src/main/java/waffle/apache/MixedAuthenticator.java @@ -203,17 +203,16 @@ private boolean negotiate(final Request request, final HttpServletResponse respo this.log.debug("logged in user: {} ({})", windowsIdentity.getFqn(), windowsIdentity.getSidString()); - final GenericWindowsPrincipal windowsPrincipal = new GenericWindowsPrincipal(windowsIdentity, - this.principalFormat, this.roleFormat); + final GenericPrincipal genericPrincipal = createPrincipal(windowsIdentity); - this.log.debug("roles: {}", windowsPrincipal.getRolesString()); + this.log.debug("roles: {}", String.join(", ", genericPrincipal.getRoles())); // create a session associated with this request if there's none final HttpSession session = request.getSession(true); this.log.debug("session id: {}", session == null ? "null" : session.getId()); - this.register(request, response, windowsPrincipal, securityPackage, windowsPrincipal.getName(), null); - this.log.info("successfully logged in user: {}", windowsPrincipal.getName()); + this.register(request, response, genericPrincipal, securityPackage, genericPrincipal.getName(), null); + this.log.info("successfully logged in user: {}", genericPrincipal.getName()); } finally { windowsIdentity.dispose();