From 4996a5407b4bc3d5a905f62e157d8cbb93fad3aa Mon Sep 17 00:00:00 2001
From: Christian Biesinger <cbiesinger@chromium.org>
Date: Tue, 7 Jun 2022 13:32:38 -0700
Subject: [PATCH] [FedCM] Make revoke test do actual network requests

Instead of using a mojo mock. This tests a lot more of our code.

Bug: 1309251
Change-Id: I079cbbf962ed8b95870bd51fdff35f6f37ca3974
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3680732
Commit-Queue: Christian Biesinger <cbiesinger@chromium.org>
Reviewed-by: Yi Gu <yigu@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1011646}
---
 .../fedcm-revoke.https.html.headers           |  1 -
 ...https.html => fedcm-revoke.sub.https.html} | 35 ++++++++++++-------
 .../fedcm-revoke.sub.https.html.sub.headers   |  1 +
 credential-management/support/revoke.py       |  6 ++++
 4 files changed, 30 insertions(+), 13 deletions(-)
 delete mode 100644 credential-management/fedcm-revoke.https.html.headers
 rename credential-management/{fedcm-revoke.https.html => fedcm-revoke.sub.https.html} (51%)
 create mode 100644 credential-management/fedcm-revoke.sub.https.html.sub.headers
 create mode 100644 credential-management/support/revoke.py

diff --git a/credential-management/fedcm-revoke.https.html.headers b/credential-management/fedcm-revoke.https.html.headers
deleted file mode 100644
index fd82d505dd48e2..00000000000000
--- a/credential-management/fedcm-revoke.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: default-src 'self'; script-src 'self' 'unsafe-inline'; connect-src https://idp.example
diff --git a/credential-management/fedcm-revoke.https.html b/credential-management/fedcm-revoke.sub.https.html
similarity index 51%
rename from credential-management/fedcm-revoke.https.html
rename to credential-management/fedcm-revoke.sub.https.html
index f0c3e5eb2d20e8..79a9a872f46cdd 100644
--- a/credential-management/fedcm-revoke.https.html
+++ b/credential-management/fedcm-revoke.sub.https.html
@@ -2,16 +2,17 @@
 <meta charset="utf-8">
 <title>FederatedCredential.revoke() promise resolution</title>
 <link rel="author" title="Christian Biesinger" href="mailto:cbiesinger@chromium.org">
-<link rel="help" href="https://wicg.github.io/FedCM/#browser-api-revocation">
+<link rel="help" href="https://fedidcg.github.io/FedCM/#browser-api-revocation">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
 <script type="module">
-  import {fedcm_test} from './support/fedcm-helper.js';
+  import {set_fedcm_cookie} from './support/fedcm-helper.js';
+  const url_prefix = 'https://{{host}}:{{ports[https][0]}}/credential-management/support/';
 
   async function getCredential(provider_url) {
     const provider = {
-      url: provider_url || "https://idp.example/",
+      url: provider_url || url_prefix,
       clientId: "1234",
     };
     return await navigator.credentials.get({
@@ -21,24 +22,34 @@
     });
   }
 
-  fedcm_test(async (t, mock) => {
-    mock.revokeReturn("kSuccess");
-    await (await getCredential()).revoke("foo@bar.com");
+  promise_test(async t => {
+    await set_fedcm_cookie();
+    await (await getCredential()).login({nonce: '1'});
+    await (await getCredential()).revoke("1234");
+
+    // Second revoke should now fail since the first revoke should revoke
+    // the permission.
+    const result = (await getCredential()).revoke("1234");
+    return promise_rejects_dom(t, "NetworkError", result);
   }, "Successfully revoking a token should resolve the promise.");
 
-  fedcm_test(async (t, mock) => {
-    mock.revokeReturn("kError");
-    const result = (await getCredential()).revoke("foo@bar.com");
+  promise_test(async t => {
+    // Have to first login or the request will be rejected before it reaches
+    // the server.
+    await set_fedcm_cookie();
+    await (await getCredential()).login({nonce: '1'});
+    await (await getCredential()).revoke("1234");
+
+    const result = (await getCredential()).revoke("fail");
     return promise_rejects_dom(t, "NetworkError", result);
   }, "Error should reject the promise.");
 
-  fedcm_test(async (t, mock) => {
-    mock.revokeReturn("kError");
+  promise_test(async t => {
     const result = (await getCredential()).revoke("");
     return promise_rejects_dom(t, "InvalidStateError", result);
   }, "Empty hint should reject the promise.");
 
-  fedcm_test(async (t, mock) => {
+  promise_test(async t => {
     const result = getCredential("https://other-idp.example/").then((c) => c.revoke("foo@bar.com"));
     return promise_rejects_dom(t, "NetworkError", result);
   }, "Provider URL should honor Content-Security-Policy.");
diff --git a/credential-management/fedcm-revoke.sub.https.html.sub.headers b/credential-management/fedcm-revoke.sub.https.html.sub.headers
new file mode 100644
index 00000000000000..69b5bf33f46736
--- /dev/null
+++ b/credential-management/fedcm-revoke.sub.https.html.sub.headers
@@ -0,0 +1 @@
+Content-Security-Policy: default-src 'self'; script-src 'self' 'unsafe-inline'; connect-src https://{{host}}:{{ports[https][0]}}
diff --git a/credential-management/support/revoke.py b/credential-management/support/revoke.py
new file mode 100644
index 00000000000000..ed6fe00dfd7c37
--- /dev/null
+++ b/credential-management/support/revoke.py
@@ -0,0 +1,6 @@
+def main(request, response):
+  if not b"hint" in request.POST:
+    return (500, [], "Missing hint")
+  if request.POST[b"hint"] == b"fail":
+    return (500, [], "Fail requested")
+  return (204, [], "")