Add user agent to ActivityPub requests

* This should help to accept us by Cloudflare site protection on some Mastodon instances

2 files changed, 9 insertions, 17 deletions

diff --git a/src/main/java/com/juick/config/ActivityPubConfig.java b/src/main/java/com/juick/config/ActivityPubConfig.java
index 430dc8d1..89aacff0 100644
--- a/src/main/java/com/juick/config/ActivityPubConfig.java
+++ b/src/main/java/com/juick/config/ActivityPubConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2020, Juick
+ * Copyright (C) 2008-2021, Juick
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -19,8 +19,7 @@ package com.juick.config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.juick.ActivityPubManager;
-import com.juick.www.api.activity.model.Activity;
-import com.juick.util.HeaderRequestInterceptor;
+import com.juick.util.ActivityPubRequestInterceptor;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -31,7 +30,6 @@ import org.springframework.web.client.RestTemplate;
 
 import javax.inject.Inject;
 import java.nio.charset.StandardCharsets;
-import java.util.Collections;
 
 @Configuration
 public class ActivityPubConfig {
@@ -63,8 +61,7 @@ public class ActivityPubConfig {
         restTemplate.getMessageConverters().add(0, mappingJacksonHttpMessageConverter());
         restTemplate.getMessageConverters().add(0, new StringHttpMessageConverter(StandardCharsets.UTF_8));
         restTemplate.setErrorHandler(activityPubClientErrorHandler);
-        restTemplate.setInterceptors(Collections.singletonList(
-                new HeaderRequestInterceptor("Accept", Activity.ACTIVITY_MEDIA_TYPE)));
+        restTemplate.getInterceptors().add(new ActivityPubRequestInterceptor());
         return restTemplate;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/juick/util/HeaderRequestInterceptor.java b/src/main/java/com/juick/util/ActivityPubRequestInterceptor.java
index 22a3de06..8b578aa0 100644
--- a/src/main/java/com/juick/util/HeaderRequestInterceptor.java
+++ b/src/main/java/com/juick/util/ActivityPubRequestInterceptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2020, Juick
+ * Copyright (C) 2008-2021, Juick
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -17,6 +17,7 @@
 
 package com.juick.util;
 
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.client.ClientHttpRequestExecution;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
@@ -24,20 +25,14 @@ import org.springframework.http.client.ClientHttpResponse;
 
 import java.io.IOException;
 
-public class HeaderRequestInterceptor implements ClientHttpRequestInterceptor {
+import com.juick.www.api.activity.model.Activity;
 
-    private final String headerName;
-
-    private final String headerValue;
-
-    public HeaderRequestInterceptor(String headerName, String headerValue) {
-        this.headerName = headerName;
-        this.headerValue = headerValue;
-    }
+public class ActivityPubRequestInterceptor implements ClientHttpRequestInterceptor {
 
     @Override
     public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException {
-        request.getHeaders().set(headerName, headerValue);
+        request.getHeaders().set(HttpHeaders.ACCEPT, Activity.ACTIVITY_MEDIA_TYPE);
+        request.getHeaders().set(HttpHeaders.USER_AGENT, "Juick/2.x");
         return execution.execute(request, body);
     }
 }