Browse Source

protocols: fix gRPC protocol serviceName field
fix anXray serverName filed

Beta Soft 3 years ago
parent
commit
bd2b056fbf

+ 7 - 1
app/Http/Controllers/Client/Protocols/AnXray.php

@@ -64,8 +64,14 @@ class AnXray
             "encryption" => "none",
             "type" => urlencode($server['network']),
             "security" => $server['tls'] ? "tls" : "",
-            "sni" => $server['tls'] ? urlencode(json_decode($server['tlsSettings'], true)['serverName']) : ""
         ];
+        if ($server['tls']) {
+            if ($server['tlsSettings']) {
+                $tlsSettings = json_decode($server['tlsSettings'], true);
+                if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName']))
+                    $config['sni'] = urlencode($tlsSettings['serverName']);
+            }
+        }
         if ((string)$server['network'] === 'ws') {
             $wsSettings = json_decode($server['networkSettings'], true);
             if (isset($wsSettings['path'])) $config['path'] = urlencode($wsSettings['path']);

+ 1 - 1
app/Http/Controllers/Client/Protocols/Passwall.php

@@ -75,7 +75,7 @@ class Passwall
         }
         if ((string)$server['network'] === 'grpc') {
             $grpcSettings = json_decode($server['networkSettings'], true);
-            if (isset($grpcSettings['path'])) $config['path'] = $grpcSettings['serviceName'];
+            if (isset($grpcSettings['serviceName'])) $config['path'] = $grpcSettings['serviceName'];
         }
         return "vmess://" . base64_encode(json_encode($config)) . "\r\n";
     }

+ 1 - 1
app/Http/Controllers/Client/Protocols/SSRPlus.php

@@ -75,7 +75,7 @@ class SSRPlus
         }
         if ((string)$server['network'] === 'grpc') {
             $grpcSettings = json_decode($server['networkSettings'], true);
-            if (isset($grpcSettings['path'])) $config['path'] = $grpcSettings['serviceName'];
+            if (isset($grpcSettings['serviceName'])) $config['path'] = $grpcSettings['serviceName'];
         }
         return "vmess://" . base64_encode(json_encode($config)) . "\r\n";
     }

+ 1 - 1
app/Http/Controllers/Client/Protocols/V2rayN.php

@@ -75,7 +75,7 @@ class V2rayN
         }
         if ((string)$server['network'] === 'grpc') {
             $grpcSettings = json_decode($server['networkSettings'], true);
-            if (isset($grpcSettings['path'])) $config['path'] = $grpcSettings['serviceName'];
+            if (isset($grpcSettings['serviceName'])) $config['path'] = $grpcSettings['serviceName'];
         }
         return "vmess://" . base64_encode(json_encode($config)) . "\r\n";
     }

+ 1 - 1
app/Http/Controllers/Client/Protocols/V2rayNG.php

@@ -75,7 +75,7 @@ class V2rayNG
         }
         if ((string)$server['network'] === 'grpc') {
             $grpcSettings = json_decode($server['networkSettings'], true);
-            if (isset($grpcSettings['path'])) $config['path'] = $grpcSettings['serviceName'];
+            if (isset($grpcSettings['serviceName'])) $config['path'] = $grpcSettings['serviceName'];
         }
         return "vmess://" . base64_encode(json_encode($config)) . "\r\n";
     }