Merge pull request #965 from 4xpl0r3r/main

support custom Gitlab instance with new env var GITLAB_HOST
OWASP · Jun 3, 2024 · 8c1a395 · 8c1a395
2 parents f8009f8 + 2072bab
commit 8c1a395
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 18 deletions.
diff --git a/td.server/src/env/Gitlab.js b/td.server/src/env/Gitlab.js
@@ -14,9 +14,7 @@ class GitlabEnv extends Env {
             { key: 'CLIENT_ID', required: false },
             { key: 'CLIENT_SECRET', required: false },
             { key: 'SCOPE', required: false },
-            { key: 'ENTERPRISE_HOSTNAME', required: false },
-            { key: 'ENTERPRISE_PROTOCOL', required: false },
-            { key: 'ENTERPRISE_PORT', required: false },
+            { key: 'HOST', required: false },
             { key: 'USE_SEARCH', required: false },
             { key: 'SEARCH_QUERY', required: false },
             { key: 'REDIRECT_URI', required: false },

diff --git a/td.server/src/providers/gitlab.js b/td.server/src/providers/gitlab.js
@@ -20,14 +20,7 @@ const isConfigured = () => Boolean(env.get().config.GITLAB_CLIENT_ID);
  * @returns {String}
  */
 const getGitlabUrl = () => {
-    const enterpriseHostname = env.get().config.GITLAB_ENTERPRISE_HOSTNAME;
-    if(enterpriseHostname) {
-        const port = env.get().config.GITLAB_ENTERPRISE_PORT || '';
-        const protocol = env.get().config.GITLAB_ENTERPRISE_PROTOCOL || 'https';
-        const enterpriseUrl = `${protocol}://${enterpriseHostname}${port ? ':' + port : ''}`;
-        return enterpriseUrl;
-    }
-    return 'https://gitlab.com';
+    return env.get().config.GITLAB_HOST || 'https://gitlab.com';
 };
 
 /**

diff --git a/td.server/src/repositories/gitlabrepo.js b/td.server/src/repositories/gitlabrepo.js
@@ -11,17 +11,15 @@ export class GitlabClientWrapper {
 }
 
 export const getClient = (accessToken) => {
-
-
-    const enterpriseHostname = env.get().config.GITLAB_ENTERPRISE_HOSTNAME;
-    if (enterpriseHostname) {
-        throw new Error(`Gitlab Enterprise is not supported yet`);
-    }
-    const clientOptions = {
+    let clientOptions = {
         auth: {
             oauthToken: accessToken,
         },
     };
+    if (env.get().config.GITLAB_HOST) {
+        clientOptions.auth['host']=env.get().config.GITLAB_HOST
+    }
+
     return GitlabClientWrapper.getClient(clientOptions.auth);
 };