meta: release v1.5.1

pull/172/head v1.5.1
Jake McGinty 2021-11-11 18:42:21 +09:00
parent e2473951b7
commit 9a59ac3094
21 changed files with 58 additions and 99 deletions

10
Cargo.lock generated
View File

@ -163,7 +163,7 @@ dependencies = [
[[package]] [[package]]
name = "client" name = "client"
version = "1.5.0" version = "1.5.1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"colored", "colored",
@ -973,7 +973,7 @@ dependencies = [
[[package]] [[package]]
name = "server" name = "server"
version = "1.5.0" version = "1.5.1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bytes", "bytes",
@ -1006,7 +1006,7 @@ dependencies = [
[[package]] [[package]]
name = "shared" name = "shared"
version = "1.5.0" version = "1.5.1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"atty", "atty",
@ -1389,7 +1389,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]] [[package]]
name = "wireguard-control" name = "wireguard-control"
version = "1.5.0" version = "1.5.1"
dependencies = [ dependencies = [
"base64", "base64",
"curve25519-dalek", "curve25519-dalek",
@ -1401,7 +1401,7 @@ dependencies = [
[[package]] [[package]]
name = "wireguard-control-sys" name = "wireguard-control-sys"
version = "1.5.0" version = "1.5.1"
dependencies = [ dependencies = [
"bindgen", "bindgen",
"cc", "cc",

View File

@ -214,10 +214,10 @@ brew install tonarino/innernet/innernet
```sh ```sh
# to install innernet: # to install innernet:
cargo install --git https://github.com/tonarino/innernet --tag v1.5.0 client cargo install --git https://github.com/tonarino/innernet --tag v1.5.1 client
# to install innernet-server: # to install innernet-server:
cargo install --git https://github.com/tonarino/innernet --tag v1.5.0 server cargo install --git https://github.com/tonarino/innernet --tag v1.5.1 server
``` ```
Note that you'll be responsible for updating manually. Note that you'll be responsible for updating manually.

View File

@ -7,7 +7,7 @@ license = "MIT"
name = "client" name = "client"
publish = false publish = false
repository = "https://github.com/tonarino/innernet" repository = "https://github.com/tonarino/innernet"
version = "1.5.0" version = "1.5.1"
[[bin]] [[bin]]
name = "innernet" name = "innernet"

View File

@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5.
.TH INNERNET-SERVER "8" "September 2021" "innernet-server 1.5.0" "System Administration Utilities" .TH INNERNET-SERVER "8" "November 2021" "innernet-server 1.5.1" "System Administration Utilities"
.SH NAME .SH NAME
innernet-server \- manual page for innernet-server 1.5.0 innernet-server \- manual page for innernet-server 1.5.1
.SH DESCRIPTION .SH DESCRIPTION
innernet\-server 1.5.0 innernet\-server 1.5.1
A server to coordinate innernet networks. A server to coordinate innernet networks.
.SS "USAGE:" .SS "USAGE:"
.IP .IP

Binary file not shown.

View File

@ -50,7 +50,7 @@ _innernet-server() {
case "${cmd}" in case "${cmd}" in
innernet-server) innernet-server)
opts=" -h -V --no-routing --help --version --backend --mtu new uninstall serve add-peer rename-peer add-cidr delete-cidr completions help init init" opts=" -h -V --no-routing --help --version --backend --mtu new uninstall serve add-peer rename-peer add-cidr delete-cidr completions help init"
if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") ) COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0 return 0

View File

@ -64,7 +64,7 @@ edit:completion:arg-completer[innernet-server] = [@words]{
cand --cidr 'Name of CIDR to add new peer under' cand --cidr 'Name of CIDR to add new peer under'
cand --admin 'Make new peer an admin?' cand --admin 'Make new peer an admin?'
cand --save-config 'Save the config to the given location' cand --save-config 'Save the config to the given location'
cand --invite-expires 'Invite expiration period (eg. "30d", "7w", "2h", "60m", "1000s")' cand --invite-expires 'Invite expiration period (eg. ''30d'', ''7w'', ''2h'', ''60m'', ''1000s'')'
cand --auto-ip 'Auto-assign the peer the first available IP within the CIDR' cand --auto-ip 'Auto-assign the peer the first available IP within the CIDR'
cand --yes 'Bypass confirmation' cand --yes 'Bypass confirmation'
cand -h 'Prints help information' cand -h 'Prints help information'
@ -82,8 +82,8 @@ edit:completion:arg-completer[innernet-server] = [@words]{
cand --version 'Prints version information' cand --version 'Prints version information'
} }
&'innernet-server;add-cidr'= { &'innernet-server;add-cidr'= {
cand --name 'The CIDR name (eg. "engineers")' cand --name 'The CIDR name (eg. ''engineers'')'
cand --cidr 'The CIDR network (eg. "10.42.5.0/24")' cand --cidr 'The CIDR network (eg. ''10.42.5.0/24'')'
cand --parent 'The CIDR parent name' cand --parent 'The CIDR parent name'
cand --yes 'Bypass confirmation' cand --yes 'Bypass confirmation'
cand -h 'Prints help information' cand -h 'Prints help information'
@ -92,7 +92,7 @@ edit:completion:arg-completer[innernet-server] = [@words]{
cand --version 'Prints version information' cand --version 'Prints version information'
} }
&'innernet-server;delete-cidr'= { &'innernet-server;delete-cidr'= {
cand --name 'The CIDR name (eg. "engineers")' cand --name 'The CIDR name (eg. ''engineers'')'
cand --yes 'Bypass confirmation' cand --yes 'Bypass confirmation'
cand -h 'Prints help information' cand -h 'Prints help information'
cand --help 'Prints help information' cand --help 'Prints help information'

View File

@ -31,7 +31,7 @@ complete -c innernet-server -n "__fish_seen_subcommand_from add-peer" -l ip -d '
complete -c innernet-server -n "__fish_seen_subcommand_from add-peer" -l cidr -d 'Name of CIDR to add new peer under' complete -c innernet-server -n "__fish_seen_subcommand_from add-peer" -l cidr -d 'Name of CIDR to add new peer under'
complete -c innernet-server -n "__fish_seen_subcommand_from add-peer" -l admin -d 'Make new peer an admin?' complete -c innernet-server -n "__fish_seen_subcommand_from add-peer" -l admin -d 'Make new peer an admin?'
complete -c innernet-server -n "__fish_seen_subcommand_from add-peer" -l save-config -d 'Save the config to the given location' complete -c innernet-server -n "__fish_seen_subcommand_from add-peer" -l save-config -d 'Save the config to the given location'
complete -c innernet-server -n "__fish_seen_subcommand_from add-peer" -l invite-expires -d 'Invite expiration period (eg. "30d", "7w", "2h", "60m", "1000s")' complete -c innernet-server -n "__fish_seen_subcommand_from add-peer" -l invite-expires -d 'Invite expiration period (eg. \'30d\', \'7w\', \'2h\', \'60m\', \'1000s\')'
complete -c innernet-server -n "__fish_seen_subcommand_from add-peer" -l auto-ip -d 'Auto-assign the peer the first available IP within the CIDR' complete -c innernet-server -n "__fish_seen_subcommand_from add-peer" -l auto-ip -d 'Auto-assign the peer the first available IP within the CIDR'
complete -c innernet-server -n "__fish_seen_subcommand_from add-peer" -l yes -d 'Bypass confirmation' complete -c innernet-server -n "__fish_seen_subcommand_from add-peer" -l yes -d 'Bypass confirmation'
complete -c innernet-server -n "__fish_seen_subcommand_from add-peer" -s h -l help -d 'Prints help information' complete -c innernet-server -n "__fish_seen_subcommand_from add-peer" -s h -l help -d 'Prints help information'
@ -41,13 +41,13 @@ complete -c innernet-server -n "__fish_seen_subcommand_from rename-peer" -l new-
complete -c innernet-server -n "__fish_seen_subcommand_from rename-peer" -l yes -d 'Bypass confirmation' complete -c innernet-server -n "__fish_seen_subcommand_from rename-peer" -l yes -d 'Bypass confirmation'
complete -c innernet-server -n "__fish_seen_subcommand_from rename-peer" -s h -l help -d 'Prints help information' complete -c innernet-server -n "__fish_seen_subcommand_from rename-peer" -s h -l help -d 'Prints help information'
complete -c innernet-server -n "__fish_seen_subcommand_from rename-peer" -s V -l version -d 'Prints version information' complete -c innernet-server -n "__fish_seen_subcommand_from rename-peer" -s V -l version -d 'Prints version information'
complete -c innernet-server -n "__fish_seen_subcommand_from add-cidr" -l name -d 'The CIDR name (eg. "engineers")' complete -c innernet-server -n "__fish_seen_subcommand_from add-cidr" -l name -d 'The CIDR name (eg. \'engineers\')'
complete -c innernet-server -n "__fish_seen_subcommand_from add-cidr" -l cidr -d 'The CIDR network (eg. "10.42.5.0/24")' complete -c innernet-server -n "__fish_seen_subcommand_from add-cidr" -l cidr -d 'The CIDR network (eg. \'10.42.5.0/24\')'
complete -c innernet-server -n "__fish_seen_subcommand_from add-cidr" -l parent -d 'The CIDR parent name' complete -c innernet-server -n "__fish_seen_subcommand_from add-cidr" -l parent -d 'The CIDR parent name'
complete -c innernet-server -n "__fish_seen_subcommand_from add-cidr" -l yes -d 'Bypass confirmation' complete -c innernet-server -n "__fish_seen_subcommand_from add-cidr" -l yes -d 'Bypass confirmation'
complete -c innernet-server -n "__fish_seen_subcommand_from add-cidr" -s h -l help -d 'Prints help information' complete -c innernet-server -n "__fish_seen_subcommand_from add-cidr" -s h -l help -d 'Prints help information'
complete -c innernet-server -n "__fish_seen_subcommand_from add-cidr" -s V -l version -d 'Prints version information' complete -c innernet-server -n "__fish_seen_subcommand_from add-cidr" -s V -l version -d 'Prints version information'
complete -c innernet-server -n "__fish_seen_subcommand_from delete-cidr" -l name -d 'The CIDR name (eg. "engineers")' complete -c innernet-server -n "__fish_seen_subcommand_from delete-cidr" -l name -d 'The CIDR name (eg. \'engineers\')'
complete -c innernet-server -n "__fish_seen_subcommand_from delete-cidr" -l yes -d 'Bypass confirmation' complete -c innernet-server -n "__fish_seen_subcommand_from delete-cidr" -l yes -d 'Bypass confirmation'
complete -c innernet-server -n "__fish_seen_subcommand_from delete-cidr" -s h -l help -d 'Prints help information' complete -c innernet-server -n "__fish_seen_subcommand_from delete-cidr" -s h -l help -d 'Prints help information'
complete -c innernet-server -n "__fish_seen_subcommand_from delete-cidr" -s V -l version -d 'Prints version information' complete -c innernet-server -n "__fish_seen_subcommand_from delete-cidr" -s V -l version -d 'Prints version information'

View File

@ -73,7 +73,7 @@ Register-ArgumentCompleter -Native -CommandName 'innernet-server' -ScriptBlock {
[CompletionResult]::new('--cidr', 'cidr', [CompletionResultType]::ParameterName, 'Name of CIDR to add new peer under') [CompletionResult]::new('--cidr', 'cidr', [CompletionResultType]::ParameterName, 'Name of CIDR to add new peer under')
[CompletionResult]::new('--admin', 'admin', [CompletionResultType]::ParameterName, 'Make new peer an admin?') [CompletionResult]::new('--admin', 'admin', [CompletionResultType]::ParameterName, 'Make new peer an admin?')
[CompletionResult]::new('--save-config', 'save-config', [CompletionResultType]::ParameterName, 'Save the config to the given location') [CompletionResult]::new('--save-config', 'save-config', [CompletionResultType]::ParameterName, 'Save the config to the given location')
[CompletionResult]::new('--invite-expires', 'invite-expires', [CompletionResultType]::ParameterName, 'Invite expiration period (eg. "30d", "7w", "2h", "60m", "1000s")') [CompletionResult]::new('--invite-expires', 'invite-expires', [CompletionResultType]::ParameterName, 'Invite expiration period (eg. ''30d'', ''7w'', ''2h'', ''60m'', ''1000s'')')
[CompletionResult]::new('--auto-ip', 'auto-ip', [CompletionResultType]::ParameterName, 'Auto-assign the peer the first available IP within the CIDR') [CompletionResult]::new('--auto-ip', 'auto-ip', [CompletionResultType]::ParameterName, 'Auto-assign the peer the first available IP within the CIDR')
[CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Bypass confirmation') [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Bypass confirmation')
[CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information') [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
@ -93,8 +93,8 @@ Register-ArgumentCompleter -Native -CommandName 'innernet-server' -ScriptBlock {
break break
} }
'innernet-server;add-cidr' { 'innernet-server;add-cidr' {
[CompletionResult]::new('--name', 'name', [CompletionResultType]::ParameterName, 'The CIDR name (eg. "engineers")') [CompletionResult]::new('--name', 'name', [CompletionResultType]::ParameterName, 'The CIDR name (eg. ''engineers'')')
[CompletionResult]::new('--cidr', 'cidr', [CompletionResultType]::ParameterName, 'The CIDR network (eg. "10.42.5.0/24")') [CompletionResult]::new('--cidr', 'cidr', [CompletionResultType]::ParameterName, 'The CIDR network (eg. ''10.42.5.0/24'')')
[CompletionResult]::new('--parent', 'parent', [CompletionResultType]::ParameterName, 'The CIDR parent name') [CompletionResult]::new('--parent', 'parent', [CompletionResultType]::ParameterName, 'The CIDR parent name')
[CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Bypass confirmation') [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Bypass confirmation')
[CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information') [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
@ -104,7 +104,7 @@ Register-ArgumentCompleter -Native -CommandName 'innernet-server' -ScriptBlock {
break break
} }
'innernet-server;delete-cidr' { 'innernet-server;delete-cidr' {
[CompletionResult]::new('--name', 'name', [CompletionResultType]::ParameterName, 'The CIDR name (eg. "engineers")') [CompletionResult]::new('--name', 'name', [CompletionResultType]::ParameterName, 'The CIDR name (eg. ''engineers'')')
[CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Bypass confirmation') [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Bypass confirmation')
[CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information') [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
[CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information') [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information')

View File

@ -44,19 +44,6 @@ _arguments "${_arguments_options[@]}" \
'--version[Prints version information]' \ '--version[Prints version information]' \
&& ret=0 && ret=0
;; ;;
(init)
_arguments "${_arguments_options[@]}" \
'--network-name=[The network name (ex: evilcorp)]' \
'--network-cidr=[The network CIDR (ex: 10.42.0.0/16)]' \
'(--auto-external-endpoint)--external-endpoint=[This server'\''s external endpoint (ex: 100.100.100.100:51820)]' \
'--listen-port=[Port to listen on (for the WireGuard interface)]' \
'--auto-external-endpoint[Auto-resolve external endpoint]' \
'-h[Prints help information]' \
'--help[Prints help information]' \
'-V[Prints version information]' \
'--version[Prints version information]' \
&& ret=0
;;
(new) (new)
_arguments "${_arguments_options[@]}" \ _arguments "${_arguments_options[@]}" \
'--network-name=[The network name (ex: evilcorp)]' \ '--network-name=[The network name (ex: evilcorp)]' \
@ -98,7 +85,7 @@ _arguments "${_arguments_options[@]}" \
'--cidr=[Name of CIDR to add new peer under]' \ '--cidr=[Name of CIDR to add new peer under]' \
'--admin=[Make new peer an admin?]' \ '--admin=[Make new peer an admin?]' \
'--save-config=[Save the config to the given location]' \ '--save-config=[Save the config to the given location]' \
'--invite-expires=[Invite expiration period (eg. "30d", "7w", "2h", "60m", "1000s")]' \ '--invite-expires=[Invite expiration period (eg. '\''30d'\'', '\''7w'\'', '\''2h'\'', '\''60m'\'', '\''1000s'\'')]' \
'--auto-ip[Auto-assign the peer the first available IP within the CIDR]' \ '--auto-ip[Auto-assign the peer the first available IP within the CIDR]' \
'--yes[Bypass confirmation]' \ '--yes[Bypass confirmation]' \
'-h[Prints help information]' \ '-h[Prints help information]' \
@ -122,8 +109,8 @@ _arguments "${_arguments_options[@]}" \
;; ;;
(add-cidr) (add-cidr)
_arguments "${_arguments_options[@]}" \ _arguments "${_arguments_options[@]}" \
'--name=[The CIDR name (eg. "engineers")]' \ '--name=[The CIDR name (eg. '\''engineers'\'')]' \
'--cidr=[The CIDR network (eg. "10.42.5.0/24")]' \ '--cidr=[The CIDR network (eg. '\''10.42.5.0/24'\'')]' \
'--parent=[The CIDR parent name]' \ '--parent=[The CIDR parent name]' \
'--yes[Bypass confirmation]' \ '--yes[Bypass confirmation]' \
'-h[Prints help information]' \ '-h[Prints help information]' \
@ -135,7 +122,7 @@ _arguments "${_arguments_options[@]}" \
;; ;;
(delete-cidr) (delete-cidr)
_arguments "${_arguments_options[@]}" \ _arguments "${_arguments_options[@]}" \
'--name=[The CIDR name (eg. "engineers")]' \ '--name=[The CIDR name (eg. '\''engineers'\'')]' \
'--yes[Bypass confirmation]' \ '--yes[Bypass confirmation]' \
'-h[Prints help information]' \ '-h[Prints help information]' \
'--help[Prints help information]' \ '--help[Prints help information]' \

View File

@ -1,9 +1,9 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5.
.TH INNERNET "8" "September 2021" "innernet 1.5.0" "System Administration Utilities" .TH INNERNET "8" "November 2021" "innernet 1.5.1" "System Administration Utilities"
.SH NAME .SH NAME
innernet \- manual page for innernet 1.5.0 innernet \- manual page for innernet 1.5.1
.SH DESCRIPTION .SH DESCRIPTION
innernet 1.5.0 innernet 1.5.1
A client to manage innernet network interfaces. A client to manage innernet network interfaces.
.SS "USAGE:" .SS "USAGE:"
.IP .IP
@ -52,7 +52,7 @@ uninstall
Uninstall an innernet network Uninstall an innernet network
.TP .TP
down down
Bring down the interface (equivalent to "wg\-quick down <interface>") Bring down the interface (equivalent to 'wg\-quick down <interface>')
.TP .TP
add\-peer add\-peer
Add a new peer Add a new peer

Binary file not shown.

View File

@ -86,7 +86,7 @@ _innernet() {
case "${cmd}" in case "${cmd}" in
innernet) innernet)
opts=" -v -h -V --verbose --no-routing --help --version --backend --mtu install show up fetch uninstall down add-peer rename-peer add-cidr delete-cidr list-cidrs disable-peer enable-peer add-association delete-association list-associations set-listen-port override-endpoint completions help redeem redeem list list" opts=" -v -h -V --verbose --no-routing --help --version --backend --mtu install show up fetch uninstall down add-peer rename-peer add-cidr delete-cidr list-cidrs disable-peer enable-peer add-association delete-association list-associations set-listen-port override-endpoint completions help redeem list"
if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") ) COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
return 0 return 0

View File

@ -29,7 +29,7 @@ edit:completion:arg-completer[innernet] = [@words]{
cand up 'Bring up your local interface, and update it with latest peer list' cand up 'Bring up your local interface, and update it with latest peer list'
cand fetch 'Fetch and update your local interface with the latest peer list' cand fetch 'Fetch and update your local interface with the latest peer list'
cand uninstall 'Uninstall an innernet network' cand uninstall 'Uninstall an innernet network'
cand down 'Bring down the interface (equivalent to "wg-quick down <interface>")' cand down 'Bring down the interface (equivalent to ''wg-quick down <interface>'')'
cand add-peer 'Add a new peer' cand add-peer 'Add a new peer'
cand rename-peer 'Rename a peer' cand rename-peer 'Rename a peer'
cand add-cidr 'Add a new CIDR' cand add-cidr 'Add a new CIDR'
@ -104,7 +104,7 @@ edit:completion:arg-completer[innernet] = [@words]{
cand --cidr 'Name of CIDR to add new peer under' cand --cidr 'Name of CIDR to add new peer under'
cand --admin 'Make new peer an admin?' cand --admin 'Make new peer an admin?'
cand --save-config 'Save the config to the given location' cand --save-config 'Save the config to the given location'
cand --invite-expires 'Invite expiration period (eg. "30d", "7w", "2h", "60m", "1000s")' cand --invite-expires 'Invite expiration period (eg. ''30d'', ''7w'', ''2h'', ''60m'', ''1000s'')'
cand --auto-ip 'Auto-assign the peer the first available IP within the CIDR' cand --auto-ip 'Auto-assign the peer the first available IP within the CIDR'
cand --yes 'Bypass confirmation' cand --yes 'Bypass confirmation'
cand -h 'Prints help information' cand -h 'Prints help information'
@ -122,8 +122,8 @@ edit:completion:arg-completer[innernet] = [@words]{
cand --version 'Prints version information' cand --version 'Prints version information'
} }
&'innernet;add-cidr'= { &'innernet;add-cidr'= {
cand --name 'The CIDR name (eg. "engineers")' cand --name 'The CIDR name (eg. ''engineers'')'
cand --cidr 'The CIDR network (eg. "10.42.5.0/24")' cand --cidr 'The CIDR network (eg. ''10.42.5.0/24'')'
cand --parent 'The CIDR parent name' cand --parent 'The CIDR parent name'
cand --yes 'Bypass confirmation' cand --yes 'Bypass confirmation'
cand -h 'Prints help information' cand -h 'Prints help information'
@ -132,7 +132,7 @@ edit:completion:arg-completer[innernet] = [@words]{
cand --version 'Prints version information' cand --version 'Prints version information'
} }
&'innernet;delete-cidr'= { &'innernet;delete-cidr'= {
cand --name 'The CIDR name (eg. "engineers")' cand --name 'The CIDR name (eg. ''engineers'')'
cand --yes 'Bypass confirmation' cand --yes 'Bypass confirmation'
cand -h 'Prints help information' cand -h 'Prints help information'
cand --help 'Prints help information' cand --help 'Prints help information'

View File

@ -9,7 +9,7 @@ complete -c innernet -n "__fish_use_subcommand" -f -a "show" -d 'Enumerate all i
complete -c innernet -n "__fish_use_subcommand" -f -a "up" -d 'Bring up your local interface, and update it with latest peer list' complete -c innernet -n "__fish_use_subcommand" -f -a "up" -d 'Bring up your local interface, and update it with latest peer list'
complete -c innernet -n "__fish_use_subcommand" -f -a "fetch" -d 'Fetch and update your local interface with the latest peer list' complete -c innernet -n "__fish_use_subcommand" -f -a "fetch" -d 'Fetch and update your local interface with the latest peer list'
complete -c innernet -n "__fish_use_subcommand" -f -a "uninstall" -d 'Uninstall an innernet network' complete -c innernet -n "__fish_use_subcommand" -f -a "uninstall" -d 'Uninstall an innernet network'
complete -c innernet -n "__fish_use_subcommand" -f -a "down" -d 'Bring down the interface (equivalent to "wg-quick down <interface>")' complete -c innernet -n "__fish_use_subcommand" -f -a "down" -d 'Bring down the interface (equivalent to \'wg-quick down <interface>\')'
complete -c innernet -n "__fish_use_subcommand" -f -a "add-peer" -d 'Add a new peer' complete -c innernet -n "__fish_use_subcommand" -f -a "add-peer" -d 'Add a new peer'
complete -c innernet -n "__fish_use_subcommand" -f -a "rename-peer" -d 'Rename a peer' complete -c innernet -n "__fish_use_subcommand" -f -a "rename-peer" -d 'Rename a peer'
complete -c innernet -n "__fish_use_subcommand" -f -a "add-cidr" -d 'Add a new CIDR' complete -c innernet -n "__fish_use_subcommand" -f -a "add-cidr" -d 'Add a new CIDR'
@ -54,7 +54,7 @@ complete -c innernet -n "__fish_seen_subcommand_from add-peer" -l ip -d 'Specify
complete -c innernet -n "__fish_seen_subcommand_from add-peer" -l cidr -d 'Name of CIDR to add new peer under' complete -c innernet -n "__fish_seen_subcommand_from add-peer" -l cidr -d 'Name of CIDR to add new peer under'
complete -c innernet -n "__fish_seen_subcommand_from add-peer" -l admin -d 'Make new peer an admin?' complete -c innernet -n "__fish_seen_subcommand_from add-peer" -l admin -d 'Make new peer an admin?'
complete -c innernet -n "__fish_seen_subcommand_from add-peer" -l save-config -d 'Save the config to the given location' complete -c innernet -n "__fish_seen_subcommand_from add-peer" -l save-config -d 'Save the config to the given location'
complete -c innernet -n "__fish_seen_subcommand_from add-peer" -l invite-expires -d 'Invite expiration period (eg. "30d", "7w", "2h", "60m", "1000s")' complete -c innernet -n "__fish_seen_subcommand_from add-peer" -l invite-expires -d 'Invite expiration period (eg. \'30d\', \'7w\', \'2h\', \'60m\', \'1000s\')'
complete -c innernet -n "__fish_seen_subcommand_from add-peer" -l auto-ip -d 'Auto-assign the peer the first available IP within the CIDR' complete -c innernet -n "__fish_seen_subcommand_from add-peer" -l auto-ip -d 'Auto-assign the peer the first available IP within the CIDR'
complete -c innernet -n "__fish_seen_subcommand_from add-peer" -l yes -d 'Bypass confirmation' complete -c innernet -n "__fish_seen_subcommand_from add-peer" -l yes -d 'Bypass confirmation'
complete -c innernet -n "__fish_seen_subcommand_from add-peer" -s h -l help -d 'Prints help information' complete -c innernet -n "__fish_seen_subcommand_from add-peer" -s h -l help -d 'Prints help information'
@ -64,13 +64,13 @@ complete -c innernet -n "__fish_seen_subcommand_from rename-peer" -l new-name -d
complete -c innernet -n "__fish_seen_subcommand_from rename-peer" -l yes -d 'Bypass confirmation' complete -c innernet -n "__fish_seen_subcommand_from rename-peer" -l yes -d 'Bypass confirmation'
complete -c innernet -n "__fish_seen_subcommand_from rename-peer" -s h -l help -d 'Prints help information' complete -c innernet -n "__fish_seen_subcommand_from rename-peer" -s h -l help -d 'Prints help information'
complete -c innernet -n "__fish_seen_subcommand_from rename-peer" -s V -l version -d 'Prints version information' complete -c innernet -n "__fish_seen_subcommand_from rename-peer" -s V -l version -d 'Prints version information'
complete -c innernet -n "__fish_seen_subcommand_from add-cidr" -l name -d 'The CIDR name (eg. "engineers")' complete -c innernet -n "__fish_seen_subcommand_from add-cidr" -l name -d 'The CIDR name (eg. \'engineers\')'
complete -c innernet -n "__fish_seen_subcommand_from add-cidr" -l cidr -d 'The CIDR network (eg. "10.42.5.0/24")' complete -c innernet -n "__fish_seen_subcommand_from add-cidr" -l cidr -d 'The CIDR network (eg. \'10.42.5.0/24\')'
complete -c innernet -n "__fish_seen_subcommand_from add-cidr" -l parent -d 'The CIDR parent name' complete -c innernet -n "__fish_seen_subcommand_from add-cidr" -l parent -d 'The CIDR parent name'
complete -c innernet -n "__fish_seen_subcommand_from add-cidr" -l yes -d 'Bypass confirmation' complete -c innernet -n "__fish_seen_subcommand_from add-cidr" -l yes -d 'Bypass confirmation'
complete -c innernet -n "__fish_seen_subcommand_from add-cidr" -s h -l help -d 'Prints help information' complete -c innernet -n "__fish_seen_subcommand_from add-cidr" -s h -l help -d 'Prints help information'
complete -c innernet -n "__fish_seen_subcommand_from add-cidr" -s V -l version -d 'Prints version information' complete -c innernet -n "__fish_seen_subcommand_from add-cidr" -s V -l version -d 'Prints version information'
complete -c innernet -n "__fish_seen_subcommand_from delete-cidr" -l name -d 'The CIDR name (eg. "engineers")' complete -c innernet -n "__fish_seen_subcommand_from delete-cidr" -l name -d 'The CIDR name (eg. \'engineers\')'
complete -c innernet -n "__fish_seen_subcommand_from delete-cidr" -l yes -d 'Bypass confirmation' complete -c innernet -n "__fish_seen_subcommand_from delete-cidr" -l yes -d 'Bypass confirmation'
complete -c innernet -n "__fish_seen_subcommand_from delete-cidr" -s h -l help -d 'Prints help information' complete -c innernet -n "__fish_seen_subcommand_from delete-cidr" -s h -l help -d 'Prints help information'
complete -c innernet -n "__fish_seen_subcommand_from delete-cidr" -s V -l version -d 'Prints version information' complete -c innernet -n "__fish_seen_subcommand_from delete-cidr" -s V -l version -d 'Prints version information'

View File

@ -34,7 +34,7 @@ Register-ArgumentCompleter -Native -CommandName 'innernet' -ScriptBlock {
[CompletionResult]::new('up', 'up', [CompletionResultType]::ParameterValue, 'Bring up your local interface, and update it with latest peer list') [CompletionResult]::new('up', 'up', [CompletionResultType]::ParameterValue, 'Bring up your local interface, and update it with latest peer list')
[CompletionResult]::new('fetch', 'fetch', [CompletionResultType]::ParameterValue, 'Fetch and update your local interface with the latest peer list') [CompletionResult]::new('fetch', 'fetch', [CompletionResultType]::ParameterValue, 'Fetch and update your local interface with the latest peer list')
[CompletionResult]::new('uninstall', 'uninstall', [CompletionResultType]::ParameterValue, 'Uninstall an innernet network') [CompletionResult]::new('uninstall', 'uninstall', [CompletionResultType]::ParameterValue, 'Uninstall an innernet network')
[CompletionResult]::new('down', 'down', [CompletionResultType]::ParameterValue, 'Bring down the interface (equivalent to "wg-quick down <interface>")') [CompletionResult]::new('down', 'down', [CompletionResultType]::ParameterValue, 'Bring down the interface (equivalent to ''wg-quick down <interface>'')')
[CompletionResult]::new('add-peer', 'add-peer', [CompletionResultType]::ParameterValue, 'Add a new peer') [CompletionResult]::new('add-peer', 'add-peer', [CompletionResultType]::ParameterValue, 'Add a new peer')
[CompletionResult]::new('rename-peer', 'rename-peer', [CompletionResultType]::ParameterValue, 'Rename a peer') [CompletionResult]::new('rename-peer', 'rename-peer', [CompletionResultType]::ParameterValue, 'Rename a peer')
[CompletionResult]::new('add-cidr', 'add-cidr', [CompletionResultType]::ParameterValue, 'Add a new CIDR') [CompletionResult]::new('add-cidr', 'add-cidr', [CompletionResultType]::ParameterValue, 'Add a new CIDR')
@ -116,7 +116,7 @@ Register-ArgumentCompleter -Native -CommandName 'innernet' -ScriptBlock {
[CompletionResult]::new('--cidr', 'cidr', [CompletionResultType]::ParameterName, 'Name of CIDR to add new peer under') [CompletionResult]::new('--cidr', 'cidr', [CompletionResultType]::ParameterName, 'Name of CIDR to add new peer under')
[CompletionResult]::new('--admin', 'admin', [CompletionResultType]::ParameterName, 'Make new peer an admin?') [CompletionResult]::new('--admin', 'admin', [CompletionResultType]::ParameterName, 'Make new peer an admin?')
[CompletionResult]::new('--save-config', 'save-config', [CompletionResultType]::ParameterName, 'Save the config to the given location') [CompletionResult]::new('--save-config', 'save-config', [CompletionResultType]::ParameterName, 'Save the config to the given location')
[CompletionResult]::new('--invite-expires', 'invite-expires', [CompletionResultType]::ParameterName, 'Invite expiration period (eg. "30d", "7w", "2h", "60m", "1000s")') [CompletionResult]::new('--invite-expires', 'invite-expires', [CompletionResultType]::ParameterName, 'Invite expiration period (eg. ''30d'', ''7w'', ''2h'', ''60m'', ''1000s'')')
[CompletionResult]::new('--auto-ip', 'auto-ip', [CompletionResultType]::ParameterName, 'Auto-assign the peer the first available IP within the CIDR') [CompletionResult]::new('--auto-ip', 'auto-ip', [CompletionResultType]::ParameterName, 'Auto-assign the peer the first available IP within the CIDR')
[CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Bypass confirmation') [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Bypass confirmation')
[CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information') [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
@ -136,8 +136,8 @@ Register-ArgumentCompleter -Native -CommandName 'innernet' -ScriptBlock {
break break
} }
'innernet;add-cidr' { 'innernet;add-cidr' {
[CompletionResult]::new('--name', 'name', [CompletionResultType]::ParameterName, 'The CIDR name (eg. "engineers")') [CompletionResult]::new('--name', 'name', [CompletionResultType]::ParameterName, 'The CIDR name (eg. ''engineers'')')
[CompletionResult]::new('--cidr', 'cidr', [CompletionResultType]::ParameterName, 'The CIDR network (eg. "10.42.5.0/24")') [CompletionResult]::new('--cidr', 'cidr', [CompletionResultType]::ParameterName, 'The CIDR network (eg. ''10.42.5.0/24'')')
[CompletionResult]::new('--parent', 'parent', [CompletionResultType]::ParameterName, 'The CIDR parent name') [CompletionResult]::new('--parent', 'parent', [CompletionResultType]::ParameterName, 'The CIDR parent name')
[CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Bypass confirmation') [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Bypass confirmation')
[CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information') [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
@ -147,7 +147,7 @@ Register-ArgumentCompleter -Native -CommandName 'innernet' -ScriptBlock {
break break
} }
'innernet;delete-cidr' { 'innernet;delete-cidr' {
[CompletionResult]::new('--name', 'name', [CompletionResultType]::ParameterName, 'The CIDR name (eg. "engineers")') [CompletionResult]::new('--name', 'name', [CompletionResultType]::ParameterName, 'The CIDR name (eg. ''engineers'')')
[CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Bypass confirmation') [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Bypass confirmation')
[CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information') [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
[CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information') [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information')

View File

@ -48,21 +48,6 @@ _arguments "${_arguments_options[@]}" \
':invite -- Path to the invitation file:_files' \ ':invite -- Path to the invitation file:_files' \
&& ret=0 && ret=0
;; ;;
(redeem)
_arguments "${_arguments_options[@]}" \
'--hosts-path=[The path to write hosts to]' \
'(--default-name)--name=[Set a specific interface name]' \
'(--hosts-path)--no-write-hosts[Don'\''t write to any hosts files]' \
'--default-name[Use the network name inside the invitation as the interface name]' \
'-d[Delete the invitation after a successful install]' \
'--delete-invite[Delete the invitation after a successful install]' \
'-h[Prints help information]' \
'--help[Prints help information]' \
'-V[Prints version information]' \
'--version[Prints version information]' \
':invite -- Path to the invitation file:_files' \
&& ret=0
;;
(install) (install)
_arguments "${_arguments_options[@]}" \ _arguments "${_arguments_options[@]}" \
'--hosts-path=[The path to write hosts to]' \ '--hosts-path=[The path to write hosts to]' \
@ -91,19 +76,6 @@ _arguments "${_arguments_options[@]}" \
'::interface:_files' \ '::interface:_files' \
&& ret=0 && ret=0
;; ;;
(list)
_arguments "${_arguments_options[@]}" \
'-s[One-line peer list]' \
'--short[One-line peer list]' \
'-t[Display peers in a tree based on the CIDRs]' \
'--tree[Display peers in a tree based on the CIDRs]' \
'-h[Prints help information]' \
'--help[Prints help information]' \
'-V[Prints version information]' \
'--version[Prints version information]' \
'::interface:_files' \
&& ret=0
;;
(show) (show)
_arguments "${_arguments_options[@]}" \ _arguments "${_arguments_options[@]}" \
'-s[One-line peer list]' \ '-s[One-line peer list]' \
@ -167,7 +139,7 @@ _arguments "${_arguments_options[@]}" \
'--cidr=[Name of CIDR to add new peer under]' \ '--cidr=[Name of CIDR to add new peer under]' \
'--admin=[Make new peer an admin?]' \ '--admin=[Make new peer an admin?]' \
'--save-config=[Save the config to the given location]' \ '--save-config=[Save the config to the given location]' \
'--invite-expires=[Invite expiration period (eg. "30d", "7w", "2h", "60m", "1000s")]' \ '--invite-expires=[Invite expiration period (eg. '\''30d'\'', '\''7w'\'', '\''2h'\'', '\''60m'\'', '\''1000s'\'')]' \
'--auto-ip[Auto-assign the peer the first available IP within the CIDR]' \ '--auto-ip[Auto-assign the peer the first available IP within the CIDR]' \
'--yes[Bypass confirmation]' \ '--yes[Bypass confirmation]' \
'-h[Prints help information]' \ '-h[Prints help information]' \
@ -191,8 +163,8 @@ _arguments "${_arguments_options[@]}" \
;; ;;
(add-cidr) (add-cidr)
_arguments "${_arguments_options[@]}" \ _arguments "${_arguments_options[@]}" \
'--name=[The CIDR name (eg. "engineers")]' \ '--name=[The CIDR name (eg. '\''engineers'\'')]' \
'--cidr=[The CIDR network (eg. "10.42.5.0/24")]' \ '--cidr=[The CIDR network (eg. '\''10.42.5.0/24'\'')]' \
'--parent=[The CIDR parent name]' \ '--parent=[The CIDR parent name]' \
'--yes[Bypass confirmation]' \ '--yes[Bypass confirmation]' \
'-h[Prints help information]' \ '-h[Prints help information]' \
@ -204,7 +176,7 @@ _arguments "${_arguments_options[@]}" \
;; ;;
(delete-cidr) (delete-cidr)
_arguments "${_arguments_options[@]}" \ _arguments "${_arguments_options[@]}" \
'--name=[The CIDR name (eg. "engineers")]' \ '--name=[The CIDR name (eg. '\''engineers'\'')]' \
'--yes[Bypass confirmation]' \ '--yes[Bypass confirmation]' \
'-h[Prints help information]' \ '-h[Prints help information]' \
'--help[Prints help information]' \ '--help[Prints help information]' \
@ -323,7 +295,7 @@ _innernet_commands() {
"up:Bring up your local interface, and update it with latest peer list" \ "up:Bring up your local interface, and update it with latest peer list" \
"fetch:Fetch and update your local interface with the latest peer list" \ "fetch:Fetch and update your local interface with the latest peer list" \
"uninstall:Uninstall an innernet network" \ "uninstall:Uninstall an innernet network" \
"down:Bring down the interface (equivalent to "wg-quick down <interface>")" \ "down:Bring down the interface (equivalent to 'wg-quick down <interface>')" \
"add-peer:Add a new peer" \ "add-peer:Add a new peer" \
"rename-peer:Rename a peer" \ "rename-peer:Rename a peer" \
"add-cidr:Add a new CIDR" \ "add-cidr:Add a new CIDR" \

View File

@ -6,7 +6,7 @@ license = "MIT"
name = "server" name = "server"
publish = false publish = false
readme = "README.md" readme = "README.md"
version = "1.5.0" version = "1.5.1"
[[bin]] [[bin]]
name = "innernet-server" name = "innernet-server"

View File

@ -4,7 +4,7 @@ edition = "2018"
license = "MIT" license = "MIT"
name = "shared" name = "shared"
publish = false publish = false
version = "1.5.0" version = "1.5.1"
[dependencies] [dependencies]
anyhow = "1" anyhow = "1"

View File

@ -6,7 +6,7 @@ license = "LGPL-2.1-or-later"
name = "wireguard-control-sys" name = "wireguard-control-sys"
readme = "README.md" readme = "README.md"
repository = "https://github.com/tonarino/innernet" repository = "https://github.com/tonarino/innernet"
version = "1.5.0" version = "1.5.1"
[dependencies] [dependencies]
libc = "0.2" libc = "0.2"

View File

@ -7,7 +7,7 @@ license = "LGPL-2.1-or-later"
name = "wireguard-control" name = "wireguard-control"
readme = "README.md" readme = "README.md"
repository = "https://github.com/tonarino/innernet" repository = "https://github.com/tonarino/innernet"
version = "1.5.0" version = "1.5.1"
[dependencies] [dependencies]
base64 = "0.13" base64 = "0.13"
@ -15,7 +15,7 @@ hex = "0.4"
libc = "0.2" libc = "0.2"
[target.'cfg(target_os = "linux")'.dependencies] [target.'cfg(target_os = "linux")'.dependencies]
wireguard-control-sys = { path = "../wireguard-control-sys", version = "1.5.0" } wireguard-control-sys = { path = "../wireguard-control-sys", version = "1.5.1" }
[target.'cfg(not(target_os = "linux"))'.dependencies] [target.'cfg(not(target_os = "linux"))'.dependencies]
rand_core = "0.6" rand_core = "0.6"