mirror of
https://github.com/google/nomulus.git
synced 2025-07-25 03:58:34 +02:00
Add IcannHttpReporter failed response logging (#2252)
This commit is contained in:
parent
c73f7a6bd3
commit
781c212275
1 changed files with 20 additions and 18 deletions
|
@ -14,7 +14,6 @@
|
||||||
|
|
||||||
package google.registry.reporting.icann;
|
package google.registry.reporting.icann;
|
||||||
|
|
||||||
import static com.google.api.client.http.HttpStatusCodes.STATUS_CODE_BAD_REQUEST;
|
|
||||||
import static com.google.api.client.http.HttpStatusCodes.STATUS_CODE_OK;
|
import static com.google.api.client.http.HttpStatusCodes.STATUS_CODE_OK;
|
||||||
import static com.google.common.base.Preconditions.checkArgument;
|
import static com.google.common.base.Preconditions.checkArgument;
|
||||||
import static com.google.common.net.MediaType.CSV_UTF_8;
|
import static com.google.common.net.MediaType.CSV_UTF_8;
|
||||||
|
@ -38,6 +37,7 @@ import java.io.IOException;
|
||||||
import java.net.HttpURLConnection;
|
import java.net.HttpURLConnection;
|
||||||
import java.net.MalformedURLException;
|
import java.net.MalformedURLException;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
import java.security.GeneralSecurityException;
|
import java.security.GeneralSecurityException;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
|
@ -90,30 +90,31 @@ public class IcannHttpReporter {
|
||||||
UrlConnectionUtils.setPayload(connection, reportBytes, CSV_UTF_8.toString());
|
UrlConnectionUtils.setPayload(connection, reportBytes, CSV_UTF_8.toString());
|
||||||
connection.setInstanceFollowRedirects(false);
|
connection.setInstanceFollowRedirects(false);
|
||||||
|
|
||||||
int responseCode;
|
int responseCode = 0;
|
||||||
byte[] content;
|
byte[] content = null;
|
||||||
try {
|
try {
|
||||||
responseCode = connection.getResponseCode();
|
responseCode = connection.getResponseCode();
|
||||||
// Only responses with a 200 or 400 status have a body. For everything else, we can return
|
content = UrlConnectionUtils.getResponseBytes(connection);
|
||||||
// false early.
|
if (responseCode != STATUS_CODE_OK) {
|
||||||
if (responseCode != STATUS_CODE_OK && responseCode != STATUS_CODE_BAD_REQUEST) {
|
XjcIirdeaResult result = parseResult(content);
|
||||||
logger.atWarning().log("Connection to ICANN server failed", connection);
|
logger.atWarning().log(
|
||||||
|
"PUT rejected, status code %s:\n%s\n%s",
|
||||||
|
result.getCode().getValue(), result.getMsg(), result.getDescription());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
content = UrlConnectionUtils.getResponseBytes(connection);
|
} catch (IOException e) {
|
||||||
|
logger.atWarning().withCause(e).log(
|
||||||
|
"Connection to ICANN server failed with responseCode %s and connection %s",
|
||||||
|
responseCode == 0 ? "not available" : responseCode, connection);
|
||||||
|
return false;
|
||||||
|
} catch (XmlException e) {
|
||||||
|
logger.atWarning().withCause(e).log(
|
||||||
|
"Failed to parse ICANN response with responseCode %s and content %s",
|
||||||
|
responseCode, new String(content, StandardCharsets.UTF_8));
|
||||||
|
return false;
|
||||||
} finally {
|
} finally {
|
||||||
connection.disconnect();
|
connection.disconnect();
|
||||||
}
|
}
|
||||||
// We know that an HTTP 200 response can only contain a result code of
|
|
||||||
// 1000 (i. e. success), there is no need to parse it.
|
|
||||||
// See: https://tools.ietf.org/html/draft-lozano-icann-registry-interfaces-13#page-16
|
|
||||||
if (responseCode != STATUS_CODE_OK) {
|
|
||||||
XjcIirdeaResult result = parseResult(content);
|
|
||||||
logger.atWarning().log(
|
|
||||||
"PUT rejected, status code %s:\n%s\n%s",
|
|
||||||
result.getCode().getValue(), result.getMsg(), result.getDescription());
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -164,4 +165,5 @@ public class IcannHttpReporter {
|
||||||
reportType));
|
reportType));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue