Add CGo-safe JSON methods and wrap API methods with RunOffCgoStack#363
Merged
myleshorton merged 3 commits intomainfrom Mar 23, 2026
Merged
Add CGo-safe JSON methods and wrap API methods with RunOffCgoStack#363myleshorton merged 3 commits intomainfrom
myleshorton merged 3 commits intomainfrom
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adds CGo-safe JSON helper methods to vpn.SplitTunnel, aligning split-tunnel JSON access with the existing “pre-marshalled JSON” patterns used elsewhere in the codebase and moving marshaling closer to where the split tunnel types live.
Changes:
- Add
(*SplitTunnel).ItemsJSON(filterType)to return filter items as JSON viacommon.RunOffCgoStack. - Add
(*SplitTunnel).EnabledAppsJSON()to return enabled app identifiers as JSON viacommon.RunOffCgoStack. - Disambiguate JSON packages by introducing
encoding/jsonfor simple marshaling and aliasingsing/common/jsonassingjsonfor rule set serialization.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 3 out of 3 changed files in this pull request and generated 6 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
4 tasks
Split tunnel: - Add Filter.Items(filterType) to consolidate the read-side switch - Add SplitTunnel.ItemsJSON and EnabledAppsJSON with RunOffCgoStack - Use atomicfile.ReadFile, common.IsWindows(), handle marshal errors - Add tests for both new methods API client: - Wrap UserData, FetchUserData, Login, Logout, DeleteAccount, and OAuthLoginCallback with RunOffCgoStack to avoid CGo write barrier panics when protobuf structs are allocated on the callback stack Fixes getlantern/engineering#3088 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
myleshorton
force-pushed
the
fix/split-tunnel-cgo-safe-json
branch
from
564f040 to
fb32d1c
Compare
myleshorton
changed the title
…ustness - ItemsJSON: ensure non-nil slice so empty filters return [] not null - EnabledAppsJSON: use singjson.UnmarshalExtended for legacy file parse (consistent with loadRule which also uses extended JSON) - Windows dedup: lowercase only the dedup key, preserve original values - Tests: unmarshal JSON to []string and assert on slices instead of brittle string matching Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
garmr-ulfr
reviewed
Mar 21, 2026
Contributor
Author
|
I think those are the ones I just moved from core.go in lantern to consolidate. |
Per review: bundleId, bundleID, enabledApps, and apps were never valid split-tunnel config keys. Only processPath, processPathRegex, and packageName exist in legacy configs. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Contributor
Author
Call chain verificationBoth methods added in this PR are called from the lantern app via companion PR lantern#8556, which replaces ~90 lines of duplicated logic with thin wrappers:
Both methods use |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Filter.Items(filterType)method to consolidate the read-side filter type switchSplitTunnel.ItemsJSONandSplitTunnel.EnabledAppsJSONwithRunOffCgoStack[]byte-returningAPIClientmethods withRunOffCgoStack:UserData,FetchUserData,Login,Logout,DeleteAccount,OAuthLoginCallbackServersJSON()pattern: radiance owns data + marshaling on a real Go goroutineMotivation
Gomobile-exported functions run on a CGo callback stack whose memory is not covered by the GC heap bitmap. When these methods allocate protobuf structs, maps, or slices and marshal them to
[]byte,bulkBarrierPreWritepanics when copying the return value across the C boundary.Companion PR
Test plan
Fixes getlantern/engineering#3088
🤖 Generated with Claude Code