You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2017/08/24 03:46:32 UTC
[07/38] james-project git commit: JAMES-2114 WebAdmin add
authentiation info
JAMES-2114 WebAdmin add authentiation info
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d0cad4de
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d0cad4de
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d0cad4de
Branch: refs/heads/master
Commit: d0cad4de79f62f55e7165e27041fda3fdf801f3b
Parents: ba02c57
Author: benwa <bt...@linagora.com>
Authored: Tue Aug 22 14:09:33 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Thu Aug 24 10:34:42 2017 +0700
----------------------------------------------------------------------
.../james/webadmin/authentication/AuthenticationFilter.java | 1 +
.../java/org/apache/james/webadmin/authentication/JwtFilter.java | 3 +++
.../src/main/java/org/apache/james/webadmin/mdc/MDCFilter.java | 2 ++
3 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/d0cad4de/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/authentication/AuthenticationFilter.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/authentication/AuthenticationFilter.java b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/authentication/AuthenticationFilter.java
index f73b818..b2a2774 100644
--- a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/authentication/AuthenticationFilter.java
+++ b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/authentication/AuthenticationFilter.java
@@ -22,4 +22,5 @@ package org.apache.james.webadmin.authentication;
import spark.Filter;
public interface AuthenticationFilter extends Filter {
+ String LOGIN = "LOGIN";
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/d0cad4de/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/authentication/JwtFilter.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/authentication/JwtFilter.java b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/authentication/JwtFilter.java
index 4832d6f..494ee6e 100644
--- a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/authentication/JwtFilter.java
+++ b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/authentication/JwtFilter.java
@@ -52,6 +52,9 @@ public class JwtFilter implements AuthenticationFilter {
checkHeaderPresent(bearer);
checkValidSignature(bearer);
checkIsAdmin(bearer);
+
+ String login = jwtTokenVerifier.extractLogin(bearer.get());
+ request.attribute(LOGIN, login);
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/d0cad4de/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/mdc/MDCFilter.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/mdc/MDCFilter.java b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/mdc/MDCFilter.java
index 1c12d78..8ac470b 100644
--- a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/mdc/MDCFilter.java
+++ b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/mdc/MDCFilter.java
@@ -22,6 +22,7 @@ package org.apache.james.webadmin.mdc;
import java.io.Closeable;
import org.apache.james.util.MDCBuilder;
+import org.apache.james.webadmin.authentication.AuthenticationFilter;
import spark.Filter;
import spark.Request;
@@ -39,6 +40,7 @@ public class MDCFilter implements Filter {
.addContext(VERB, request.requestMethod())
.addContext(MDCBuilder.PROTOCOL, "webadmin")
.addContext(MDCBuilder.ACTION, request.pathInfo())
+ .addContext(MDCBuilder.USER, request.attribute(AuthenticationFilter.LOGIN))
.build();
request.attribute(MDC_CLOSEABLE, mdcCloseable);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org