fix(ssurl): make outline url optional

ref #1287
shadowsocks · Sep 11, 2023 · c0ba7f0 · c0ba7f0
1 parent e8ea40c
commit c0ba7f0
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 14 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -72,7 +72,7 @@ server = ["shadowsocks-service/server"]
 # Enable manager server
 manager = ["shadowsocks-service/manager"]
 # Enable utility
-utility = ["qrcode", "reqwest"]
+utility = ["qrcode"]
 # Enable service
 service = ["local", "server", "manager"]
 
@@ -114,6 +114,9 @@ local-socks4 = ["local", "shadowsocks-service/local-socks4"]
 # Enable Tun interface protocol for sslocal
 local-tun = ["local", "shadowsocks-service/local-tun", "ipnet"]
 
+# ssurl support outline (ssconf) URL
+utility-url-outline = ["reqwest"]
+
 # Enable jemalloc for binaries
 jemalloc = ["jemallocator"]
 # Enable bundled tcmalloc

diff --git a/bin/ssurl.rs b/bin/ssurl.rs
@@ -3,6 +3,8 @@
 //! SS-URI = "ss://" userinfo "@" hostname ":" port [ "/" ] [ "?" plugin ] [ "#" tag ]
 //! userinfo = websafe-base64-encode-utf8(method  ":" password)
 
+use std::process::ExitCode;
+
 use clap::{Arg, ArgAction, Command, ValueHint};
 use qrcode::{types::Color, QrCode};
 
@@ -72,6 +74,7 @@ fn decode(encoded: &str, need_qrcode: bool) {
     }
 }
 
+#[cfg(feature = "utility-url-outline")]
 fn decode_outline(remote: &str, need_qrcode: bool) {
     // Protect from using http and other non-ssconf links in reqwest call
     if !remote.starts_with("ssconf") {
@@ -92,8 +95,8 @@ fn decode_outline(remote: &str, need_qrcode: bool) {
     }
 }
 
-fn main() {
-    let app = Command::new("ssurl")
+fn main() -> ExitCode {
+    let mut app = Command::new("ssurl")
         .version(VERSION)
         .about("Encode and decode ShadowSocks URL")
         .arg(
@@ -116,31 +119,44 @@ fn main() {
                 .help("Decode the server configuration from the provided ShadowSocks URL"),
         )
         .arg(
+            Arg::new("QRCODE")
+                .short('c')
+                .long("qrcode")
+                .action(ArgAction::SetTrue)
+                .help("Generate the QRCode with the provided configuration"),
+        );
+
+    if cfg!(feature = "utility-url-outline") {
+        app = app.arg(
             Arg::new("OUTLINE_CONFIG_URL")
                 .short('o')
                 .long("outline")
                 .value_hint(ValueHint::Url)
                 .required_unless_present_any(["ENCODE_CONFIG_PATH", "DECODE_CONFIG_PATH"])
                 .help("Fetch and decode config from ssconf URL used by Outline"),
-        )
-        .arg(
-            Arg::new("QRCODE")
-                .short('c')
-                .long("qrcode")
-                .action(ArgAction::SetTrue)
-                .help("Generate the QRCode with the provided configuration"),
         );
+    }
+
     let matches = app.get_matches();
 
     let need_qrcode = matches.get_flag("QRCODE");
 
     if let Some(file) = matches.get_one::<String>("ENCODE_CONFIG_PATH") {
         encode(file, need_qrcode);
-    } else if let Some(encoded) = matches.get_one::<String>("DECODE_CONFIG_PATH") {
+        return ExitCode::SUCCESS;
+    }
+
+    if let Some(encoded) = matches.get_one::<String>("DECODE_CONFIG_PATH") {
         decode(encoded, need_qrcode);
-    } else if let Some(remote) = matches.get_one::<String>("OUTLINE_CONFIG_URL") {
+        return ExitCode::SUCCESS;
+    }
+
+    #[cfg(feature = "utility-url-outline")]
+    if let Some(remote) = matches.get_one::<String>("OUTLINE_CONFIG_URL") {
         decode_outline(remote, need_qrcode);
-    } else {
-        println!("Use -h for more detail");
+        return ExitCode::SUCCESS;
     }
+
+    println!("Use -h for more detail");
+    return ExitCode::FAILURE;
 }