This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 7e3ff132c9ca7273f8eea0d2b37fe0b1844a250a Author: Juan Cabrerizo <[email protected]> AuthorDate: Wed Nov 28 16:54:29 2018 +0000 changes after Andrew --- .../java/org/apache/brooklyn/rest/filter/GoogleOauthFilter.java | 8 ++++++-- .../rest/security/provider/GoogleOauthSecurityProvider.java | 9 +++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/GoogleOauthFilter.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/GoogleOauthFilter.java index e199ac2..033f035 100644 --- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/GoogleOauthFilter.java +++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/GoogleOauthFilter.java @@ -25,6 +25,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.annotation.Priority; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; @@ -33,6 +34,7 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.ext.Provider; import net.minidev.json.JSONObject; import org.apache.http.HttpEntity; @@ -51,11 +53,13 @@ import org.apache.http.util.EntityUtils; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; +@Provider +@Priority(100) public class GoogleOauthFilter implements Filter { - private static final String SESSION_KEY_CODE = "code"; + public static final String SESSION_KEY_CODE = "code"; - private static final String SESSION_KEY_ACCESS_TOKEN = "access_token"; + public static final String SESSION_KEY_ACCESS_TOKEN = "access_token"; public static final String PARAM_URI_TOKEN_INFO = "uriTokenInfo"; private String uriTokenInfo = ""; diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/security/provider/GoogleOauthSecurityProvider.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/security/provider/GoogleOauthSecurityProvider.java index f3942a6..809c661 100644 --- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/security/provider/GoogleOauthSecurityProvider.java +++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/security/provider/GoogleOauthSecurityProvider.java @@ -18,6 +18,7 @@ */ package org.apache.brooklyn.rest.security.provider; +import org.apache.brooklyn.rest.filter.GoogleOauthFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,18 +32,22 @@ public class GoogleOauthSecurityProvider implements SecurityProvider { @Override public boolean isAuthenticated(HttpSession session) { LOG.info("isAuthenticated"); - return true; + Object token = session.getAttribute(GoogleOauthFilter.SESSION_KEY_ACCESS_TOKEN); + + return token!=null; } @Override public boolean authenticate(HttpSession session, String user, String password) { LOG.info("authenticate"); - return true; + // + return false; } @Override public boolean logout(HttpSession session) { LOG.info("logout"); + session.removeAttribute("xx"); return true; } }
