MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-CR-30005 log permanent redirects, test for PUT and POST

Browse Source
This commit is contained in:
Ivan Chirkov
2018-03-12 20:03:23 +01:00
parent 47bedfb488
commit 7ef58dd6cc
2 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/util/io/HttpRequests.java
+15 -7
View File
@@ -31,8 +31,7 @@ import javax.net.ssl.SSLSocketFactory;
import java.io.*;
import java.net.*;
import java.nio.charset.Charset;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -52,6 +51,14 @@ public final class HttpRequests {
private static final int BLOCK_SIZE = 16 * 1024;
private static final Pattern CHARSET_PATTERN = Pattern.compile("charset=([^;]+)");
private static final Set<Integer> REDIRECT_CODES = new HashSet<>(Arrays.asList(HttpResponseStatus.MOVED_PERMANENTLY.code(),
HttpResponseStatus.FOUND.code(),
HttpResponseStatus.SEE_OTHER.code(),
HttpResponseStatus.TEMPORARY_REDIRECT.code(),
HttpResponseStatus.PERMANENT_REDIRECT.code()));
private static final Set<Integer> PERMANENT_REDIRECT_CODES = new HashSet<>(Arrays.asList(HttpResponseStatus.MOVED_PERMANENTLY.code(),
HttpResponseStatus.SEE_OTHER.code(),
HttpResponseStatus.PERMANENT_REDIRECT.code()));
private HttpRequests() { }
@@ -504,11 +511,12 @@ public final class HttpRequests {
if (responseCode < 200 || responseCode >= 300 && responseCode != HttpResponseStatus.NOT_MODIFIED.code()) {
httpURLConnection.disconnect();
if ( responseCode == HttpResponseStatus.MOVED_PERMANENTLY.code()
|| responseCode == HttpResponseStatus.FOUND.code()
|| responseCode == HttpResponseStatus.SEE_OTHER.code()
|| responseCode == HttpResponseStatus.TEMPORARY_REDIRECT.code()) {
request.myUrl = url = connection.getHeaderField("Location");
if (REDIRECT_CODES.contains(responseCode)) {
url = connection.getHeaderField("Location");
if (PERMANENT_REDIRECT_CODES.contains(responseCode)) {
LOG.error(String.format("HTTP code '%d' for url '%s'. Should be updated to '%s'.", responseCode, request.myUrl, url));
}
request.myUrl = url;
if (url != null) {
continue;
}
platform/platform-tests/testSrc/com/intellij/util/io/HttpRequestsTest.java
+16
View File
@@ -97,6 +97,22 @@ public class HttpRequestsTest {
.tryConnect());
}
@Test(expected = AssertionError.class)
public void testPutNotAllowed() throws IOException {
HttpRequests.request(myUrl)
.tuner((c) -> ((HttpURLConnection)c).setRequestMethod("PUT"))
.tryConnect();
fail();
}
@Test(expected = AssertionError.class)
public void testPostNotAllowed() throws IOException {
HttpRequests.request(myUrl)
.tuner((c) -> ((HttpURLConnection)c).setRequestMethod("POST"))
.tryConnect();
fail();
}
@Test(timeout = 5000)
public void testNotModified() throws IOException {
myServer.createContext("/", ex -> {