Merge pull request #1328 from proditis/master

Discord and API Target bug fix
echoCTF · Nov 28, 2024 · 63cd84f · 63cd84f
2 parents 68bed50 + f0d848f
commit 63cd84f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 12 deletions.
diff --git a/backend/components/WebhookTrigger.php b/backend/components/WebhookTrigger.php
@@ -22,8 +22,6 @@ public function run()
   {
     if (trim($this->url)=="") return;
 
-
-    // init the request, set some info, send it and finally close it
     $ch = curl_init($this->url);
 
     curl_setopt($ch, CURLOPT_POST, 1);

diff --git a/backend/modules/content/models/News.php b/backend/modules/content/models/News.php
@@ -72,8 +72,6 @@ public function attributeLabels()
     public function toDiscord()
     {
       if(Yii::$app->sys->discord_news_webhook!==false){
-        $data["avatar_url"]=sprintf("https://%s/images/appicon.png",Yii::$app->sys->offense_domain);
-        $data['username']='echoCTF.RED';
         $data['content']=$this->body;
         $client = new Webhook(['url' => Yii::$app->sys->discord_news_webhook,'data'=>json_encode($data)]);
         return $client->run();

diff --git a/backend/modules/gameplay/models/Target.php b/backend/modules/gameplay/models/Target.php
@@ -401,8 +401,6 @@ public function addNews()
     if(Yii::$app->sys->discord_news_webhook!==false)
     {
       $bodyPlain.="\n\nWe hope you enjoy and as always Happy Hacking :heart:";
-      $data["avatar_url"]=sprintf("https://%s/images/appicon.png",Yii::$app->sys->offense_domain);
-      $data['username']='echoCTF.RED';
       $data['content']=$bodyPlain;
       $client = new Webhook(['url' => Yii::$app->sys->discord_news_webhook,'data'=>json_encode($data)]);
       $client->run();

diff --git a/backend/modules/infrastructure/models/NetworkTargetSchedule.php b/backend/modules/infrastructure/models/NetworkTargetSchedule.php
@@ -142,8 +142,6 @@ public function addNews()
     }
     if(Yii::$app->sys->discord_news_webhook!==false)
     {
-      $data["avatar_url"]=sprintf("https://%s/images/appicon.png",Yii::$app->sys->offense_domain);
-      $data['username']='echoCTF.RED';
       $data['content']=$bodyPlain;
       $client = new Webhook(['url' => Yii::$app->sys->discord_news_webhook,'data'=>json_encode($data)]);
       $client->run();

diff --git a/frontend/modules/api/models/Target.php b/frontend/modules/api/models/Target.php
@@ -40,10 +40,11 @@ public function afterFind()
     if (Yii::$app->user->identity->instance)
       $this->ip = long2ip(Yii::$app->user->identity->instance->ip);
     else if($this->ondemand && $this->ondemand->state==1)
-    {
       $this->ip = long2ip($this->ip);
-    }
+    else if($this->ondemand && $this->ondemand->state!=1)
+      $this->ip = long2ip(0);
     else
-      $this->ip=0;
-  }
+      $this->ip=long2ip($this->ip);
+    }
+
 }