fanhuadesenlinnn/EZ4Connect
1
0
Fork 0
mirror of https://github.com/chenx-dust/EZ4Connect.git synced 2026-09-20 10:23:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: 让 easyconnect 专属的参数不给进去

Browse Source
This commit is contained in:
Chenx Dust
2026-08-23 01:29:06 +08:00
parent b1b130e296
commit d2353e45c0
6 changed files with 97 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
tests/corecommandbuilder_test.cpp
View File

@@ -89,16 +89,13 @@ bool buildsCompleteCommandInCompatibleOrder()
"-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",
@@ -111,14 +108,74 @@ bool buildsCompleteCommandInCompatibleOrder()
"-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"
"-foo", "bar"
};
return expectEqual(command.arguments, expected, "buildsCompleteCommandInCompatibleOrder");
}
bool keepsEasyConnectOnlyOptionsOutOfATrustCommand()
{
ConnectionProfile profile;
profile.endpoint.protocol = "atrust";
profile.credentials.certFile = "/tmp/client.p12";
profile.credentials.certPassword = "cert-secret";
profile.proxy.customDomains = "example.org";
profile.behavior.disableMultiLine = true;
profile.behavior.disableZjuConfig = true;
profile.behavior.skipDomainResource = true;
const CoreCommand command = CoreCommandBuilder::build(profile);
return expectEqual(
command.arguments,
{"-protocol", "atrust"},
"keepsEasyConnectOnlyOptionsOutOfATrustCommand"
);
}
bool addsEasyConnectOnlyOptionsForEasyConnect()
{
ConnectionProfile profile;
profile.endpoint.protocol = "easyconnect";
profile.credentials.username = "alice";
profile.credentials.certFile = "/tmp/client.p12";
profile.credentials.certPassword = "cert-secret";
profile.proxy.customDomains = "example.org";
profile.behavior.disableMultiLine = true;
profile.behavior.disableZjuConfig = true;
profile.behavior.skipDomainResource = true;
const CoreCommand command = CoreCommandBuilder::build(profile);
return expectEqual(
command.arguments,
{
"-cert-file", "/tmp/client.p12",
"-cert-password", "cert-secret",
"-username", "alice",
"-protocol", "easyconnect",
"-disable-multi-line",
"-disable-zju-config",
"-skip-domain-resource",
"-custom-proxy-domain", "example.org"
},
"addsEasyConnectOnlyOptionsForEasyConnect"
);
}
bool keepsATrustOnlyOptionsOutOfEasyConnectCommand()
{
ConnectionProfile profile;
profile.endpoint = {"easyconnect", "cas", "domain", "86-123", QString(), 0};
profile.behavior.updateBestNodesInterval = 30;
const CoreRuntimePaths runtimePaths{QString(), "/tmp/structured-client-data.json"};
const CoreCommand command = CoreCommandBuilder::build(profile, runtimePaths);
return expectEqual(
command.arguments,
{"-protocol", "easyconnect"},
"keepsATrustOnlyOptionsOutOfEasyConnectCommand"
);
}
bool excludesCredentialsFromLoggableArguments()
{
ConnectionProfile profile;
@@ -171,6 +228,9 @@ int main(int argc, char *argv[])
const bool passed = buildsMinimalCommand()
&& addsGraphCaptchaFileForEasyConnect()
&& buildsCompleteCommandInCompatibleOrder()
&& keepsEasyConnectOnlyOptionsOutOfATrustCommand()
&& addsEasyConnectOnlyOptionsForEasyConnect()
&& keepsATrustOnlyOptionsOutOfEasyConnectCommand()
&& excludesCredentialsFromLoggableArguments()
&& quotesLoggableArgumentsWithoutChangingArguments();
return passed ? 0 : 1;