From 28213c703e22a47669a0ae130454eba8e240eeb1 Mon Sep 17 00:00:00 2001 From: GoXLR <107289968+GoXLR@users.noreply.github.com> Date: Wed, 19 Oct 2022 18:34:50 +0200 Subject: [PATCH] weird auth debug shit help me god please mongo is weird --- application.yml | 2 +- src/main/java/net/frozenorb/apiv3/config/GsonConfig.java | 2 ++ .../frozenorb/apiv3/web/filter/AuthenticationFilter.java | 4 ++-- .../frozenorb/apiv3/web/filter/AuthorizationFilter.java | 7 ++++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/application.yml b/application.yml index bc86b4a..82472e9 100644 --- a/application.yml +++ b/application.yml @@ -1,4 +1,4 @@ -mongoUri: mongodb://localhost:27017/VeltAPI +mongoUri: mongodb://localhost:27017/HQAPI redisUri: redis://localhost:6379 network: diff --git a/src/main/java/net/frozenorb/apiv3/config/GsonConfig.java b/src/main/java/net/frozenorb/apiv3/config/GsonConfig.java index 8da59ae..ca4f6f7 100644 --- a/src/main/java/net/frozenorb/apiv3/config/GsonConfig.java +++ b/src/main/java/net/frozenorb/apiv3/config/GsonConfig.java @@ -3,6 +3,7 @@ package net.frozenorb.apiv3.config; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.google.gson.LongSerializationPolicy; import net.frozenorb.apiv3.serialization.gson.FollowAnnotationExclusionStrategy; import net.frozenorb.apiv3.serialization.gson.InstantTypeAdapter; @@ -17,6 +18,7 @@ public class GsonConfig { @Bean public Gson gson() { return new GsonBuilder() + .setLongSerializationPolicy(LongSerializationPolicy.STRING) .registerTypeAdapter(Instant.class, new InstantTypeAdapter()) .setExclusionStrategies(new FollowAnnotationExclusionStrategy()) .create(); diff --git a/src/main/java/net/frozenorb/apiv3/web/filter/AuthenticationFilter.java b/src/main/java/net/frozenorb/apiv3/web/filter/AuthenticationFilter.java index 5c1ec4d..fbdeb01 100644 --- a/src/main/java/net/frozenorb/apiv3/web/filter/AuthenticationFilter.java +++ b/src/main/java/net/frozenorb/apiv3/web/filter/AuthenticationFilter.java @@ -39,7 +39,7 @@ public final class AuthenticationFilter implements Handler { } if (accessToken == null) { - ErrorUtils.respondOther(ctx, 403, "Failed to authorize.", "failedToAuthorizeUnknownKey", ImmutableMap.of()); + ErrorUtils.respondOther(ctx, 403, "Failed to authorize. (accessToken is null)", "failedToAuthorizeUnknownKey", ImmutableMap.of()); return; } @@ -47,7 +47,7 @@ public final class AuthenticationFilter implements Handler { boolean allowed = accessToken.getLockedIps().contains(ctx.request().remoteAddress().host()); if (!allowed) { - ErrorUtils.respondOther(ctx, 403, "Failed to authorize.", "failedToAuthorizeNoIpWhitelist", ImmutableMap.of()); + ErrorUtils.respondOther(ctx, 403, "Failed to authorize. (not allowed)", "failedToAuthorizeNoIpWhitelist", ImmutableMap.of()); return; } } diff --git a/src/main/java/net/frozenorb/apiv3/web/filter/AuthorizationFilter.java b/src/main/java/net/frozenorb/apiv3/web/filter/AuthorizationFilter.java index afea975..243e902 100644 --- a/src/main/java/net/frozenorb/apiv3/web/filter/AuthorizationFilter.java +++ b/src/main/java/net/frozenorb/apiv3/web/filter/AuthorizationFilter.java @@ -17,11 +17,12 @@ public final class AuthorizationFilter implements Handler { public void handle(RoutingContext ctx) { Actor actor = ctx.get("actor"); - if (actor.isAuthorized()) { - ctx.next(); + ctx.next(); + /*if (actor.isAuthorized()) { + } else { ErrorUtils.respondOther(ctx, 403, "Failed to authorize as an approved actor.", "failedToAuthorizeNotApprovedActor", ImmutableMap.of()); - } + }*/ } } \ No newline at end of file