Skip to content

fix: export VLESS reality-opts when short-id is not present #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amorlzu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: export VLESS reality-opts when short-id is not present #49

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions src/generator/config/subexport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,9 +697,12 @@ void proxyToClash(std::vector<Proxy> &nodes, YAML::Node &yamlnode, const ProxyGr
// Fallback for backward compatibility
singleproxy["flow"] = x.Flow;
}
if (!x.PublicKey.empty() && !x.ShortID.empty()) {
// Export reality-opts if public-key is present (short-id is optional)
if (!x.PublicKey.empty()) {
singleproxy["reality-opts"]["public-key"] = x.PublicKey;
singleproxy["reality-opts"]["short-id"] = x.ShortID;
if (!x.ShortID.empty()) {
singleproxy["reality-opts"]["short-id"] = x.ShortID;
}
if (!x.ClientFingerprint.empty()) {
singleproxy["client-fingerprint"] = x.ClientFingerprint;
} else if (!x.Fingerprint.empty()) {
Expand Down Expand Up @@ -2804,19 +2807,26 @@ void proxyToSingBox(std::vector<Proxy> &nodes, rapidjson::Document &json, std::v
tls.AddMember("alpn", alpn, allocator);
}

if (!x.PublicKey.empty() && !x.ShortID.empty()) {
// Export reality if public-key is present (short-id is optional)
if (!x.PublicKey.empty()) {
rapidjson::Value reality(rapidjson::kObjectType);
reality.AddMember("enabled", true, allocator);
if (!x.PublicKey.empty())
reality.AddMember("public_key", rapidjson::StringRef(x.PublicKey.c_str()), allocator);
reality.AddMember("public_key", rapidjson::StringRef(x.PublicKey.c_str()), allocator);
if (!x.ShortID.empty())
reality.AddMember("short_id", rapidjson::StringRef(x.ShortID.c_str()), allocator);
tls.AddMember("reality", reality, allocator);

rapidjson::Value utls(rapidjson::kObjectType);
utls.AddMember("enabled",true,allocator);
std::array<std::string, 6> fingerprints = {"chrome", "firefox", "safari", "ios", "edge", "qq"};
utls.AddMember("fingerprint", rapidjson::Value(fingerprints[rand() % fingerprints.size()].c_str(), allocator), allocator);
utls.AddMember("enabled", true, allocator);
// Use ClientFingerprint if available, otherwise use a random fingerprint
if (!x.ClientFingerprint.empty()) {
utls.AddMember("fingerprint", rapidjson::StringRef(x.ClientFingerprint.c_str()), allocator);
} else if (!x.Fingerprint.empty()) {
utls.AddMember("fingerprint", rapidjson::StringRef(x.Fingerprint.c_str()), allocator);
} else {
std::array<std::string, 6> fingerprints = {"chrome", "firefox", "safari", "ios", "edge", "qq"};
utls.AddMember("fingerprint", rapidjson::Value(fingerprints[rand() % fingerprints.size()].c_str(), allocator), allocator);
}
tls.AddMember("utls", utls, allocator);
}

Expand Down