pagan
/
quarkus-extensions
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated extensions to Quarkus 1.4.2

Browse Source
master
Edward M. Kagan 6 years ago
parent a0fadd0534
commit a4ec697c3e
4 changed files with 77 additions and 84 deletions
Show Stats Download Patch File Download Diff File

4
.gitignore vendored
Unescape Escape View File

@ -0,0 +1,4 @@
/janitor/runtime/target/
/janitor/deployment/target/
/cayenne/deployment/target/
/cayenne/runtime/target/

25
janitor/runtime/src/main/java/org/pagan/janitor/security/JanitorAuthMechanism.java
Unescape Escape View File

@ -7,15 +7,14 @@ import io.quarkus.security.identity.request.AuthenticationRequest;
import io.quarkus.vertx.http.runtime.security.ChallengeData; import io.quarkus.vertx.http.runtime.security.ChallengeData;
import io.quarkus.vertx.http.runtime.security.HttpAuthenticationMechanism; import io.quarkus.vertx.http.runtime.security.HttpAuthenticationMechanism;
import io.quarkus.vertx.http.runtime.security.HttpCredentialTransport; import io.quarkus.vertx.http.runtime.security.HttpCredentialTransport;
import io.smallrye.mutiny.Uni;
import io.vertx.core.http.Cookie;
import io.vertx.core.http.HttpMethod; import io.vertx.core.http.HttpMethod;
import io.vertx.core.http.HttpServerRequest; import io.vertx.core.http.HttpServerRequest;
import io.vertx.core.http.HttpServerResponse; import io.vertx.core.http.HttpServerResponse;
import io.vertx.core.http.Cookie;
import io.vertx.ext.web.RoutingContext; import io.vertx.ext.web.RoutingContext;
import java.util.Collections; import java.util.Collections;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.ApplicationScoped;
import org.pagan.janitor.JanitorConfig; import org.pagan.janitor.JanitorConfig;
@ -33,7 +32,7 @@ public class JanitorAuthMechanism implements HttpAuthenticationMechanism {
} }
@Override @Override
public CompletionStage<SecurityIdentity> authenticate(RoutingContext context, IdentityProviderManager janitorIdentityProvider) { public Uni<SecurityIdentity> authenticate(RoutingContext context, IdentityProviderManager janitorIdentityProvider) {
Cookie cookie = context.getCookie(config.cookieName); Cookie cookie = context.getCookie(config.cookieName);
if (cookie != null) { if (cookie != null) {
final HttpServerRequest request = context.request(); final HttpServerRequest request = context.request();
@ -59,26 +58,14 @@ public class JanitorAuthMechanism implements HttpAuthenticationMechanism {
} }
@Override @Override
public CompletionStage<ChallengeData> getChallenge(RoutingContext rc) { public Uni<ChallengeData> getChallenge(RoutingContext rc) {
System.out.println("getChallenge"); return Uni.createFrom().item(
return CompletableFuture.completedFuture(
new ChallengeData( new ChallengeData(
HttpResponseStatus.UNAUTHORIZED.code(), "", "" HttpResponseStatus.UNAUTHORIZED.code(), "", ""
) )
); );
} }
@Override
public CompletionStage<Boolean> sendChallenge(RoutingContext context) {
System.out.println("sendChallenge");
Cookie cookie = context.getCookie(config.cookieName);
if (cookie != null) {
cookie.setMaxAge(0);
}
context.response().setStatusCode(HttpResponseStatus.UNAUTHORIZED.code());
return CompletableFuture.completedFuture(false);
}
@Override @Override
public Set<Class<? extends AuthenticationRequest>> getCredentialTypes() { public Set<Class<? extends AuthenticationRequest>> getCredentialTypes() {
System.out.println("getCredentialTypes"); System.out.println("getCredentialTypes");
@ -87,7 +74,7 @@ public class JanitorAuthMechanism implements HttpAuthenticationMechanism {
@Override @Override
public HttpCredentialTransport getCredentialTransport() { public HttpCredentialTransport getCredentialTransport() {
System.out.println("getCredentialTransport"); System.out.println("getCredentialTypes");
return new HttpCredentialTransport(HttpCredentialTransport.Type.COOKIE, config.cookieName); return new HttpCredentialTransport(HttpCredentialTransport.Type.COOKIE, config.cookieName);
} }

64
janitor/runtime/src/main/java/org/pagan/janitor/security/JanitorIdentityProvider.java
Unescape Escape View File

@ -5,16 +5,16 @@ import io.quarkus.security.identity.AuthenticationRequestContext;
import io.quarkus.security.identity.IdentityProvider; import io.quarkus.security.identity.IdentityProvider;
import io.quarkus.security.identity.SecurityIdentity; import io.quarkus.security.identity.SecurityIdentity;
import io.quarkus.security.runtime.QuarkusSecurityIdentity; import io.quarkus.security.runtime.QuarkusSecurityIdentity;
import io.smallrye.mutiny.Uni;
import io.smallrye.mutiny.subscription.UniEmitter;
import io.vertx.core.http.HttpMethod; import io.vertx.core.http.HttpMethod;
import io.vertx.core.logging.Logger; import io.vertx.core.logging.Logger;
import io.vertx.core.logging.LoggerFactory; import io.vertx.core.logging.LoggerFactory;
import java.util.concurrent.CompletableFuture; import java.util.function.Consumer;
import java.util.concurrent.CompletionStage;
import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject; import javax.inject.Inject;
import org.pagan.janitor.cache.SessionCache; import org.pagan.janitor.cache.SessionCache;
import org.pagan.janitor.cache.SessionInfo; import org.pagan.janitor.cache.SessionInfo;
//import org.pagan.janitor.security.JanitorPrincipalProducer.NullSessionToken;
/** /**
* @author Edward M. Kagan * @author Edward M. Kagan
@ -34,11 +34,14 @@ public class JanitorIdentityProvider implements IdentityProvider<JanitorAuthenti
} }
@Override @Override
public CompletionStage<SecurityIdentity> authenticate( public Uni<SecurityIdentity> authenticate(JanitorAuthenticationRequest request,
JanitorAuthenticationRequest request,
AuthenticationRequestContext context) { AuthenticationRequestContext context) {
return Uni.createFrom().emitter(new Consumer<UniEmitter<? super SecurityIdentity>>() {
@Override
public void accept(UniEmitter<? super SecurityIdentity> uniEmitter) {
if (request.getMethod() == null) { if (request.getMethod() == null) {
return anonymous(); anonymous(uniEmitter);
} }
final HttpMethod method = request.getMethod(); final HttpMethod method = request.getMethod();
@ -46,24 +49,23 @@ public class JanitorIdentityProvider implements IdentityProvider<JanitorAuthenti
final String csrfToken = request.getCsrfToken(); final String csrfToken = request.getCsrfToken();
final String path = request.getPath(); final String path = request.getPath();
if (request.getOrigin() != null && request.getOrigin().length() > 0) if (request.getOrigin() != null && request.getOrigin().length() > 0) {
{ // request.putHeader("Access-Control-Allow-Origin", request.getOrigin());
// request.putHeader("Access-Control-Allow-Origin", request.getOrigin()); // request.putHeader("Access-Control-Allow-Methods", "POST, PUT, GET, OPTIONS, DELETE, PATCH, HEAD");
// request.putHeader("Access-Control-Allow-Methods", "POST, PUT, GET, OPTIONS, DELETE, PATCH, HEAD"); // request.putHeader("Access-Control-Allow-Credentials", "true");
// request.putHeader("Access-Control-Allow-Credentials", "true"); // request.putHeader("Access-Control-Max-Age", "1209600");
// request.putHeader("Access-Control-Max-Age", "1209600"); // request.putHeader("Access-Control-Expose-Headers", "X-CSRF-TOKEN, X-CSRF-ERROR");
// request.putHeader("Access-Control-Expose-Headers", "X-CSRF-TOKEN, X-CSRF-ERROR"); // request.putHeader("Access-Control-Allow-Headers", "origin, accept, authorization, content-type, x-requested-with, x-csrf-token, x-csrf-error");
// request.putHeader("Access-Control-Allow-Headers", "origin, accept, authorization, content-type, x-requested-with, x-csrf-token, x-csrf-error");
} }
if (method == HttpMethod.OPTIONS) { if (method == HttpMethod.OPTIONS) {
LOG.debug("method = OPTIONS"); LOG.debug("method = OPTIONS");
return anonymous(); anonymous(uniEmitter);
} }
if (sessionId == null) { if (sessionId == null) {
LOG.debug("sessionId = null"); LOG.debug("sessionId = null");
return anonymous(); anonymous(uniEmitter);
} }
SessionInfo sessionInfo = sessionCache.get(sessionId); SessionInfo sessionInfo = sessionCache.get(sessionId);
@ -71,42 +73,42 @@ public class JanitorIdentityProvider implements IdentityProvider<JanitorAuthenti
if (sessionInfo == null) { if (sessionInfo == null) {
LOG.debug("session info not found in session storage"); LOG.debug("session info not found in session storage");
return anonymous(); anonymous(uniEmitter);
} }
if (method != HttpMethod.GET && method != HttpMethod.HEAD) { if (method != HttpMethod.GET && method != HttpMethod.HEAD) {
LOG.debug("path = " + path); LOG.debug("path = " + path);
if (!path.equals("/api/auth/") && !path.equals("/api/auth") ) { if (!path.equals("/api/auth/") && !path.equals("/api/auth")) {
if (csrfToken == null) { if (csrfToken == null) {
LOG.warn("csrfToken is null"); LOG.warn("csrfToken is null");
return failed(); failed(uniEmitter);
} }
if (!sessionInfo.csrfToken().equals(csrfToken)) { if (!sessionInfo.csrfToken().equals(csrfToken)) {
LOG.error("bad csrfToken"); LOG.error("bad csrfToken");
return failed(); failed(uniEmitter);
} }
} }
} }
principal(uniEmitter, sessionInfo);
return principal(sessionInfo); }
});
} }
private CompletionStage<SecurityIdentity> anonymous() { private void anonymous(UniEmitter<? super SecurityIdentity> uniEmitter) {
return principal(SessionInfo.ANONYMOUS); principal(uniEmitter, SessionInfo.ANONYMOUS);
} }
private CompletionStage<SecurityIdentity> principal(SessionInfo sessionInfo) { private void principal(UniEmitter<? super SecurityIdentity> uniEmitter, SessionInfo sessionInfo) {
return CompletableFuture.completedFuture( uniEmitter.complete(
QuarkusSecurityIdentity.builder().setPrincipal(sessionInfo) QuarkusSecurityIdentity.builder()
.setPrincipal(sessionInfo)
.addRole(sessionInfo.role()) .addRole(sessionInfo.role())
.build() .build()
); );
} }
private CompletionStage<SecurityIdentity> failed() { private void failed(UniEmitter<? super SecurityIdentity> uniEmitter) {
CompletableFuture<SecurityIdentity> cf = new CompletableFuture<SecurityIdentity>(); uniEmitter.fail(new AuthenticationFailedException());
cf.completeExceptionally(new AuthenticationFailedException());
return cf;
} }
} }

4
pom.xml
Unescape Escape View File

@ -36,10 +36,10 @@
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus-plugin.version>1.3.1.Final</quarkus-plugin.version> <quarkus-plugin.version>1.4.2.Final</quarkus-plugin.version>
<quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id> <quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
<quarkus.platform.version>1.3.1.Final</quarkus.platform.version> <quarkus.platform.version>1.4.2.Final</quarkus.platform.version>
<surefire-plugin.version>2.22.1</surefire-plugin.version> <surefire-plugin.version>2.22.1</surefire-plugin.version>
<cayenne.version>4.1.RC2</cayenne.version> <cayenne.version>4.1.RC2</cayenne.version>
<jedis.version>3.2.0</jedis.version> <jedis.version>3.2.0</jedis.version>

Write Preview
Loading…
Cancel
Save