Skip to content

Commit 0f31e3e

Browse files
committed
add user-agent for httpurlconnection
1 parent e7cf205 commit 0f31e3e

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

utils/src/main/java/com/cloud/utils/HttpUtils.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
package com.cloud.utils;
2121

22+
import static com.cloud.utils.UriUtils.USER_AGENT;
23+
2224
import org.apache.logging.log4j.Logger;
2325
import org.apache.logging.log4j.LogManager;
2426

@@ -33,6 +35,8 @@
3335
import java.net.URL;
3436
import java.util.Map;
3537

38+
import com.cloud.utils.net.HttpClientCloudStackUserAgent;
39+
3640
public class HttpUtils {
3741

3842
protected static Logger LOGGER = LogManager.getLogger(HttpUtils.class);
@@ -161,6 +165,7 @@ public static boolean downloadFileWithProgress(final String fileURL, final Strin
161165
try {
162166
URL url = new URL(fileURL);
163167
httpConn = (HttpURLConnection) url.openConnection();
168+
httpConn.setRequestProperty(USER_AGENT, HttpClientCloudStackUserAgent.CLOUDSTACK_USER_AGENT);
164169
int responseCode = httpConn.getResponseCode();
165170
if (responseCode == HttpURLConnection.HTTP_OK) {
166171
int contentLength = httpConn.getContentLength();

utils/src/main/java/com/cloud/utils/UriUtils.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,14 @@
6767

6868
import com.cloud.utils.crypt.DBEncryptionUtil;
6969
import com.cloud.utils.exception.CloudRuntimeException;
70+
import com.cloud.utils.net.HttpClientCloudStackUserAgent;
7071
import com.google.common.collect.ImmutableMap;
7172
import com.google.common.collect.ImmutableSet;
7273

7374
public class UriUtils {
7475

7576
protected static Logger LOGGER = LogManager.getLogger(UriUtils.class);
77+
public static final String USER_AGENT = "User-Agent";
7678

7779
public static String formNfsUri(String host, String path) {
7880
try {
@@ -227,6 +229,7 @@ public static long getRemoteSize(String url, Boolean followRedirect) {
227229
URI uri = new URI(url);
228230
httpConn = (HttpURLConnection)uri.toURL().openConnection();
229231
httpConn.setRequestMethod(method);
232+
httpConn.setRequestProperty(USER_AGENT, HttpClientCloudStackUserAgent.CLOUDSTACK_USER_AGENT);
230233
httpConn.setConnectTimeout(2000);
231234
httpConn.setReadTimeout(5000);
232235
httpConn.setInstanceFollowRedirects(Boolean.TRUE.equals(followRedirect));

utils/src/main/java/com/cloud/utils/storage/QCOW2Utils.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535

3636
import com.cloud.utils.NumbersUtil;
3737
import com.cloud.utils.UriUtils;
38+
import com.cloud.utils.net.HttpClientCloudStackUserAgent;
3839

3940
public final class QCOW2Utils {
4041
protected static Logger LOGGER = LogManager.getLogger(QCOW2Utils.class);
@@ -119,6 +120,7 @@ public static long getVirtualSizeFromUrl(String urlStr, boolean followRedirects)
119120
try {
120121
URI url = new URI(urlStr);
121122
httpConn = (HttpURLConnection)url.toURL().openConnection();
123+
httpConn.setRequestProperty(UriUtils.USER_AGENT, HttpClientCloudStackUserAgent.CLOUDSTACK_USER_AGENT);
122124
httpConn.setInstanceFollowRedirects(followRedirects);
123125
return getVirtualSize(httpConn.getInputStream(), UriUtils.isUrlForCompressedFile(urlStr));
124126
} catch (URISyntaxException e) {

0 commit comments

Comments
 (0)