Big Bang
This commit is contained in:
commit
8d7f14bf7f
3
.gitignore
vendored
Normal file
3
.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
target
|
||||
*.iml
|
||||
.idea
|
||||
202
LICENSE
Normal file
202
LICENSE
Normal file
@ -0,0 +1,202 @@
|
||||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright 2010-2013 Coda Hale and Yammer, Inc., 2014-2015 Dropwizard Team
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
75
README.md
Normal file
75
README.md
Normal file
@ -0,0 +1,75 @@
|
||||
# dropwizard-simpleauth
|
||||
|
||||
A Dropwizard library that lets you use simple `@Auth` annotations for authenticating multiple
|
||||
types, without having to deal with `@RolesAllowed` style authorizations.
|
||||
|
||||
Install from maven central:
|
||||
|
||||
```
|
||||
<dependency>
|
||||
<groupId>org.whispersystems</groupId>
|
||||
<artifactId>dropwizard-simpleauth</artifactId>
|
||||
<version>${latest_version}</version>
|
||||
</dependency>
|
||||
```
|
||||
|
||||
## The details
|
||||
|
||||
This library allows writing an authenticated Dropwizard resource to look like this:
|
||||
|
||||
```
|
||||
@Path("/api/v1/mail")
|
||||
public class MailResource {
|
||||
|
||||
@Timed
|
||||
@POST
|
||||
@Path("/{destination}/")
|
||||
@Consumes(MediaType.APPLICATION_JSON_TYPE)
|
||||
public void sendMessage(@Auth User sender,
|
||||
@PathParam("destination") String destination,
|
||||
@Valid Message message)
|
||||
{
|
||||
...
|
||||
}
|
||||
|
||||
@Timed
|
||||
@DELETE
|
||||
@Path("/{messageId}/")
|
||||
public void sendMessage(@Auth Admin admin,
|
||||
@PathParam("messageId") long messageId)
|
||||
{
|
||||
...
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
```
|
||||
|
||||
No "authorization" tags like `@AllowAll`, `@DenyAll`, `@RolesAllowed` are used. Instead,
|
||||
the `@Auth` tag allows you to authenticate multiple different "principal" types (in this example
|
||||
both `User` and `Admin`), neither of which have to extend `Principal`.
|
||||
|
||||
## Registering authenticators
|
||||
|
||||
To support authenticating multiple types, register multiple `AuthFilter`s:
|
||||
|
||||
`````
|
||||
@Override
|
||||
public void run(ExampleConfiguration configuration,
|
||||
Environment environment)
|
||||
{
|
||||
environment.jersey().register(new AuthDynamicFeature(
|
||||
new BasicCredentialAuthFilter.Builder<User>()
|
||||
.setAuthenticator(new UserAuthenticator())
|
||||
.setPrincipal(User.class)
|
||||
.buildAuthFilter(),
|
||||
new BasicCredentialAuthFilter.Builder<Admin>()
|
||||
.setAuthenticator(new AdminAuthenticator())
|
||||
.setPrincipal(Admin.class)
|
||||
.buildAuthFilter()));
|
||||
|
||||
environment.jersey().register(new AuthValueFactoryProvider.Binder());
|
||||
}
|
||||
`````
|
||||
|
||||
That's it!
|
||||
144
pom.xml
Normal file
144
pom.xml
Normal file
@ -0,0 +1,144 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<prerequisites>
|
||||
<maven>3.0.0</maven>
|
||||
</prerequisites>
|
||||
|
||||
<groupId>org.whispersystems</groupId>
|
||||
<artifactId>dropwizard-simpleauth</artifactId>
|
||||
<version>0.1.0</version>
|
||||
|
||||
<name>dropwizard-simpleauth</name>
|
||||
<description>A Dropwizard library for simple @Auth</description>
|
||||
<url>https://github.com/WhisperSystems/dropwizard-simpleauth</url>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>Apache</name>
|
||||
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
|
||||
<distribution>repo</distribution>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<developers>
|
||||
<developer>
|
||||
<name>Moxie Marlinspike</name>
|
||||
</developer>
|
||||
</developers>
|
||||
|
||||
<scm>
|
||||
<url>https://github.com/WhisperSystems/dropwizard-simpleauth</url>
|
||||
<connection>scm:git:https://github.com/WhisperSystems/dropwizard-simpleauth.git</connection>
|
||||
<developerConnection>scm:git:https://github.com/WhisperSystems/dropwizard-simpleauth.git</developerConnection>
|
||||
</scm>
|
||||
|
||||
<properties>
|
||||
<dropwizard.version>0.9.0-rc3</dropwizard.version>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>io.dropwizard</groupId>
|
||||
<artifactId>dropwizard-auth</artifactId>
|
||||
<version>${dropwizard.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>4.12</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.mockito</groupId>
|
||||
<artifactId>mockito-all</artifactId>
|
||||
<version>1.10.19</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
<distributionManagement>
|
||||
<snapshotRepository>
|
||||
<id>ossrh</id>
|
||||
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
|
||||
</snapshotRepository>
|
||||
<repository>
|
||||
<id>ossrh</id>
|
||||
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
|
||||
</repository>
|
||||
</distributionManagement>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<configuration>
|
||||
<source>1.7</source>
|
||||
<target>1.7</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-source-plugin</artifactId>
|
||||
<version>2.2.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>attach-sources</id>
|
||||
<goals>
|
||||
<goal>jar</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>2.9.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>attach-javadocs</id>
|
||||
<goals>
|
||||
<goal>jar</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-gpg-plugin</artifactId>
|
||||
<version>1.5</version>
|
||||
<configuration>
|
||||
<keyname>00B2CAB8</keyname>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>sign-artifacts</id>
|
||||
<phase>verify</phase>
|
||||
<goals>
|
||||
<goal>sign</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>2.4</version>
|
||||
<configuration>
|
||||
<archive>
|
||||
<manifest>
|
||||
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
|
||||
</manifest>
|
||||
</archive>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
</project>
|
||||
@ -0,0 +1,59 @@
|
||||
package org.whispersystems.dropwizard.simpleauth;
|
||||
|
||||
import org.glassfish.jersey.server.model.AnnotatedMethod;
|
||||
|
||||
import javax.ws.rs.container.DynamicFeature;
|
||||
import javax.ws.rs.container.ResourceInfo;
|
||||
import javax.ws.rs.core.FeatureContext;
|
||||
import java.lang.annotation.Annotation;
|
||||
|
||||
import io.dropwizard.auth.Auth;
|
||||
|
||||
public class AuthDynamicFeature implements DynamicFeature {
|
||||
|
||||
private AuthFilter[] authFilters;
|
||||
|
||||
public AuthDynamicFeature(AuthFilter... authFilters) {
|
||||
this.authFilters = authFilters;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void configure(ResourceInfo resourceInfo, FeatureContext context) {
|
||||
AnnotatedMethod annotatedMethod = new AnnotatedMethod(resourceInfo.getResourceMethod());
|
||||
Annotation[][] parameterAnnotations = annotatedMethod.getParameterAnnotations();
|
||||
Class<?>[] parameterTypes = annotatedMethod.getParameterTypes();
|
||||
|
||||
verifyAuthAnnotations(parameterAnnotations);
|
||||
|
||||
for (int i=0;i<parameterAnnotations.length;i++) {
|
||||
for (Annotation annotation : parameterAnnotations[i]) {
|
||||
if (annotation instanceof Auth) {
|
||||
context.register(getFilterFor(parameterTypes[i]));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private AuthFilter getFilterFor(Class<?> parameterType) {
|
||||
for (AuthFilter filter : authFilters) {
|
||||
if (filter.supports(parameterType)) return filter;
|
||||
}
|
||||
|
||||
throw new IllegalArgumentException("No authenticator for type: " + parameterType);
|
||||
}
|
||||
|
||||
private void verifyAuthAnnotations(Annotation[][] parameterAnnotations) {
|
||||
int authCount = 0;
|
||||
|
||||
for (Annotation[] annotations : parameterAnnotations) {
|
||||
for (Annotation annotation : annotations) {
|
||||
if (annotation instanceof Auth) authCount++;
|
||||
}
|
||||
}
|
||||
|
||||
if (authCount > 1) {
|
||||
throw new IllegalArgumentException("Only one @Auth tag supported per resource method!");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,98 @@
|
||||
package org.whispersystems.dropwizard.simpleauth;
|
||||
|
||||
import com.google.common.base.Preconditions;
|
||||
|
||||
import javax.annotation.Priority;
|
||||
import javax.ws.rs.Priorities;
|
||||
import javax.ws.rs.container.ContainerRequestFilter;
|
||||
|
||||
import io.dropwizard.auth.DefaultUnauthorizedHandler;
|
||||
import io.dropwizard.auth.UnauthorizedHandler;
|
||||
|
||||
@Priority(Priorities.AUTHENTICATION)
|
||||
public abstract class AuthFilter<C, P> implements ContainerRequestFilter {
|
||||
|
||||
protected String prefix;
|
||||
protected String realm;
|
||||
protected Authenticator<C, P> authenticator;
|
||||
protected Class<P> principalType;
|
||||
protected UnauthorizedHandler unauthorizedHandler = new DefaultUnauthorizedHandler();
|
||||
|
||||
|
||||
public boolean supports(Class<?> clazz) {
|
||||
return clazz.equals(principalType);
|
||||
}
|
||||
|
||||
/**
|
||||
* Abstract builder for auth filters.
|
||||
*
|
||||
* @param <C> the type of credentials that the filter accepts
|
||||
* @param <P> the type of the principal that the filter accepts
|
||||
*/
|
||||
public abstract static class AuthFilterBuilder<C, P, T extends AuthFilter<C, P>> {
|
||||
|
||||
private String realm = "realm";
|
||||
private String prefix = "Basic";
|
||||
private Authenticator<C, P> authenticator;
|
||||
private Class<P> principalType;
|
||||
|
||||
/**
|
||||
* Sets the given realm
|
||||
*
|
||||
* @param realm a realm
|
||||
* @return the current builder
|
||||
*/
|
||||
public AuthFilterBuilder<C, P, T> setRealm(String realm) {
|
||||
this.realm = realm;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the given prefix
|
||||
*
|
||||
* @param prefix a prefix
|
||||
* @return the current builder
|
||||
*/
|
||||
public AuthFilterBuilder<C, P, T> setPrefix(String prefix) {
|
||||
this.prefix = prefix;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the given authenticator
|
||||
*
|
||||
* @param authenticator an {@link io.dropwizard.auth.Authenticator}
|
||||
* @return the current builder
|
||||
*/
|
||||
public AuthFilterBuilder<C, P, T> setAuthenticator(Authenticator<C, P> authenticator) {
|
||||
this.authenticator = authenticator;
|
||||
return this;
|
||||
}
|
||||
|
||||
public AuthFilterBuilder<C, P, T> setPrincipal(Class<P> principalType) {
|
||||
this.principalType = principalType;
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Builds an instance of the filter with a provided authenticator,
|
||||
* an authorizer, a prefix, and a realm.
|
||||
*
|
||||
* @return a new instance of the filter
|
||||
*/
|
||||
public T buildAuthFilter() {
|
||||
Preconditions.checkArgument(realm != null, "Realm is not set");
|
||||
Preconditions.checkArgument(prefix != null, "Prefix is not set");
|
||||
Preconditions.checkArgument(authenticator != null, "Authenticator is not set");
|
||||
|
||||
T authFilter = newInstance();
|
||||
authFilter.authenticator = authenticator;
|
||||
authFilter.prefix = prefix;
|
||||
authFilter.realm = realm;
|
||||
authFilter.principalType = principalType;
|
||||
return authFilter;
|
||||
}
|
||||
|
||||
protected abstract T newInstance();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
package org.whispersystems.dropwizard.simpleauth;
|
||||
|
||||
import javax.security.auth.Subject;
|
||||
import java.security.Principal;
|
||||
|
||||
public class AuthPrincipal implements Principal {
|
||||
|
||||
private final Object authenticated;
|
||||
|
||||
public AuthPrincipal(Object authenticated) {
|
||||
this.authenticated = authenticated;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean implies(Subject subject) {
|
||||
return false;
|
||||
}
|
||||
|
||||
public Object getAuthenticated() {
|
||||
return authenticated;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
package org.whispersystems.dropwizard.simpleauth;
|
||||
|
||||
import javax.ws.rs.core.SecurityContext;
|
||||
import java.security.Principal;
|
||||
|
||||
public class AuthSecurityContext<P> implements SecurityContext {
|
||||
|
||||
private final AuthPrincipal principal;
|
||||
private final boolean secure;
|
||||
|
||||
public AuthSecurityContext(P principal, boolean secure) {
|
||||
this.principal = new AuthPrincipal(principal);
|
||||
this.secure = secure;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Principal getUserPrincipal() {
|
||||
return principal;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isUserInRole(String role) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isSecure() {
|
||||
return secure;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getAuthenticationScheme() {
|
||||
return SecurityContext.BASIC_AUTH;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,87 @@
|
||||
package org.whispersystems.dropwizard.simpleauth;
|
||||
|
||||
import org.glassfish.hk2.api.InjectionResolver;
|
||||
import org.glassfish.hk2.api.ServiceLocator;
|
||||
import org.glassfish.hk2.api.TypeLiteral;
|
||||
import org.glassfish.hk2.utilities.binding.AbstractBinder;
|
||||
import org.glassfish.jersey.server.internal.inject.AbstractContainerRequestValueFactory;
|
||||
import org.glassfish.jersey.server.internal.inject.AbstractValueFactoryProvider;
|
||||
import org.glassfish.jersey.server.internal.inject.MultivaluedParameterExtractorProvider;
|
||||
import org.glassfish.jersey.server.internal.inject.ParamInjectionResolver;
|
||||
import org.glassfish.jersey.server.model.Parameter;
|
||||
import org.glassfish.jersey.server.spi.internal.ValueFactoryProvider;
|
||||
|
||||
import javax.inject.Inject;
|
||||
import javax.inject.Singleton;
|
||||
import java.security.Principal;
|
||||
|
||||
import io.dropwizard.auth.Auth;
|
||||
|
||||
@Singleton
|
||||
public class AuthValueFactoryProvider extends AbstractValueFactoryProvider {
|
||||
|
||||
@Inject
|
||||
public AuthValueFactoryProvider(MultivaluedParameterExtractorProvider mpep,
|
||||
ServiceLocator injector)
|
||||
{
|
||||
super(mpep, injector, Parameter.Source.UNKNOWN);
|
||||
}
|
||||
|
||||
@Override
|
||||
public AbstractContainerRequestValueFactory<?> createValueFactory(final Parameter parameter) {
|
||||
if (parameter.getAnnotation(Auth.class) == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return new AbstractContainerRequestValueFactory() {
|
||||
|
||||
/**
|
||||
* @return {@link Principal} stored on the request, or {@code null} if no object was found.
|
||||
*/
|
||||
public Object provide() {
|
||||
Principal principal = getContainerRequest().getSecurityContext().getUserPrincipal();
|
||||
|
||||
if (principal == null) {
|
||||
throw new IllegalStateException("Cannot inject a custom principal into unauthenticated request");
|
||||
}
|
||||
|
||||
if (!(principal instanceof AuthPrincipal)) {
|
||||
throw new IllegalArgumentException("Cannot inject a non-AuthPrincipal into request");
|
||||
}
|
||||
|
||||
if (!parameter.getRawType().isAssignableFrom(((AuthPrincipal)principal).getAuthenticated().getClass())) {
|
||||
throw new IllegalArgumentException("Authenticated principal is of the wrong type!");
|
||||
}
|
||||
|
||||
return parameter.getRawType().cast(((AuthPrincipal) principal).getAuthenticated());
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@Singleton
|
||||
private static class AuthInjectionResolver extends ParamInjectionResolver<Auth> {
|
||||
|
||||
/**
|
||||
* Create new {@link Auth} annotation injection resolver.
|
||||
*/
|
||||
public AuthInjectionResolver() {
|
||||
super(AuthValueFactoryProvider.class);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Injection binder for {@link AuthValueFactoryProvider} and {@link AuthInjectionResolver}.
|
||||
*
|
||||
*/
|
||||
public static class Binder extends AbstractBinder {
|
||||
|
||||
public Binder() {}
|
||||
|
||||
@Override
|
||||
protected void configure() {
|
||||
bind(AuthValueFactoryProvider.class).to(ValueFactoryProvider.class).in(Singleton.class);
|
||||
bind(AuthInjectionResolver.class).to(new TypeLiteral<InjectionResolver<Auth>>() {
|
||||
}).in(Singleton.class);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
package org.whispersystems.dropwizard.simpleauth;
|
||||
|
||||
|
||||
import com.google.common.base.Optional;
|
||||
|
||||
import io.dropwizard.auth.AuthenticationException;
|
||||
|
||||
/**
|
||||
* An interface for classes which authenticate user-provided credentials and return principal
|
||||
* objects.
|
||||
*
|
||||
* @param <C> the type of credentials the authenticator can authenticate
|
||||
* @param <P> the type of principals the authenticator returns
|
||||
*/
|
||||
public interface Authenticator<C, P> {
|
||||
/**
|
||||
* Given a set of user-provided credentials, return an optional principal.
|
||||
*
|
||||
* If the credentials are valid and map to a principal, returns an {@code Optional.of(p)}.
|
||||
*
|
||||
* If the credentials are invalid, returns an {@code Optional.absent()}.
|
||||
*
|
||||
* @param credentials a set of user-provided credentials
|
||||
* @return either an authenticated principal or an absent optional
|
||||
* @throws AuthenticationException if the credentials cannot be authenticated due to an
|
||||
* underlying error
|
||||
*/
|
||||
Optional<P> authenticate(C credentials) throws AuthenticationException;
|
||||
}
|
||||
@ -0,0 +1,75 @@
|
||||
package org.whispersystems.dropwizard.simpleauth;
|
||||
|
||||
import com.google.common.base.Optional;
|
||||
import com.google.common.io.BaseEncoding;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import javax.annotation.Priority;
|
||||
import javax.ws.rs.InternalServerErrorException;
|
||||
import javax.ws.rs.Priorities;
|
||||
import javax.ws.rs.WebApplicationException;
|
||||
import javax.ws.rs.container.ContainerRequestContext;
|
||||
import javax.ws.rs.core.HttpHeaders;
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
import io.dropwizard.auth.AuthenticationException;
|
||||
import io.dropwizard.auth.basic.BasicCredentials;
|
||||
|
||||
@Priority(Priorities.AUTHENTICATION)
|
||||
public class BasicCredentialAuthFilter<P> extends AuthFilter<BasicCredentials, P> {
|
||||
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(BasicCredentialAuthFilter.class);
|
||||
|
||||
private BasicCredentialAuthFilter() {}
|
||||
|
||||
@Override
|
||||
public void filter(final ContainerRequestContext requestContext) throws IOException {
|
||||
final String header = requestContext.getHeaders().getFirst(HttpHeaders.AUTHORIZATION);
|
||||
|
||||
try {
|
||||
if (header != null) {
|
||||
final int space = header.indexOf(' ');
|
||||
if (space > 0) {
|
||||
final String method = header.substring(0, space);
|
||||
if (prefix.equalsIgnoreCase(method)) {
|
||||
final String decoded = new String(
|
||||
BaseEncoding.base64().decode(header.substring(space + 1)),
|
||||
StandardCharsets.UTF_8);
|
||||
final int i = decoded.indexOf(':');
|
||||
if (i > 0) {
|
||||
final String username = decoded.substring(0, i);
|
||||
final String password = decoded.substring(i + 1);
|
||||
final BasicCredentials credentials = new BasicCredentials(username, password);
|
||||
try {
|
||||
Optional<P> principal = authenticator.authenticate(credentials);
|
||||
|
||||
if (principal.isPresent()) {
|
||||
requestContext.setSecurityContext(new AuthSecurityContext<P>(principal.get(), false));
|
||||
return;
|
||||
}
|
||||
} catch (AuthenticationException e) {
|
||||
LOGGER.warn("Error authenticating credentials", e);
|
||||
throw new InternalServerErrorException();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (IllegalArgumentException e) {
|
||||
LOGGER.warn("Error decoding credentials", e);
|
||||
}
|
||||
|
||||
throw new WebApplicationException(unauthorizedHandler.buildResponse(prefix, realm));
|
||||
}
|
||||
|
||||
public static class Builder<P> extends AuthFilter.AuthFilterBuilder<BasicCredentials, P, BasicCredentialAuthFilter<P>> {
|
||||
|
||||
@Override
|
||||
protected BasicCredentialAuthFilter<P> newInstance() {
|
||||
return new BasicCredentialAuthFilter<>();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,87 @@
|
||||
package org.whispersystems.dropwizard.simpleauth;
|
||||
|
||||
|
||||
import com.google.common.base.Optional;
|
||||
import org.junit.Test;
|
||||
|
||||
import javax.ws.rs.container.ResourceInfo;
|
||||
import javax.ws.rs.core.FeatureContext;
|
||||
|
||||
import io.dropwizard.auth.Auth;
|
||||
import io.dropwizard.auth.AuthenticationException;
|
||||
import io.dropwizard.auth.basic.BasicCredentials;
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
public class AuthDynamicFeatureTest {
|
||||
|
||||
@Test
|
||||
public void testPrincipalTypes() throws NoSuchMethodException {
|
||||
AuthFilter stringPrincipal = new BasicCredentialAuthFilter.Builder<String>().setRealm("Hmm")
|
||||
.setPrincipal(String.class)
|
||||
.setAuthenticator(new StringAuthenticator())
|
||||
.buildAuthFilter();
|
||||
|
||||
AuthFilter integerPrincipal = new BasicCredentialAuthFilter.Builder<Integer>().setRealm("Hmm")
|
||||
.setPrincipal(Integer.class)
|
||||
.setAuthenticator(new IntegerAuthenticator())
|
||||
.buildAuthFilter();
|
||||
|
||||
AuthDynamicFeature dynamicFeature = new AuthDynamicFeature(stringPrincipal, integerPrincipal);
|
||||
ResourceInfo resourceInfo = mock(ResourceInfo.class );
|
||||
FeatureContext featureContext = mock(FeatureContext.class);
|
||||
|
||||
when(resourceInfo.getResourceMethod()).thenReturn(MockMethod.class.getDeclaredMethod("stringAuthParam", String.class));
|
||||
|
||||
dynamicFeature.configure(resourceInfo, featureContext);
|
||||
verify(featureContext).register(eq(stringPrincipal));
|
||||
|
||||
when(resourceInfo.getResourceMethod()).thenReturn(MockMethod.class.getDeclaredMethod("integerAuthParam", Integer.class));
|
||||
|
||||
dynamicFeature.configure(resourceInfo, featureContext);
|
||||
verify(featureContext).register(eq(integerPrincipal));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testMultipleAuthTags() throws NoSuchMethodException {
|
||||
AuthDynamicFeature dynamicFeature = new AuthDynamicFeature(new AuthFilter[0]);
|
||||
ResourceInfo resourceInfo = mock(ResourceInfo.class );
|
||||
FeatureContext featureContext = mock(FeatureContext.class);
|
||||
|
||||
when(resourceInfo.getResourceMethod()).thenReturn(MockMethod.class.getDeclaredMethod("multipleAuthParams", String.class, String.class));
|
||||
|
||||
try {
|
||||
dynamicFeature.configure(resourceInfo, featureContext);
|
||||
throw new AssertionError("Shouldn't support multiple auth tags!");
|
||||
} catch (Exception e) {
|
||||
// Good
|
||||
}
|
||||
}
|
||||
|
||||
private static class MockMethod {
|
||||
public void multipleAuthParams(@Auth String foo, @Auth String bar) {}
|
||||
public void stringAuthParam(@Auth String foo) {}
|
||||
public void integerAuthParam(@Auth Integer bar) {}
|
||||
}
|
||||
|
||||
private static class StringAuthenticator implements Authenticator<BasicCredentials, String> {
|
||||
@Override
|
||||
public Optional<String> authenticate(BasicCredentials credentials)
|
||||
throws AuthenticationException
|
||||
{
|
||||
if (credentials.getUsername().equals("user") &&
|
||||
credentials.getPassword().equals("password"))
|
||||
return Optional.of("user");
|
||||
|
||||
return Optional.absent();
|
||||
}
|
||||
}
|
||||
|
||||
private static class IntegerAuthenticator implements Authenticator<BasicCredentials, Integer> {
|
||||
|
||||
@Override
|
||||
public Optional<Integer> authenticate(BasicCredentials credentials) throws AuthenticationException {
|
||||
return Optional.of(1);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,82 @@
|
||||
package org.whispersystems.dropwizard.simpleauth;
|
||||
|
||||
import com.google.common.base.Optional;
|
||||
import org.junit.Test;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
|
||||
import javax.ws.rs.WebApplicationException;
|
||||
import javax.ws.rs.container.ContainerRequestContext;
|
||||
import javax.ws.rs.core.HttpHeaders;
|
||||
import javax.ws.rs.core.MultivaluedHashMap;
|
||||
import javax.ws.rs.core.MultivaluedMap;
|
||||
import javax.ws.rs.core.SecurityContext;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import io.dropwizard.auth.AuthenticationException;
|
||||
import io.dropwizard.auth.basic.BasicCredentials;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.mockito.Mockito.*;
|
||||
|
||||
public class BasicCredentialAuthFilterTest {
|
||||
|
||||
@Test
|
||||
public void testValidAuth() throws IOException {
|
||||
AuthFilter authFilter = new BasicCredentialAuthFilter.Builder<String>().setAuthenticator(new StringAuthenticator())
|
||||
.setPrincipal(String.class)
|
||||
.setRealm("Hmm")
|
||||
.buildAuthFilter();
|
||||
|
||||
MultivaluedMap<String, String> headers = new MultivaluedHashMap<String, String>() {{
|
||||
add(HttpHeaders.AUTHORIZATION, "Basic dXNlcjpmb28=");
|
||||
}};
|
||||
|
||||
ContainerRequestContext containerRequestContext = mock(ContainerRequestContext.class);
|
||||
when(containerRequestContext.getHeaders()).thenReturn(headers);
|
||||
|
||||
authFilter.filter(containerRequestContext);
|
||||
|
||||
ArgumentCaptor<SecurityContext> captor = ArgumentCaptor.forClass(SecurityContext.class);
|
||||
verify(containerRequestContext).setSecurityContext(captor.capture());
|
||||
|
||||
assertTrue(captor.getValue().getUserPrincipal() instanceof AuthPrincipal);
|
||||
assertEquals(((AuthPrincipal) captor.getValue().getUserPrincipal()).getAuthenticated(), "user");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testInvalidAuth() throws Exception {
|
||||
AuthFilter authFilter = new BasicCredentialAuthFilter.Builder<String>().setAuthenticator(new StringAuthenticator())
|
||||
.setPrincipal(String.class)
|
||||
.setRealm("Hmm")
|
||||
.buildAuthFilter();
|
||||
|
||||
MultivaluedMap<String, String> headers = new MultivaluedHashMap<String, String>() {{
|
||||
add(HttpHeaders.AUTHORIZATION, "Basic dXNlcjpiYXo=");
|
||||
}};
|
||||
|
||||
ContainerRequestContext containerRequestContext = mock(ContainerRequestContext.class);
|
||||
when(containerRequestContext.getHeaders()).thenReturn(headers);
|
||||
|
||||
try {
|
||||
authFilter.filter(containerRequestContext);
|
||||
throw new AssertionError("Shouldn't succeed");
|
||||
} catch (WebApplicationException wae) {
|
||||
verify(containerRequestContext, times(0)).setSecurityContext(any(SecurityContext.class));
|
||||
assertEquals(wae.getResponse().getStatus(), 401);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private static class StringAuthenticator implements Authenticator<BasicCredentials, String> {
|
||||
|
||||
@Override
|
||||
public Optional<String> authenticate(BasicCredentials credentials) throws AuthenticationException {
|
||||
if (credentials.getUsername().equals("user") && credentials.getPassword().equals("foo")) {
|
||||
return Optional.of("user");
|
||||
}
|
||||
|
||||
return Optional.absent();
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user