diff options
author | Keith Mok <keithmok@google.com> | 2023-04-19 17:40:48 +0000 |
---|---|---|
committer | Keith Mok <keithmok@google.com> | 2023-04-19 19:19:49 +0000 |
commit | 5876bbccf8fbe0035d40815607c803fd63e8a686 (patch) | |
tree | f37f40df5cdc6f1498fce2e61e4718bf3a6e465e | |
parent | 3663efb3d7de83e70260fcfe7c475324bba9cdb9 (diff) | |
download | android-key-attestation-5876bbccf8fbe0035d40815607c803fd63e8a686.tar.gz |
Revert "Cache status list HTTP response"
Android does not support okhttp3
Test: build
This reverts commit 9b023ce2df3826aceca31c6b799d3c81e9ee7b71.
Change-Id: I261ec2b4842cd1d8cd4bb94647ef7fa59c94d98f
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | server/build.gradle | 1 | ||||
-rw-r--r-- | server/src/main/java/com/google/android/attestation/BUILD | 1 | ||||
-rw-r--r-- | server/src/main/java/com/google/android/attestation/CertificateRevocationStatus.java | 23 |
4 files changed, 5 insertions, 22 deletions
@@ -10,8 +10,6 @@ bin/ build/ gen/ out/ -# Runtime HTTP response cache -httpcache/ # Local configuration file (sdk path, etc) local.properties # Eclipse project files diff --git a/server/build.gradle b/server/build.gradle index 63c8a50..fff1b6a 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -31,7 +31,6 @@ dependencies { compile 'com.google.errorprone:error_prone_annotations:2.3.1' // Gson used for decoding certificate status list compile 'com.google.code.gson:gson:2.8.5' - compile 'com.squareup.okhttp3:okhttp:4.10.0' // JUnit, Truth and Truth8 used for testing testCompile 'junit:junit:4.12' testCompile 'com.google.truth:truth:1.0' diff --git a/server/src/main/java/com/google/android/attestation/BUILD b/server/src/main/java/com/google/android/attestation/BUILD index 541c87b..f1023c8 100644 --- a/server/src/main/java/com/google/android/attestation/BUILD +++ b/server/src/main/java/com/google/android/attestation/BUILD @@ -15,7 +15,6 @@ java_library( "@maven//:com_google_code_gson_gson", "@maven//:com_google_errorprone_error_prone_annotations", "@maven//:com_google_guava_guava", - "@maven//:com_squareup_okhttp3_okhttp", "@maven//:org_bouncycastle_bcpkix_jdk15on", "@maven//:org_bouncycastle_bcprov_jdk15on", ], diff --git a/server/src/main/java/com/google/android/attestation/CertificateRevocationStatus.java b/server/src/main/java/com/google/android/attestation/CertificateRevocationStatus.java index 2fe39ae..d31b2d8 100644 --- a/server/src/main/java/com/google/android/attestation/CertificateRevocationStatus.java +++ b/server/src/main/java/com/google/android/attestation/CertificateRevocationStatus.java @@ -18,8 +18,7 @@ package com.google.android.attestation; import com.google.gson.Gson; import com.google.gson.JsonObject; import com.google.gson.JsonParser; - -import java.io.File; +import java.io.ByteArrayInputStream; import java.io.FileReader; import java.io.IOException; import java.io.InputStreamReader; @@ -27,11 +26,8 @@ import java.io.Reader; import java.math.BigInteger; import java.net.MalformedURLException; import java.net.URL; +import java.nio.file.Files; import java.util.HashMap; -import okhttp3.Cache; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; /** @@ -40,12 +36,6 @@ import okhttp3.Response; public class CertificateRevocationStatus { private static final String STATUS_URL = "https://android.googleapis.com/attestation/status"; - private static final String CACHE_PATH = "httpcache"; - private static final Cache CACHE = new Cache(new File(CACHE_PATH), 10 * 1024 * 1024); - private static final OkHttpClient CLIENT = new OkHttpClient.Builder() - .cache(CACHE) - .build(); - public final Status status; public final Reason reason; public final String comment; @@ -104,13 +94,10 @@ public class CertificateRevocationStatus { throw new IllegalStateException(e); } - Request request = new Request.Builder() - .url(url) - .build(); + InputStreamReader statusListReader = new InputStreamReader(url.openStream()); + + return decodeStatus(serialNumber, statusListReader); - try (Response response = CLIENT.newCall(request).execute()) { - return decodeStatus(serialNumber, response.body().charStream()); - } } private static CertificateRevocationStatus decodeStatus(String serialNumber, |