Skip to content

PSK support for add server and add client #101

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
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

PSK support for add server and add client #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9299193
initial PSK support
ntozaks Jul 28, 2025
8032c26
pointer dereferencing
ntozaks Jul 29, 2025
a1c515a
merge main and ptr check
ntozaks Jul 31, 2025
5143d7e
Merge branch 'main' into iss58
ntozaks Jul 31, 2025
45895bf
Merge remote-tracking branch 'origin' into iss58
ntozaks Aug 4, 2025
b91744e
initial PSK support for add server
ntozaks Aug 12, 2025
45b1ba8
removing nickname
ntozaks Aug 12, 2025
e36ddd6
inital PSK support for add client
ntozaks Aug 13, 2025
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
3 changes: 3 additions & 0 deletions src/cmd/add.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ type addCmdConfig struct {
endpoint string
outboundEndpoint string
keepalive int
generatePSK bool
}

// Defaults for add command.
Expand All @@ -18,6 +19,7 @@ var addCmdArgs = addCmdConfig{
endpoint: Endpoint,
outboundEndpoint: Endpoint,
keepalive: Keepalive,
generatePSK: false,
}

// addCmd represents the add command.
Expand All @@ -33,6 +35,7 @@ func init() {

addCmd.PersistentFlags().StringVarP(&addCmdArgs.endpoint, "endpoint", "e", addCmdArgs.endpoint, "IP:PORT (or [IP]:PORT for IPv6) of wireguard listener that server will connect to (example \"1.2.3.4:51820\")")
addCmd.PersistentFlags().StringVarP(&addCmdArgs.outboundEndpoint, "outbound-endpoint", "o", addCmdArgs.outboundEndpoint, "IP:PORT (or [IP]:PORT for IPv6) of wireguard listener that client will connect to (example \"4.3.2.1:51820\"")
addCmd.PersistentFlags().BoolVarP(&addCmdArgs.generatePSK, "PSK", "K", addCmdArgs.generatePSK, "generate a preshared key")

addCmd.PersistentFlags().IntVarP(&addCmdArgs.keepalive, "keepalive", "k", addCmdArgs.keepalive, "tunnel keepalive in seconds")

Expand Down
9 changes: 9 additions & 0 deletions src/cmd/add_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,15 @@ func (c addClientCmdConfig) Run() {
// Make peer configs to populate server peers.
clientPeerConfigRelay, err := peer.GetPeerConfig(peer.PeerConfigArgs{
PublicKey: clientConfigRelay.GetPublicKey(),
PresharedKey: func() string {
if addArgs.generatePSK {
err := clientConfigRelay.GenPresharedKey()
check("failed to generate preshared key", err)
return clientConfigRelay.GetPresharedKey()
} else {
return ""
}
}(),
AllowedIPs: func() []string {
allowed := []string{}
for _, prefix := range clientConfigRelay.GetAddresses() {
Expand Down
9 changes: 9 additions & 0 deletions src/cmd/add_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,15 @@ func (c addServerCmdConfig) Run() {
// Add new server as relay peer.
serverRelayPeer, err := peer.GetPeerConfig(peer.PeerConfigArgs{
PublicKey: serverConfigRelay.GetPublicKey(),
PresharedKey: func() string {
if addArgs.generatePSK {
err := serverConfigRelay.GenPresharedKey()
check("failed to generate preshared key", err)
return serverConfigRelay.GetPresharedKey()
} else {
return ""
}
}(),
AllowedIPs: func() []string {
allowedIPs := []string{}
for _, prefix := range newRelayPrefixes {
Expand Down
Loading