refactor: 提取核心命令构建器

2026-09-20 10:23:33 +08:00 · 2026-07-27 16:17:47 +08:00
parent c875f5f21a
commit 0fdf728c46
6 changed files with 401 additions and 234 deletions
--- a/tests/corecommandbuilder_test.cpp
+++ b/tests/corecommandbuilder_test.cpp
@@ -0,0 +1,121 @@
+#include <QCoreApplication>
+#include <QDebug>
+
+#include "core/corecommandbuilder.h"
+
+namespace
+{
+bool expectEqual(const QStringList &actual, const QStringList &expected, const char *testName)
+{
+    if (actual == expected)
+    {
+        return true;
+    }
+
+    qCritical().noquote() << testName << "failed"
+                          << "\nexpected:" << expected.join('|')
+                          << "\nactual:  " << actual.join('|');
+    return false;
+}
+
+bool buildsMinimalCommand()
+{
+    ConnectionProfile profile;
+    profile.endpoint.protocol = "easyconnect";
+
+    const CoreCommand command = CoreCommandBuilder::build(profile);
+    return expectEqual(command.arguments, {"-protocol", "easyconnect"}, "buildsMinimalCommand")
+        && expectEqual(command.loggableArguments, command.arguments, "minimalCommandIsLoggable");
+}
+
+bool buildsCompleteCommandInCompatibleOrder()
+{
+    ConnectionProfile profile;
+    profile.endpoint = {"atrust", "cas", "domain", "86-123", "vpn.example.edu", 8443};
+    profile.credentials = {"alice", "secret", "TOTP", "/tmp/client.p12", "cert-secret"};
+    profile.dns = {"10.0.0.1", false, "10.0.0.2", 60, true, "example.org=1.1.1.1"};
+    profile.proxy = {"127.0.0.1:1080", "127.0.0.1:1081", "ss://url", "http://direct",
+                     true, "example.org"};
+    profile.tunnel = {true, true, true, true, true, "127.0.0.1:80/10.0.0.1:80",
+                      "127.0.0.1:53/10.0.0.1:53"};
+    profile.behavior = {30, true, true, "https://keepalive", "en0", true, true, true,
+                        true, true};
+    profile.extraArguments = "-foo bar";
+
+    const CoreRuntimePaths runtimePaths{"/tmp/graph.jpg", "/tmp/client-data.json"};
+    const CoreCommand command = CoreCommandBuilder::build(profile, runtimePaths);
+    const QStringList expected{
+        "-username", "alice",
+        "-password", "secret",
+        "-totp-secret", "TOTP",
+        "-protocol", "atrust",
+        "-auth-type", "auth/cas",
+        "-graph-code-file", "/tmp/graph.jpg",
+        "-client-data-file", "/tmp/client-data.json",
+        "-phone", "86-123",
+        "-login-domain", "domain",
+        "-server", "vpn.example.edu",
+        "-port", "8443",
+        "-zju-dns-server", "10.0.0.1",
+        "-dns-ttl", "60",
+        "-secondary-dns-server", "10.0.0.2",
+        "-disable-multi-line",
+        "-disable-keep-alive",
+        "-keep-alive-url", "https://keepalive",
+        "-bind-interface", "en0",
+        "-auto-detect-interface",
+        "-disable-zju-config",
+        "-disable-zju-dns",
+        "-disable-server-config",
+        "-proxy-all",
+        "-skip-domain-resource",
+        "-tun-mode",
+        "-dns-hijack",
+        "-fake-ip",
+        "-add-route",
+        "-tcp-tunnel-mode",
+        "-debug-dump",
+        "-socks-bind", "127.0.0.1:1080",
+        "-http-bind", "127.0.0.1:1081",
+        "-shadowsocks-url", "ss://url",
+        "-dial-direct-proxy", "http://direct",
+        "-update-best-nodes-interval", "30",
+        "-tcp-port-forwarding", "127.0.0.1:80/10.0.0.1:80",
+        "-udp-port-forwarding", "127.0.0.1:53/10.0.0.1:53",
+        "-custom-dns", "example.org=1.1.1.1",
+        "-custom-proxy-domain", "example.org",
+        "-foo", "bar",
+        "-cert-file", "/tmp/client.p12",
+        "-cert-password", "cert-secret"
+    };
+    return expectEqual(command.arguments, expected, "buildsCompleteCommandInCompatibleOrder");
+}
+
+bool excludesCredentialsFromLoggableArguments()
+{
+    ConnectionProfile profile;
+    profile.endpoint.protocol = "easyconnect";
+    profile.credentials = {"alice", "secret", "TOTP", "/tmp/client.p12", "cert-secret"};
+
+    const CoreCommand command = CoreCommandBuilder::build(profile);
+    const QString logLine = command.loggableArguments.join(' ');
+    const bool safe = !logLine.contains("alice")
+        && !logLine.contains("secret")
+        && !logLine.contains("TOTP")
+        && !logLine.contains("/tmp/client.p12");
+    if (!safe)
+    {
+        qCritical() << "excludesCredentialsFromLoggableArguments failed:" << logLine;
+    }
+    return safe;
+}
+}
+
+int main(int argc, char *argv[])
+{
+    QCoreApplication app(argc, argv);
+    const bool passed = buildsMinimalCommand()
+        && buildsCompleteCommandInCompatibleOrder()
+        && excludesCredentialsFromLoggableArguments();
+    return passed ? 0 : 1;
+}