Skip to content

Commit

Permalink
[GEOS-8824] Refactor filter configs commnalities in new base class an…
Browse files Browse the repository at this point in the history 
…d only keep default values init
  • Loading branch information
@aaime
aaime committed Jul 5, 2018
1 parent 524f8d2 commit 79fe494
Show file tree
Hide file tree
Showing 4 changed files with 268 additions and 635 deletions.
225 changes: 14 additions & 211 deletions ...oauth2-geonode/src/main/java/org/geoserver/security/oauth2/GeoNodeOAuth2FilterConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,217 +4,20 @@
*/
package org.geoserver.security.oauth2;

import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.geoserver.security.config.PreAuthenticatedUserNameFilterConfig;
import org.geoserver.security.config.SecurityAuthFilterConfig;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.web.AuthenticationEntryPoint;

/** @author Alessio Fabiani, GeoSolutions S.A.S. */
public class GeoNodeOAuth2FilterConfig extends PreAuthenticatedUserNameFilterConfig
implements SecurityAuthFilterConfig, OAuth2FilterConfig {

/** serialVersionUID */
private static final long serialVersionUID = -2537118524032629497L;

// DEFAULT VALUES - BEGIN -
protected String cliendId;

protected String clientSecret;

protected String accessTokenUri = "https://geonode_host/o/token/";

protected String userAuthorizationUri = "https://geonode_host_port/o/authorize/";

protected String redirectUri = "http://localhost:8080/geoserver";

protected String checkTokenEndpointUrl = "https://geonode_host_port/api/o/v4/tokeninfo/";

protected String logoutUri = "https://geonode_host_port/account/logout/";

protected String scopes = "read,write,groups";

protected Boolean enableRedirectAuthenticationEntryPoint = false;

protected Boolean forceAccessTokenUriHttps = false;

protected Boolean forceUserAuthorizationUriHttps = false;

protected String loginEndpoint = "/j_spring_oauth2_geonode_login";

protected String logoutEndpoint = "/j_spring_oauth2_geonode_logout";
// DEFAULT VALUES - END -

@Override
public boolean providesAuthenticationEntryPoint() {
return true;
}

/** @return the cliendId */
public String getCliendId() {
return cliendId;
}

/** @param cliendId the cliendId to set */
public void setCliendId(String cliendId) {
this.cliendId = cliendId;
}

/** @return the clientSecret */
public String getClientSecret() {
return clientSecret;
}

/** @param clientSecret the clientSecret to set */
public void setClientSecret(String clientSecret) {
this.clientSecret = clientSecret;
}

/** @return the accessTokenUri */
public String getAccessTokenUri() {
return accessTokenUri;
}

/** @param accessTokenUri the accessTokenUri to set */
public void setAccessTokenUri(String accessTokenUri) {
this.accessTokenUri = accessTokenUri;
}

/** @return the userAuthorizationUri */
public String getUserAuthorizationUri() {
return userAuthorizationUri;
}

/** @param userAuthorizationUri the userAuthorizationUri to set */
public void setUserAuthorizationUri(String userAuthorizationUri) {
this.userAuthorizationUri = userAuthorizationUri;
}

/** @return the redirectUri */
public String getRedirectUri() {
return redirectUri;
}

/** @param redirectUri the redirectUri to set */
public void setRedirectUri(String redirectUri) {
this.redirectUri = redirectUri;
}

/** @return the checkTokenEndpointUrl */
public String getCheckTokenEndpointUrl() {
return checkTokenEndpointUrl;
}

/** @param checkTokenEndpointUrl the checkTokenEndpointUrl to set */
public void setCheckTokenEndpointUrl(String checkTokenEndpointUrl) {
this.checkTokenEndpointUrl = checkTokenEndpointUrl;
}

/** @return the logoutUri */
public String getLogoutUri() {
return logoutUri;
}

/** @param logoutUri the logoutUri to set */
public void setLogoutUri(String logoutUri) {
this.logoutUri = logoutUri;
}

/** @return the scopes */
public String getScopes() {
return scopes;
}

/** @param scopes the scopes to set */
public void setScopes(String scopes) {
this.scopes = scopes;
}

/** @return the enableRedirectAuthenticationEntryPoint */
public Boolean getEnableRedirectAuthenticationEntryPoint() {
return enableRedirectAuthenticationEntryPoint;
}

/**
* @param enableRedirectAuthenticationEntryPoint the enableRedirectAuthenticationEntryPoint to
* set
*/
public void setEnableRedirectAuthenticationEntryPoint(
Boolean enableRedirectAuthenticationEntryPoint) {
this.enableRedirectAuthenticationEntryPoint = enableRedirectAuthenticationEntryPoint;
}

@Override
public AuthenticationEntryPoint getAuthenticationEntryPoint() {
return new AuthenticationEntryPoint() {

@Override
public void commence(
HttpServletRequest request,
HttpServletResponse response,
AuthenticationException authException)
throws IOException, ServletException {
final StringBuilder loginUri = new StringBuilder(getUserAuthorizationUri());
loginUri.append("?")
.append("response_type=code")
.append("&")
.append("client_id=")
.append(getCliendId())
.append("&")
.append("scope=")
.append(getScopes().replace(",", "%20"))
.append("&")
.append("redirect_uri=")
.append(getRedirectUri());

if (getEnableRedirectAuthenticationEntryPoint()
|| request.getRequestURI().endsWith(getLoginEndpoint())) {
response.sendRedirect(loginUri.toString());
}
}
};
}

@Override
public Boolean getForceAccessTokenUriHttps() {
return forceAccessTokenUriHttps;
}

@Override
public void setForceAccessTokenUriHttps(Boolean forceAccessTokenUriHttps) {
this.forceAccessTokenUriHttps = forceAccessTokenUriHttps;
}

@Override
public Boolean getForceUserAuthorizationUriHttps() {
return forceUserAuthorizationUriHttps;
}

@Override
public void setForceUserAuthorizationUriHttps(Boolean forceUserAuthorizationUriHttps) {
this.forceUserAuthorizationUriHttps = forceUserAuthorizationUriHttps;
}

@Override
public String getLoginEndpoint() {
return loginEndpoint;
}

@Override
public String getLogoutEndpoint() {
return logoutEndpoint;
}

@Override
public void setLoginEndpoint(String loginEndpoint) {
this.loginEndpoint = loginEndpoint;
}

@Override
public void setLogoutEndpoint(String logoutEndpoint) {
this.logoutEndpoint = logoutEndpoint;
public class GeoNodeOAuth2FilterConfig extends GeoServerOAuth2FilterConfig {

public GeoNodeOAuth2FilterConfig() {
// default values
this.accessTokenUri = "https://geonode_host/o/token/";
this.userAuthorizationUri = "https://geonode_host_port/o/authorize/";
this.checkTokenEndpointUrl = "https://geonode_host_port/api/o/v4/tokeninfo/";
this.logoutUri = "https://geonode_host_port/account/logout/";
this.scopes = "read,write,groups";
this.enableRedirectAuthenticationEntryPoint = false;
this.forceAccessTokenUriHttps = false;
this.forceUserAuthorizationUriHttps = false;
this.loginEndpoint = "/j_spring_oauth2_geonode_login";
this.logoutEndpoint = "/j_spring_oauth2_geonode_logout";
}
}

0 comments on commit 79fe494

Please sign in to comment.