Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Check token by X-Gitlab-Token.

Browse Source
This commit is contained in:
Guan Xiying
2021-06-29 16:15:15 +08:00
parent 47af403729
commit dd8cd2aa5e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/model.php
+3 -3
View File
@@ -58,7 +58,7 @@ class gitlabModel extends model
{
$gitlab = $this->getByID($id);
if(!$gitlab) return "";
$gitlab_url = rtrim($gitlab->url, '/').'/api/v4%s'."?private_token={$gitlab->token}";
$gitlab_url = rtrim($gitlab->url, '/') . '/api/v4%s';
return $gitlab_url;
}
@@ -551,7 +551,7 @@ class gitlabModel extends model
$webhooks = $this->apiGetHooks($gitlabID, $projectID);
foreach($products as $index => $product)
{
$url = sprintf($this->config->gitlab->webhookURL, commonModel::getSysURL(), $product, $gitlabID, $gitlab->private);
$url = sprintf($this->config->gitlab->webhookURL, commonModel::getSysURL(), $product, $gitlabID);
foreach($webhooks as $webhook) if($webhook->url == $url) continue;
$response = $this->apiCreateHook($gitlabID, $projectID, $url);
}
@@ -958,7 +958,7 @@ class gitlabModel extends model
public function webhookCheckToken()
{
$gitlab = $this->getByID($this->get->gitlab);
if($gitlab->private != $this->get->token) die();
if($gitlab->private != $_SERVER["HTTP_X_GITLAB_TOKEN"]) die('Token error.');
}
/**