Skip to content

fix: guard unsupported AmneziaWG s3/s4 keys #33

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

Closed
hawkff wants to merge 2 commits into from
Closed

fix: guard unsupported AmneziaWG s3/s4 keys #33

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e863b94
fix: guard unsupported AmneziaWG s3 s4 keys
hawkff Jun 19, 2026
69b92b9
fix: reject unsupported nonzero AWG s3 s4
hawkff Jun 19, 2026
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
5 changes: 3 additions & 2 deletions app/src/main/java/io/nekohasekai/sagernet/fmt/amneziawg/AmneziaWGFmt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ fun buildSingBoxOutboundAmneziaWGBean(bean: AmneziaWGBean): SingBoxOptions.Outbo
if (bean.jmax != 0) jmax = bean.jmax
if (bean.s1 != 0) s1 = bean.s1
if (bean.s2 != 0) s2 = bean.s2
if (bean.s3 != 0) s3 = bean.s3
if (bean.s4 != 0) s4 = bean.s4
// The bundled amneziawg-go v1.0.4 UAPI does not accept s3/s4 yet.
// Keep these fields importable/storable, but do not emit them until
// the core supports the corresponding device keys.
Comment thread
greptile-apps[bot] marked this conversation as resolved.
Outdated

@greptile-apps greptile-apps Bot Jun 19, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 No TODO / issue reference for eventual re-enablement

The comment hard-codes the version number (v1.0.4) but there is no // TODO: marker or issue tracker link — so when the bundled amneziawg-go is bumped to a version that does accept s3/s4, the suppression will remain silently in place unless someone remembers to revisit this file. Adding a short TODO with a link to the upstream issue would make the re-enablement self-discoverable.

Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!

if (bean.h1.isNotBlank()) h1 = bean.h1
if (bean.h2.isNotBlank()) h2 = bean.h2
if (bean.h3.isNotBlank()) h3 = bean.h3
Expand Down
Loading