From 1751a985b07204f65e862893da29e647a58e9ba8 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sat, 14 Aug 2021 11:20:54 +0300
Subject: Add user agent to ActivityPub requests
* This should help to accept us by Cloudflare site protection on some Mastodon instances
---
.../java/com/juick/config/ActivityPubConfig.java | 9 ++---
.../juick/util/ActivityPubRequestInterceptor.java | 38 +++++++++++++++++++
.../com/juick/util/HeaderRequestInterceptor.java | 43 ----------------------
3 files changed, 41 insertions(+), 49 deletions(-)
create mode 100644 src/main/java/com/juick/util/ActivityPubRequestInterceptor.java
delete mode 100644 src/main/java/com/juick/util/HeaderRequestInterceptor.java
(limited to 'src/main/java')
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/ActivityPubRequestInterceptor.java b/src/main/java/com/juick/util/ActivityPubRequestInterceptor.java
new file mode 100644
index 00000000..8b578aa0
--- /dev/null
+++ b/src/main/java/com/juick/util/ActivityPubRequestInterceptor.java
@@ -0,0 +1,38 @@
+/*
+ * 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
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+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;
+import org.springframework.http.client.ClientHttpResponse;
+
+import java.io.IOException;
+
+import com.juick.www.api.activity.model.Activity;
+
+public class ActivityPubRequestInterceptor implements ClientHttpRequestInterceptor {
+
+ @Override
+ public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException {
+ request.getHeaders().set(HttpHeaders.ACCEPT, Activity.ACTIVITY_MEDIA_TYPE);
+ request.getHeaders().set(HttpHeaders.USER_AGENT, "Juick/2.x");
+ return execution.execute(request, body);
+ }
+}
diff --git a/src/main/java/com/juick/util/HeaderRequestInterceptor.java b/src/main/java/com/juick/util/HeaderRequestInterceptor.java
deleted file mode 100644
index 22a3de06..00000000
--- a/src/main/java/com/juick/util/HeaderRequestInterceptor.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2008-2020, 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
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
-
-package com.juick.util;
-
-import org.springframework.http.HttpRequest;
-import org.springframework.http.client.ClientHttpRequestExecution;
-import org.springframework.http.client.ClientHttpRequestInterceptor;
-import org.springframework.http.client.ClientHttpResponse;
-
-import java.io.IOException;
-
-public class HeaderRequestInterceptor implements ClientHttpRequestInterceptor {
-
- private final String headerName;
-
- private final String headerValue;
-
- public HeaderRequestInterceptor(String headerName, String headerValue) {
- this.headerName = headerName;
- this.headerValue = headerValue;
- }
-
- @Override
- public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution) throws IOException {
- request.getHeaders().set(headerName, headerValue);
- return execution.execute(request, body);
- }
-}
--
cgit v1.2.3