Merge pull request #12 from nutgram/fix-safemode

nutgram · Sep 9, 2023 · 984513d · 984513d
2 parents 2f8eee4 + 4d321cb
commit 984513d
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -30,7 +30,7 @@
   "require": {
     "php": "^8.2",
     "nunomaduro/termwind": "^1.15",
-    "nutgram/nutgram": "^4.2.0"
+    "nutgram/nutgram": "^4.6.0"
   },
   "require-dev": {
     "illuminate/testing": "^9.0|^10.0",

diff --git a/src/Console/HookSetCommand.php b/src/Console/HookSetCommand.php
@@ -39,6 +39,7 @@ public function handle(Nutgram $bot): int
             url: $url,
             ip_address: $ip_address,
             max_connections: $max_connections,
+            secret_token: config('nutgram.safe_mode', false) ? md5(config('app.key')) : null
         );
 
         $this->info("Bot webhook set with url: $url");

diff --git a/src/NutgramServiceProvider.php b/src/NutgramServiceProvider.php
@@ -41,7 +41,8 @@ public function register()
                 logger: $app->get(LoggerInterface::class)->channel(config('nutgram.log_channel', 'null')),
                 localPathTransformer: config('nutgram.config.local_path_transformer'),
                 pollingTimeout: config('nutgram.config.polling.timeout', Configuration::DEFAULT_POLLING_TIMEOUT),
-                pollingAllowedUpdates: config('nutgram.config.polling.allowed_updates', Configuration::DEFAULT_ALLOWED_UPDATES),
+                pollingAllowedUpdates: config('nutgram.config.polling.allowed_updates',
+                    Configuration::DEFAULT_ALLOWED_UPDATES),
                 pollingLimit: config('nutgram.config.polling.limit', Configuration::DEFAULT_POLLING_LIMIT),
                 enableHttp2: config('nutgram.config.enable_http2', Configuration::DEFAULT_ENABLE_HTTP2),
             );
@@ -56,9 +57,13 @@ public function register()
                 $bot->setRunningMode(Polling::class);
             } else {
                 $webhook = LaravelWebhook::class;
+
                 if (config('nutgram.safe_mode', false)) {
-                    // take into account the trust proxy Laravel configuration
-                    $webhook = new LaravelWebhook(fn () => $app->make('request')?->ip());
+                    $webhook = new LaravelWebhook(
+                        getToken: fn () => request()?->header('X-Telegram-Bot-Api-Secret-Token'),
+                        secretToken: md5(config('app.key'))
+                    );
+                    $webhook->setSafeMode(true);
                 }
 
                 $bot->setRunningMode($webhook);

diff --git a/tests/Commands/HookSetTest.php b/tests/Commands/HookSetTest.php
@@ -7,7 +7,27 @@
 test('nutgram:hook:set sets the bot webhook', function () {
     $this->mock(Nutgram::class, function (MockInterface $mock) {
         $mock->shouldReceive('setWebhook')
-            ->with('https://foo.bar/hook', null, null, 50)
+            ->with('https://foo.bar/hook', null, null, 50, null, null, null)
+            ->andReturn(0);
+    });
+
+    $this->artisan(HookSetCommand::class, ['url' => 'https://foo.bar/hook'])
+        ->expectsOutputToContain('Bot webhook set with url: https://foo.bar/hook')
+        ->assertSuccessful();
+});
+
+test('nutgram:hook:set sets the bot webhook + safe mode', function () {
+    $appKey = 'test-key';
+    $hashedAppKey = md5($appKey);
+
+    config([
+        'app.key' => $appKey,
+        'nutgram.safe_mode' => true,
+    ]);
+
+    $this->mock(Nutgram::class, function (MockInterface $mock) use ($hashedAppKey) {
+        $mock->shouldReceive('setWebhook')
+            ->with('https://foo.bar/hook', null, null, 50, null, null, $hashedAppKey)
             ->andReturn(0);
     });