Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump io.dropwizard:dropwizard-dependencies from 2.1.1 to 4.0.6 #3284

Merged
merged 20 commits into from
Apr 3, 2024
Merged

Bump io.dropwizard:dropwizard-dependencies from 2.1.1 to 4.0.6 #3284

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
67e95b2
Bump io.dropwizard:dropwizard-dependencies from 2.1.1 to 4.0.6
dependabot[bot] Jan 31, 2024
de9d875
migrate to new bom deps
awildturtok Mar 11, 2024
50231e8
brute force first impl to make DefaultAuthFilter work. RedirectingAut…
awildturtok Mar 13, 2024
727f414
cleanup TestLoggingFactory, strip of seemingly useless code
awildturtok Mar 13, 2024
c2b62ba
intermediate changes to make properly inject multiple TokenExtractor
awildturtok Mar 14, 2024
442017a
remove conflicting settings of default metrics registry
thoniTUB Mar 18, 2024
02fb6c1
ignore fields from throwable in serdes
thoniTUB Mar 18, 2024
98f7753
Merge branch 'develop' into dependabot/maven/io.dropwizard-dropwizard…
thoniTUB Mar 18, 2024
bcf7ada
remove Feature interface from AuthFilter
thoniTUB Mar 18, 2024
ba937db
wip make cypress tests pass
thoniTUB Mar 18, 2024
8380f3c
make cypress tests pass
thoniTUB Mar 19, 2024
af04d99
dev realm register token extractor only if admin servlet is present
thoniTUB Mar 19, 2024
31e54d4
Merge branch 'develop' into dependabot/maven/io.dropwizard-dropwizard…
thoniTUB Mar 19, 2024
0ee6519
make auth cookie filter stateless
thoniTUB Mar 19, 2024
8885f91
review changes
thoniTUB Mar 21, 2024
84154b9
remove obsolete injection annotation
thoniTUB Mar 21, 2024
dd583e7
fix admin ui login injection
thoniTUB Mar 21, 2024
b689e4d
fix injection of delegate auth filter
thoniTUB Mar 21, 2024
df631de
clean up auth filter registration
thoniTUB Mar 21, 2024
2e1b221
Merge branch 'develop' into dependabot/maven/io.dropwizard-dropwizard…
awildturtok Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions backend/src/main/java/com/bakdata/conquery/models/auth/develop/DevAuthConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@ public class DevAuthConfig implements AuthenticationRealmFactory {
public ConqueryAuthenticationRealm createRealm(Environment environment, ConqueryConfig config, AuthorizationController authorizationController) {

DefaultAuthFilter.registerTokenExtractor(UserIdTokenExtractor.class, environment.jersey().getResourceConfig());
DefaultAuthFilter.registerTokenExtractor(UserIdTokenExtractor.class, authorizationController.getAdminServlet().getJerseyConfig());
DefaultAuthFilter.registerTokenExtractor(UserIdTokenExtractor.class, authorizationController.getAdminServlet().getJerseyConfigUI());
if (authorizationController.getAdminServlet() != null) {
DefaultAuthFilter.registerTokenExtractor(UserIdTokenExtractor.class, authorizationController.getAdminServlet().getJerseyConfig());
DefaultAuthFilter.registerTokenExtractor(UserIdTokenExtractor.class, authorizationController.getAdminServlet().getJerseyConfigUI());
}

// Use the first defined user als the default user. This is usually the superuser if the DevelopmentAuthorizationConfig is set
final UserId defaultUserId = new UserId(config.getAuthorizationRealms().getInitialUsers().get(0).getName());
Expand Down
Loading