diff options
Diffstat (limited to 'src/main/java/com/juick/config')
-rw-r--r-- | src/main/java/com/juick/config/HttpClientConfig.java | 2 | ||||
-rw-r--r-- | src/main/java/com/juick/config/SecurityConfig.java | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/com/juick/config/HttpClientConfig.java b/src/main/java/com/juick/config/HttpClientConfig.java index 2540f4db..d838575d 100644 --- a/src/main/java/com/juick/config/HttpClientConfig.java +++ b/src/main/java/com/juick/config/HttpClientConfig.java @@ -28,7 +28,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import javax.inject.Inject; -import java.util.concurrent.Executors; @Configuration public class HttpClientConfig { @@ -38,7 +37,6 @@ public class HttpClientConfig { @Bean public OkHttpClient httpClient() { return new OkHttpClient.Builder() - .dispatcher(new Dispatcher(Executors.newFixedThreadPool(1))) .addInterceptor(new HttpLoggingInterceptor(logger::debug) .setLevel(HttpLoggingInterceptor.Level.BASIC)) .addInterceptor(new ActivityPubRequestInterceptor()) diff --git a/src/main/java/com/juick/config/SecurityConfig.java b/src/main/java/com/juick/config/SecurityConfig.java index e02e32ed..c557ab4e 100644 --- a/src/main/java/com/juick/config/SecurityConfig.java +++ b/src/main/java/com/juick/config/SecurityConfig.java @@ -17,6 +17,7 @@ package com.juick.config; +import com.juick.ActivityPubManager; import com.juick.KeystoreManager; import com.juick.service.ActivityPubService; import com.juick.service.UserService; @@ -105,7 +106,7 @@ public class SecurityConfig { } @Inject - private ActivityPubService activityPubService; + private ActivityPubManager activityPubManager; @Bean HashParamAuthenticationFilter apiAuthenticationFilter() { @@ -190,7 +191,7 @@ public class SecurityConfig { SecurityFilterChain apiChain(HttpSecurity http) throws Exception { http.securityMatcher("/api/**", "/u/**", "/n/**") .addFilterBefore(apiAuthenticationFilter(), BasicAuthenticationFilter.class) - .addFilterBefore(new HTTPSignatureAuthenticationFilter(activityPubService, userService), + .addFilterBefore(new HTTPSignatureAuthenticationFilter(activityPubManager, userService), BasicAuthenticationFilter.class) .authorizeHttpRequests(requests -> requests .requestMatchers(HttpMethod.OPTIONS).permitAll() |