Merge pull request #2100 from SethDusek/i1900-fix

#1900 Fix large integer overflows in swagger-ui
ergoplatform · Mar 21, 2024 · 99309ce · 99309ce
2 parents 05e4267 + 70eb187
commit 99309ce
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 138 deletions.
diff --git a/src/main/resources/swagger-ui/README.md b/src/main/resources/swagger-ui/README.md
@@ -0,0 +1,8 @@
+## Introduction
+Ergo uses a fork of swagger-ui with support for large integers. This repository can be found [here](https://github.com/SethDusek/swagger-ui).
+
+You can update this swagger-ui file by first pulling from upstream in the swagger-ui repository. Then in the root of ergo project run the following:
+
+``` shell
+$ rsync -av --existing ../swagger-ui/dist/ src/main/resources/swagger-ui/
+```
diff --git a/src/main/resources/swagger-ui/oauth2-redirect.html b/src/main/resources/swagger-ui/oauth2-redirect.html
@@ -1,8 +1,9 @@
 <!doctype html>
 <html lang="en-US">
-<body onload="run()">
-</body>
-</html>
+<head>
+    <title>Swagger UI: OAuth2 Redirect</title>
+</head>
+<body>
 <script>
     'use strict';
     function run () {
@@ -12,31 +13,32 @@
         var isValid, qp, arr;
 
         if (/code|token|error/.test(window.location.hash)) {
-            qp = window.location.hash.substring(1);
+            qp = window.location.hash.substring(1).replace('?', '&');
         } else {
             qp = location.search.substring(1);
         }
 
-        arr = qp.split("&")
-        arr.forEach(function (v,i,_arr) { _arr[i] = '"' + v.replace('=', '":"') + '"';})
+        arr = qp.split("&");
+        arr.forEach(function (v,i,_arr) { _arr[i] = '"' + v.replace('=', '":"') + '"';});
         qp = qp ? JSON.parse('{' + arr.join() + '}',
                 function (key, value) {
-                    return key === "" ? value : decodeURIComponent(value)
+                    return key === "" ? value : decodeURIComponent(value);
                 }
-        ) : {}
+        ) : {};
 
-        isValid = qp.state === sentState
+        isValid = qp.state === sentState;
 
         if ((
-          oauth2.auth.schema.get("flow") === "accessCode"||
-          oauth2.auth.schema.get("flow") === "authorizationCode"
+          oauth2.auth.schema.get("flow") === "accessCode" ||
+          oauth2.auth.schema.get("flow") === "authorizationCode" ||
+          oauth2.auth.schema.get("flow") === "authorization_code"
         ) && !oauth2.auth.code) {
             if (!isValid) {
                 oauth2.errCb({
                     authId: oauth2.auth.name,
                     source: "auth",
                     level: "warning",
-                    message: "Authorization may be unsafe, passed state was changed in server Passed state wasn't returned from auth server"
+                    message: "Authorization may be unsafe, passed state was changed in server. The passed state wasn't returned from auth server."
                 });
             }
 
@@ -45,7 +47,7 @@
                 oauth2.auth.code = qp.code;
                 oauth2.callback({auth: oauth2.auth, redirectUrl: redirectUrl});
             } else {
-                let oauthErrorMsg
+                let oauthErrorMsg;
                 if (qp.error) {
                     oauthErrorMsg = "["+qp.error+"]: " +
                         (qp.error_description ? qp.error_description+ ". " : "no accessCode received from the server. ") +
@@ -56,12 +58,22 @@
                     authId: oauth2.auth.name,
                     source: "auth",
                     level: "error",
-                    message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server"
+                    message: oauthErrorMsg || "[Authorization failed]: no accessCode received from the server."
                 });
             }
         } else {
             oauth2.callback({auth: oauth2.auth, token: qp, isValid: isValid, redirectUrl: redirectUrl});
         }
         window.close();
     }
+
+    if (document.readyState !== 'loading') {
+        run();
+    } else {
+        document.addEventListener('DOMContentLoaded', function () {
+            run();
+        });
+    }
 </script>
+</body>
+</html>
diff --git a/src/main/resources/swagger-ui/swagger-ui-bundle.js b/src/main/resources/swagger-ui/swagger-ui-bundle.js
diff --git a/src/main/resources/swagger-ui/swagger-ui-bundle.js.map b/src/main/resources/swagger-ui/swagger-ui-bundle.js.map
diff --git a/src/main/resources/swagger-ui/swagger-ui-standalone-preset.js b/src/main/resources/swagger-ui/swagger-ui-standalone-preset.js
diff --git a/src/main/resources/swagger-ui/swagger-ui-standalone-preset.js.map b/src/main/resources/swagger-ui/swagger-ui-standalone-preset.js.map
diff --git a/src/main/resources/swagger-ui/swagger-ui.css b/src/main/resources/swagger-ui/swagger-ui.css
diff --git a/src/main/resources/swagger-ui/swagger-ui.css.map b/src/main/resources/swagger-ui/swagger-ui.css.map
diff --git a/src/main/resources/swagger-ui/swagger-ui.js b/src/main/resources/swagger-ui/swagger-ui.js
diff --git a/src/main/resources/swagger-ui/swagger-ui.js.map b/src/main/resources/swagger-ui/swagger-ui.js.map