Merge pull request #48 from daystram/dev

daystram · Jul 12, 2021 · 68963fe · 68963fe
2 parents 0a9ea14 + 2a55fd3
commit 68963fe
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 187 deletions.
diff --git a/..gitlab-ci.yml b/..gitlab-ci.yml
diff --git a/ratify-fe/src/utils/url.ts b/ratify-fe/src/utils/url.ts
@@ -0,0 +1,13 @@
+export function validateURL(
+  urlString: string,
+  allowInsecure?: boolean,
+  allowLocalhost?: boolean
+): boolean {
+  const url = new URL(urlString);
+  return (
+    ((url.protocol === "http:" && allowInsecure) ||
+      url.protocol === "https:") &&
+    (url.hostname !== "localhost" || !!allowLocalhost) &&
+    url.origin !== null
+  );
+}
diff --git a/ratify-fe/src/views/manage/application/ApplicationList.vue b/ratify-fe/src/views/manage/application/ApplicationList.vue
@@ -277,7 +277,8 @@
 import Vue from "vue";
 import api from "@/apis/api";
 import { STATUS } from "@/constants/status";
-import { maxLength, required, url } from "vuelidate/lib/validators";
+import { validateURL } from "@/utils/url";
+import { maxLength, required } from "vuelidate/lib/validators";
 
 export default Vue.extend({
   data: () => ({
@@ -341,9 +342,9 @@ export default Vue.extend({
     create: {
       name: { required, maxLength: maxLength(20) },
       description: { required, maxLength: maxLength(50) },
-      loginURL: { required, url },
-      callbackURL: { required, url },
-      logoutURL: { required, url }
+      loginURL: { required, url: validateURL },
+      callbackURL: { required, url: validateURL },
+      logoutURL: { required, url: validateURL }
     }
   },