From a9c705f9f7ec63ed58ba0295acbf8bbcc77692f2 Mon Sep 17 00:00:00 2001 From: Masala Date: Sat, 3 Dec 2022 16:51:11 -0500 Subject: [PATCH 01/11] add spool provider selection to katzen --- katzen.go | 23 ++++---- spool.go | 160 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 173 insertions(+), 10 deletions(-) create mode 100644 spool.go diff --git a/katzen.go b/katzen.go index 0f9a32f..d7640ad 100644 --- a/katzen.go +++ b/katzen.go @@ -109,25 +109,28 @@ func (a *App) update(gtx layout.Context) { // validate the statefile somehow a.c = e.client a.c.Start() + a.stack.Clear(newHomePage(a)) if _, err := a.c.GetBlob("AutoConnect"); err == nil { + a.c.Online() isConnecting = true - go func() { - a.c.Online() - a.c.CreateRemoteSpool() - }() + // if the client does not already have a spool + // descriptor, prompt to create one + spool := a.c.SpoolWriteDescriptor() + if spool == nil { + a.stack.Push(newSpoolPage(a)) + } } - a.stack.Clear(newHomePage(a)) case OfflineClick: go a.c.Offline() isConnected = false isConnecting = false case OnlineClick: + go a.c.Online() isConnecting = true - go func() { - a.c.Online() - // does not replace an existing spool - a.c.CreateRemoteSpool() - }() + spool := a.c.SpoolWriteDescriptor() + if spool == nil { + a.stack.Push(newSpoolPage(a)) + } case ShowSettingsClick: a.stack.Push(newSettingsPage(a)) case AddContactClick: diff --git a/spool.go b/spool.go new file mode 100644 index 0000000..4244e55 --- /dev/null +++ b/spool.go @@ -0,0 +1,160 @@ +package main + +import ( + "gioui.org/layout" + "time" + "gioui.org/op/clip" + "gioui.org/x/notify" + "gioui.org/widget" + "sync" + "image" + "gioui.org/gesture" + "gioui.org/unit" + "gioui.org/widget/material" + "github.com/katzenpost/katzenpost/catshadow" + //"gioui.org/widget/material" +) + +type SpoolPage struct { + a *App + provider *layout.List + providerClicks map[string]*gesture.Click + connect *widget.Clickable + back *widget.Clickable + submit *widget.Clickable + once *sync.Once + errCh chan error +} + +func (p *SpoolPage) Start(stop <-chan struct{}) { + // start a goroutine that redraws the page every second + go func() { + for { + select { + case <-stop: + return + case <-time.After(time.Second): + p.a.w.Invalidate() + } + } + }() +} + +func (p *SpoolPage) Layout(gtx layout.Context) layout.Dimensions { + bg := Background{ + Color: th.Bg, + Inset: layout.Inset{}, + } + + providers, err := p.a.c.GetSpoolProviders() + return bg.Layout(gtx, func(gtx C) D { + // returns a flex consisting of the contacts list and add contact button + return layout.Flex{Axis: layout.Vertical, Alignment: layout.End}.Layout(gtx, + // topbar: Name, Add Contact, Settings + layout.Rigid(func(gtx C) D { + return layout.Flex{Axis: layout.Horizontal, Spacing: layout.SpaceBetween, Alignment: layout.Middle}.Layout( + gtx, + layout.Rigid(layoutLogo), + layout.Flexed(1, fill{th.Bg}.Layout), + func() layout.FlexChild { + if isConnected { + return layout.Rigid(button(th, p.connect, connectIcon).Layout) + } + return layout.Rigid(button(th, p.connect, disconnectIcon).Layout) + }(), + //layout.Rigid(button(th, p.showSettings, settingsIcon).Layout), + //layout.Rigid(button(th, p.addContact, addContactIcon).Layout), + ) + }), + // show list of providers + layout.Flexed(1, func(gtx C) D { + gtx.Constraints.Min.X = gtx.Dp(unit.Dp(300)) + // Display some message if not online + if err == catshadow.ErrNotOnline { + if isConnecting { + return material.Body2(th, "Welcome to Katzen. Please stand by, connecting...").Layout(gtx) + } else { + return material.Body2(th, "Welcome to Katzen. Please connect to create place to store your messages").Layout(gtx) + } + } + return p.provider.Layout(gtx, len(providers), func(gtx C, i int) layout.Dimensions { + in := layout.Inset{Top: unit.Dp(8), Bottom: unit.Dp(8), Left: unit.Dp(12), Right: unit.Dp(12)} + + // if the layout is selected, change background color + bg := Background{Inset: in} + if kb && i == selectedIdx { + bg.Color = th.ContrastBg + } else { + bg.Color = th.Bg + } + + // create a click handler for this provider + if _, ok := p.providerClicks[providers[i]]; !ok { + c := new(gesture.Click) + p.providerClicks[providers[i]] = c + } + + // attach click handler to this element + dims := bg.Layout(gtx, func(gtx C) D { + return material.Body2(th, providers[i]).Layout(gtx) + }) + a := clip.Rect(image.Rectangle{Max: dims.Size}) + t := a.Push(gtx.Ops) + p.providerClicks[providers[i]].Add(gtx.Ops) + t.Pop() + return dims + }) + }), + ) + }) +} + +func (p *SpoolPage) Event(gtx layout.Context) interface{} { + if p.back.Clicked() { + return BackEvent{} + } + if p.connect.Clicked() { + if !isConnected && !isConnecting { + return OnlineClick{} + } + return OfflineClick{} + } + for provider, click := range p.providerClicks { + for _, e := range click.Events(gtx.Queue) { + if e.Type == gesture.TypeClick { + go p.once.Do(func() { + select{ + case p.errCh <- p.a.c.CreateRemoteSpoolOn(provider): + case <-p.a.c.HaltCh(): + return + } + }) + } + } + } + select { + case e := <-p.errCh: + if e == nil { + return BackEvent{} + } else { + notify.Push("Failure", e.Error()) + p.once = new(sync.Once) + } + default: + } + + return nil +} + +func newSpoolPage(a *App) *SpoolPage { + p := &SpoolPage{} + p.provider = &layout.List{Axis: layout.Vertical} + p.back = &widget.Clickable{} + p.connect = &widget.Clickable{} + p.once = new(sync.Once) + p.errCh = make(chan error) + p.submit = &widget.Clickable{} + p.providerClicks = make(map[string]*gesture.Click) + p.a = a + return p +} From 005dff417f3945f63047ff9e3d41c89d583e3edb Mon Sep 17 00:00:00 2001 From: Masala Date: Tue, 6 Dec 2022 07:45:12 -0500 Subject: [PATCH 02/11] Only default UseTor and Autoconnect if client hasTor This applies only to setting up a new account/statefile; which has UseTor defaulted. --- setup.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/setup.go b/setup.go index 344a3a8..13b5467 100644 --- a/setup.go +++ b/setup.go @@ -108,8 +108,10 @@ func setupCatShadow(passphrase []byte, result chan interface{}) { // initialize default options if state.Blob == nil { state.Blob = make(map[string][]byte) - state.Blob["UseTor"] = []byte{1} - state.Blob["AutoConnect"] = []byte{1} + if hasTor() { + state.Blob["UseTor"] = []byte{1} + state.Blob["AutoConnect"] = []byte{1} + } } // apply any persistent settings that are needed before bootstrapping client From 6b5679f85887c9ad02110c8d9b9194fa29da803d Mon Sep 17 00:00:00 2001 From: Masala Date: Tue, 6 Dec 2022 13:14:22 -0500 Subject: [PATCH 03/11] pin to testing branch --- go.mod | 5 ++--- go.sum | 12 ++++-------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 3b3bf63..95c9d55 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,6 @@ module github.com/katzenpost/katzen go 1.19 -replace github.com/katzenpost/katzenpost => github.com/katzenpost/katzenpost v0.0.15-0.20221204005334-7624f520118a - replace gioui.org => github.com/mixmasala/gio v0.0.0-20221110164814-c517124e183a replace gioui.org/cmd => github.com/mixmasala/gio-cmd v0.0.0-20220915145538-a9fefc1d3328 @@ -13,10 +11,11 @@ require ( gioui.org/x/notify v0.0.0-20211102210401-cead9283b8ff github.com/benc-uk/gofract v0.0.0-20211012214247-47caccaf3aac github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b - github.com/katzenpost/katzenpost v0.0.14 + github.com/katzenpost/katzenpost v0.0.15-0.20221206173037-0e69a16ffc75 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e golang.org/x/exp/shiny v0.0.0-20220827204233-334a2380cb91 golang.org/x/image v0.0.0-20220722155232-062f8c9fd539 + golang.org/x/term v0.1.0 ) require ( diff --git a/go.sum b/go.sum index 36a106d..2ea31d5 100644 --- a/go.sum +++ b/go.sum @@ -82,14 +82,8 @@ github.com/katzenpost/chacha20poly1305 v0.0.0-20211026103954-7b6fb2fc0129 h1:BkX github.com/katzenpost/chacha20poly1305 v0.0.0-20211026103954-7b6fb2fc0129/go.mod h1:moU3dWG1uk4xayUNdUPs2Q3dx2Zsk5i9Ysfx+ujQrwM= github.com/katzenpost/doubleratchet v0.0.13 h1:XKm142nPgp9o7QGbJHs8o6udDSAQaaZ1BZGm63fZz4Y= github.com/katzenpost/doubleratchet v0.0.13/go.mod h1:1btKAEHf4Af7xY/SCooy5xMKE8hYWxtfaAdvzMqwGz0= -github.com/katzenpost/katzenpost v0.0.14-0.20221129022821-6c4934584f96 h1:UEAeAsnwhrAA9vCi+WPCCp1xQO2yH99Cz+rAQKjnDsI= -github.com/katzenpost/katzenpost v0.0.14-0.20221129022821-6c4934584f96/go.mod h1:GPm9MYwMeDyuv36vrp6pvZRaal/gZ10eEk2jGaD4Q+k= -github.com/katzenpost/katzenpost v0.0.14-0.20221129023638-4fccb4b91982 h1:huHSqJ2SBMsLFMzBoSRWse60DvNfsShZ73LTVb2kxcc= -github.com/katzenpost/katzenpost v0.0.14-0.20221129023638-4fccb4b91982/go.mod h1:GPm9MYwMeDyuv36vrp6pvZRaal/gZ10eEk2jGaD4Q+k= -github.com/katzenpost/katzenpost v0.0.15-0.20221203172132-7d58740345d7 h1:+u2jZbB7+di19FSCyGP3R/JumuddKMdiZpKmc5oXFO0= -github.com/katzenpost/katzenpost v0.0.15-0.20221203172132-7d58740345d7/go.mod h1:GPm9MYwMeDyuv36vrp6pvZRaal/gZ10eEk2jGaD4Q+k= -github.com/katzenpost/katzenpost v0.0.15-0.20221204005334-7624f520118a h1:bBv52gyF6UXeTGVw//YUS6Hk4JnmvbfBNlKEPz8PPxg= -github.com/katzenpost/katzenpost v0.0.15-0.20221204005334-7624f520118a/go.mod h1:GPm9MYwMeDyuv36vrp6pvZRaal/gZ10eEk2jGaD4Q+k= +github.com/katzenpost/katzenpost v0.0.15-0.20221206173037-0e69a16ffc75 h1:ViVLGuT9Zl1wcLLyE8WbuvhBR3d0Z1BLWs+XeVt+SgY= +github.com/katzenpost/katzenpost v0.0.15-0.20221206173037-0e69a16ffc75/go.mod h1:GPm9MYwMeDyuv36vrp6pvZRaal/gZ10eEk2jGaD4Q+k= github.com/katzenpost/noise v0.0.3 h1:bpYnozkk8j0XE1FAX9iRYgKtfIywuAINF+vMdBOidrM= github.com/katzenpost/nyquist v0.0.0-20220905145943-9f7e8b431eaf h1:iTvu+cdByoEzF1Hatwbl8AoFfTEB2ZITE2FOeJUyz78= github.com/katzenpost/nyquist v0.0.0-20220905145943-9f7e8b431eaf/go.mod h1:wzbXAL9lcBAiryER2XStcCww3HGTKl7jjzf2BCgHWrI= @@ -198,6 +192,8 @@ golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw= +golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= From 1d4a18b23b4c5c835d5de2ed6752e73d8d30d40b Mon Sep 17 00:00:00 2001 From: Masala Date: Tue, 6 Dec 2022 14:01:56 -0500 Subject: [PATCH 04/11] add testdata config for local testing --- testdata/catshadow.toml | 187 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 187 insertions(+) create mode 100644 testdata/catshadow.toml diff --git a/testdata/catshadow.toml b/testdata/catshadow.toml new file mode 100644 index 0000000..3a3205e --- /dev/null +++ b/testdata/catshadow.toml @@ -0,0 +1,187 @@ +# SPDX-FileCopyrightText: 2020, David Stainton +# SPDX-License-Identifier: AGPL-3.0-or-later +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# + +DataDir = "./testdata/" + +[UpstreamProxy] + Type = "none" + +[Logging] + Disable = false + Level = "DEBUG" + File = "" + +[Debug] + DisableDecoyTraffic = true + +#[NonvotingAuthority] +# Address = "127.0.0.1:29483" +# LinkPublicKeyPem = """ +#-----BEGIN Kyber768-X25519 PUBLIC KEY----- +#+WOSbmi5nJWBFx/FePcx+46MindcROtr7mMuS5aJE0r2Z6mIXASEOc5hASZZ4SDs +#lRU1URiBoKQRFRM0UmzgJjpUMhm4miM0ShCwJEEV1RWW5AF+1RlHa2PC7En5gI4O +#prOWNZdhIYp89FMTxIHGYkGD0raREhJisDHmyWvr+jl4qx53a5vIygrCyM3AK4Sp +#M1vB15jzFwRSS4JiM0ooc8vla0FIgR09JYXrE8y+zCw/8a7qcEM/6iNHeCzVsw7S +#WYC1+Jc4h6CRkHXRNaohCRtSFJ4MeBYdqp5bVmtgh5CXtSi74V368D6kG2mHwVHJ +#+Af3WopXkbduM4RiBBen+3s0ZRkH0MSNtzVfdZ332my1xwXVa8Z4C7mWjGRhkULM +#uybp2IFvZB59oSnqzCbTgcf+Klnvy2isIg+OAJ+7u4wtYoWd1TTDogYNpj+COzhs +#xhdjA4PWN1QkxnO3QaUfIh7OvHjtypQ3qMbX1C1d1bhK0SekJwutKSFFMHJuNTLQ +#iqtKEjAnm1FQV8rBA7TqZHHQEFOVRSrJhYiZBSMpJX5qgxhvFjhJ0YHmaw5WxaDl +#K3hXw4GIW691YSeOGCWUYVEmy6+1w48ciKzLhKd7ab5XcU9WKidQIYKuxmRC1Y9c +#YQlYQ2Qew64vOo4naz3Xt8dViGq3MrLIp8pN10ZNaZpBecWpU8hruof3iDfVgijU +#pMCCIAFk1J894H0sdgCVdMmYZy0FM1KZSkKh5cAtusIzJ7YomZuzsEmvJ7UZdJTY +#FS6BEBQLAw0t+UTdmFeABpovJhB890/rQQDYGSqZo3954AdrU8aFYj9hRwax/KvL +#8lqpuQCORpDo0k7RF1XEF2i9Zwmbx2VZGnrtyWV8JZzyo61GrF4ydCx0qU0ZWWhB +#/CsnF6iytyOUtAcvMTGuO5rRAcnusblV6JQ+NLC6icHFd4MDpw9zBCrX4AZQWnGl +#VoyCTM7dCnBLtUmhdqZX82HvlSO8xZrc3IEkQImA2qRxtJjv0VugSB8W941JYo9w +#zGFofH5qdm2xqx31ya3zWZ2aEk8GkslSpMteU8nEs7GhS5Y7kQtvSEjIhrzfMi3A +#WT5tyFRzeIWww2sspF5s2m3JxYu+15zLV0oRHI8KxmEK+HorShLHZnGazDO/BxFH +#oJc7YyTt+U54NSnL4XhieSkoJ1NwTFLQcGhvcjFuNTGdc1Db2mEWS68DBXvHhmy7 +#qnsVEyowzHtCfKNHqcJIsmIO9jHiBHZ7B7f7GsUMpGlzBjQI3B5Z1XYgQVcTlX/k +#MW3W0Ih4DFFkBJ3X5RR7gskjdnxHqjrfmRLMlTqa/BdAlTZc3F6Y11jqCKzZxT/c +#pyAyWDOYyT9jkmQ5kABVsi5QkXo2YWg8ihklmbskFhYliU3NxWfra0SZDHIWERCa +#qUcdy8ySAEtRrJIN2KgpZHoRxW9SC8WJ+BNg1kKxtAw3oiSkgV3PNaEwjCp1iqth +#BSQKkgoVKEZYJzU6usiderfdGZfQUmp/oA5EGhgVp7O5yXfauHKGay++YMFFs4W7 +#rJoEjFXoChJF5xWicIVxi0F3k6KTZYTCus+SlMJkVLFwmf9Ui+rDIqVwJ1C6tzKm +#7pZc295vLdQ4w4gOVmGd9w== +#-----END Kyber768-X25519 PUBLIC KEY----- +# """ +# IdentityPublicKeyPem = """ +#-----BEGIN ED25519 SPHINCS+ PUBLIC KEY----- +#3zXGXWKZeW7cgLRKZPeF73Yi0+J+BtEzfoHM1SXMqdB30p0iAy1JDzaLWPOdAJNq +#jWmeAbCVBJkDkRtdzghri6me5ZgEwQ3tr/OVK2Podxl3dIKP+riONi3po+D57ryg +#-----END ED25519 SPHINCS+ PUBLIC KEY----- +#""" + + +[VotingAuthority] + [[VotingAuthority.Peers]] + Addresses = ["127.0.0.1:21483"] + LinkPublicKeyPem = """ +-----BEGIN Kyber768-X25519 PUBLIC KEY----- ++WOSbmi5nJWBFx/FePcx+46MindcROtr7mMuS5aJE0r2Z6mIXASEOc5hASZZ4SDs +lRU1URiBoKQRFRM0UmzgJjpUMhm4miM0ShCwJEEV1RWW5AF+1RlHa2PC7En5gI4O +prOWNZdhIYp89FMTxIHGYkGD0raREhJisDHmyWvr+jl4qx53a5vIygrCyM3AK4Sp +M1vB15jzFwRSS4JiM0ooc8vla0FIgR09JYXrE8y+zCw/8a7qcEM/6iNHeCzVsw7S +WYC1+Jc4h6CRkHXRNaohCRtSFJ4MeBYdqp5bVmtgh5CXtSi74V368D6kG2mHwVHJ ++Af3WopXkbduM4RiBBen+3s0ZRkH0MSNtzVfdZ332my1xwXVa8Z4C7mWjGRhkULM +uybp2IFvZB59oSnqzCbTgcf+Klnvy2isIg+OAJ+7u4wtYoWd1TTDogYNpj+COzhs +xhdjA4PWN1QkxnO3QaUfIh7OvHjtypQ3qMbX1C1d1bhK0SekJwutKSFFMHJuNTLQ +iqtKEjAnm1FQV8rBA7TqZHHQEFOVRSrJhYiZBSMpJX5qgxhvFjhJ0YHmaw5WxaDl +K3hXw4GIW691YSeOGCWUYVEmy6+1w48ciKzLhKd7ab5XcU9WKidQIYKuxmRC1Y9c +YQlYQ2Qew64vOo4naz3Xt8dViGq3MrLIp8pN10ZNaZpBecWpU8hruof3iDfVgijU +pMCCIAFk1J894H0sdgCVdMmYZy0FM1KZSkKh5cAtusIzJ7YomZuzsEmvJ7UZdJTY +FS6BEBQLAw0t+UTdmFeABpovJhB890/rQQDYGSqZo3954AdrU8aFYj9hRwax/KvL +8lqpuQCORpDo0k7RF1XEF2i9Zwmbx2VZGnrtyWV8JZzyo61GrF4ydCx0qU0ZWWhB +/CsnF6iytyOUtAcvMTGuO5rRAcnusblV6JQ+NLC6icHFd4MDpw9zBCrX4AZQWnGl +VoyCTM7dCnBLtUmhdqZX82HvlSO8xZrc3IEkQImA2qRxtJjv0VugSB8W941JYo9w +zGFofH5qdm2xqx31ya3zWZ2aEk8GkslSpMteU8nEs7GhS5Y7kQtvSEjIhrzfMi3A +WT5tyFRzeIWww2sspF5s2m3JxYu+15zLV0oRHI8KxmEK+HorShLHZnGazDO/BxFH +oJc7YyTt+U54NSnL4XhieSkoJ1NwTFLQcGhvcjFuNTGdc1Db2mEWS68DBXvHhmy7 +qnsVEyowzHtCfKNHqcJIsmIO9jHiBHZ7B7f7GsUMpGlzBjQI3B5Z1XYgQVcTlX/k +MW3W0Ih4DFFkBJ3X5RR7gskjdnxHqjrfmRLMlTqa/BdAlTZc3F6Y11jqCKzZxT/c +pyAyWDOYyT9jkmQ5kABVsi5QkXo2YWg8ihklmbskFhYliU3NxWfra0SZDHIWERCa +qUcdy8ySAEtRrJIN2KgpZHoRxW9SC8WJ+BNg1kKxtAw3oiSkgV3PNaEwjCp1iqth +BSQKkgoVKEZYJzU6usiderfdGZfQUmp/oA5EGhgVp7O5yXfauHKGay++YMFFs4W7 +rJoEjFXoChJF5xWicIVxi0F3k6KTZYTCus+SlMJkVLFwmf9Ui+rDIqVwJ1C6tzKm +7pZc295vLdQ4w4gOVmGd9w== +-----END Kyber768-X25519 PUBLIC KEY----- +""" + IdentityPublicKeyPem = """ +-----BEGIN ED25519 SPHINCS+ PUBLIC KEY----- +3zXGXWKZeW7cgLRKZPeF73Yi0+J+BtEzfoHM1SXMqdB30p0iAy1JDzaLWPOdAJNq +jWmeAbCVBJkDkRtdzghri6me5ZgEwQ3tr/OVK2Podxl3dIKP+riONi3po+D57ryg +-----END ED25519 SPHINCS+ PUBLIC KEY----- +""" + + [[VotingAuthority.Peers]] + Addresses = ["127.0.0.1:22483"] + LinkPublicKeyPem = """ +-----BEGIN Kyber768-X25519 PUBLIC KEY----- +XB8eD5IHOJQB8gJWTKCYAuu4rqxCf+wgKmI1VSYUJRzGu8GKIotwOXC+8zVlCpKm +8rtzdZ4hKbnO6ZrK671Fqk2xl3vyi7Ov0q6fXA7eq5yDQ435VS+MAbQRhqeQ2lq9 +2L2gB2BLRA4QxM8p93UJWXOwlciABFZkuJx+DKWlajgItBg1eMoggyHYmKqGomOs +GMVgxCqV2jm80MAXq7+hiJqP8cP1KrUQHJeKamYLbJt3t8f4EQHQJ77vcFODPLr6 +mykKUq21gaEqYlGKBJ6MRia5ITtrhwzpISfgoCTXqJJ04ke3II7XXJDYgne/Ciy5 +UwMkdM57AQ5xm8flyLYBpZoUHDdOgpgFOcM6kYCo05wRhM291CpuCX2bEqK34VxV +qq4qdwj3VGXhejA56pim6IT93Mgv9DA8S5aP1hYSqqSdd4jx8TBubAurTCtzVIfY +1Q8jcX1LCVFvS4h7p2Tvuiv94znxVUAtKA+XpCrLKVGaqJzWuVW7pna2ZBlsBqaZ +ay/n1lvyhFkSVxV/k449m8mncDZJylWfaihrGB93kVlnwmHa+HOMl8liimmqWXQo +08YwAnM2hwpC5r98ULOYq6DOk6jIyR2Wmxm6bCI914WgZoHaAghAgHzm5CrDULVi +VTb9y22xdaTvurZqTJu7NrxCoY5WioxbBYgCLE/JNxkVnMs/4pWkeh7Lp7FstM/V +ZgeHyWukGBwu7HWb87p99j9oKTTU5HkPcq/YR5CjNDnyka6Nx0pOsZzM5b7VghOH +02y5pijLqXcNF5Ev9c/HOiS3oJrguxKw4I178oLbtw0Qg0DjUJMTdZDUkC9/ElxZ +YGhbVFOyfJS1smawe8uia5I/tmyM6g+gO3TpqAp6xjGHOQvC+CHmKWL2ZYh0AhD5 +YAI8qzBDl7Rk2i8LM3o5LB0sV1aqmqVMzGlhbIx4YjN11wC/sUnAGAKcYrJuRZXR +mQRWs5qZObvL1o2+qVDl5yBY8alcIJCsGD3G2nAWA7ZmkFyreqjaKEDERJVQMxIj +m7a8qa1G+KBvLIetCnk0Krfyuwr4+19V0V/3UTp4cnkO6zGE2cUX11KSAsWCu1ge +VQ3NGhRvt1ERi8zUdpOiM18sQ5gsa5Y9l1bOgoqqCwSoqAG94bCE6m1bSma3wCZB +aKCr/ElimoJxsEvm6LcGEmBzO4PTWwX1tTtxRs7oJGldeQ4eir0N+8QnYZMudUF7 +gcLnZUa20aSb1ANKgMe8xRdsYII9wnClubSgCpqUCcy5u46HhLTZSXfsRKRZ1Ty6 +NK6+uEpEiXAA6wQcy5wlg1q8WIcDcFTNpnYsyDSOd8xDG06kvFYpdiNTZleI0Ecs +DItdZYMn3LUW+TrwisixXFSQG5/u4ncHBQkZZJmeiYcx4UrIY22oh1MQpa/UmLNZ +0VM/ljeZUkeHGxa+KEh5JjeTEWDRjCvr2k1h8CwlFTGdJVCCGJ6uh4j1R6cCtnwC +6JkkpMTi4wJGY5OiqMBeGINHKo5HKsOmcXbko7vumGSCiSKSdMtyqjH9WYLqIqz2 +3HvPpgKqxwhquoxU55Yvyod9lsyX3M3HeLxuNiyKtnc4mYyvLW04epdxqPgJqIpi +TJ7QlleBWMH03LJsY2uokw== +-----END Kyber768-X25519 PUBLIC KEY----- +""" + IdentityPublicKeyPem = """ +-----BEGIN ED25519 SPHINCS+ PUBLIC KEY----- +hgEs8udDDyojLLqsURI0HIl1kgoue5MSmHPWw1g4TFgcLQ36HIGdlJfl4CoAHzOr +bxm4u7dz+tD35hAvs54V9Jrmo2yjWMzJQeT7QgHmmoWyH/O5pk6mHEsrQnHe9baY +-----END ED25519 SPHINCS+ PUBLIC KEY----- +""" + + [[VotingAuthority.Peers]] + Addresses = ["127.0.0.1:23483"] + LinkPublicKeyPem = """ +-----BEGIN Kyber768-X25519 PUBLIC KEY----- +xYaM/pX6HwZsFqbpwDU9JYcQ6KSj3YD5lfpHgE7BOhVr1C2eincbO8eyCk/k1oWG +KcbWFGp6Gjic6ytaxgnvWVpq+beNIT1PXCk8XKhe57/hAbfCAY3rrJpFoLvciD+E +hZhiMFW4KEMWdBPyuCLPSS9/0YdJ6YPH4cHnWMC2mVcqVW1p+60lkVtSxhrY6j2I +FHa740djW2Abw1SFA1N8iDb1Mc+2Yokny2y0IjeANLLWaE0zxMqYJao1i7fxSb3K +hoXLYH23lJlwcqFcusqCERyUi7RM2XffhMcbw1GcYkgLnBvuBU2iMA/dG8hrDGhL +CTDgsm9qIwV6wzGZpIf5hEha4BrAKU9O4Wmepjvm1oG14GtqRRMZNopi1G7ne1rH +u71l6r/tqJF8q2220SA2AVHV85TbZyF1WyN0QzFRtLD/cRet8ER+gzJwdihh2hVQ +6LKmGTq+Y4p4B1MTwYUIAAQeIbd/iI7HezvYSmGoALtxwXpO4EGv/EbweyBrFcdy +ZGfphQErx5X12Jh4OaQGTJds0xFQ1SGNmGHoGXSQfLtlIzRNqkNWsrElK1ICEIeS +ULnRVbcyEMICA4aMzE3MCK/8BKzKwCis80uTLALy+KvoVE/kiIXo6R5We1CB6w/w +0aUwEh0rBRAVcAvhUT17vBsCA7mtQH/AY2Uq7EBdtn23cZhjSDIRi3raBh+8CMA5 +Q2W9h76BuUvlCgqZwxb30pB6tp+WdaEDe7v/8sXD4xVmEXt/Ix8k+A+prBnyQqL1 +c0WciZ6zO2RKpW71cIfG5UcFOGWpxZApOzMKN4hpcXVDOMPK0VCNNakKaHLYyzHj +PM7LIU+5t6JuWTzrrKaaeMvUE51jMz84oC0DwsxTfFduE1XSY1AbkykgHK2JB67A +RrkhtMIAaaJ68sL4pmOX6Rw4Fcss0kO4dyHSKZ2kuLy0c8dJ7GROozDkkG2jhs4r +ZVGwRQNLehJhcF71E6PtcjPdpDz26rJdxgUfdHlJsI/KK655JGXHPFR67BAmVXRW +Moy+an9NhhWjcAqylpeT+JLOlcM8/AbNk3cILEYG8gwa6hX3t7EOt60PG30WiL2N +mr/CymJzmGR491B2QyzIlY1ceHjN4z0nSLGnEnh0C3alJziGSjKa0j1O463SvC8b +yz1sGjWmGHlZSxHJ/LZ2lBij8TvxHHFiy4YVezvMkb5k47+Oth05dhWRIq1ZysO4 +ggPlJleRuk/e2jT8tDIp/DIg/DbKE5kJGrO6WI3sEJrTgpgx9gYxwsXvrDgt93ks +Fm0nw3k1cmICFnKcgjRLuxbEe2jPExmtNrijFwW7ogY0ayMba6Nq+pWXCRW9BHSe +UH44g7l5UYBBQUTIs42DkVutIcnYo8rK2aDU5RWtQVB3lVrEFyOe5J5je0W1wwuA +STA6PMW48AyPesdH8L3H4gZ7a5QMmcQgqJfvJntDtqvyc5ejSlC9nHsX2ySViX1y +UyxYvARTV5E7omL0o80wabnatX1kpUsk0LDMiYYSsbXwpmEl+Xfd4y00WLkpHCdS +canqB2SXsVTgcF6mDE054jd5NHu4om+DikAkiijippO2WfVKXjyk3KkU/6+7tWun +J36qY23I6qGScGjq4tPu3w== +-----END Kyber768-X25519 PUBLIC KEY----- +""" + IdentityPublicKeyPem = """ +-----BEGIN ED25519 SPHINCS+ PUBLIC KEY----- +F9mrgVb9WMGRl6XvHQcMFBVa5zLXdUxlRRDSsG9ZdQwrSCz4tPwiMhn+eFSjdOk1 +1vr7lFe3GYwSFA3xy9IDSzyKS2cDWT45FOiiOQqWMBmAI0MEma81dwkTb77a7cd1 +-----END ED25519 SPHINCS+ PUBLIC KEY----- +""" From 8ec69654af7ebedd0c6ff52612492c3c8afd16fd Mon Sep 17 00:00:00 2001 From: Masala Date: Tue, 6 Dec 2022 14:37:56 -0500 Subject: [PATCH 05/11] Add warped flag to Makefile --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 371164e..f9a2a1f 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,14 @@ docker := $(shell if which podman|grep -q .; then echo podman; else echo docker; fi) +warped?=false +ldflags=-buildid= -X github.com/katzenpost/katzenpost/core/epochtime.WarpedEpoch=${warped} -X github.com/katzenpost/katzenpost/server/internal/pki.WarpedEpoch=${warped} -X github.com/katzenpost/katzenpost/minclient/pki.WarpedEpoch=${warped} KEYSTORE := sign.keystore KEYPASS := password docker-build-linux: docker-go-mod - $(docker) run --rm -v "$(shell readlink -f .)":/go/katzen/ katzen/go_mod bash -c 'cd /go/katzen/; CGO_CFLAGS_ALLOW="-DPARAMS=sphincs-shake-256f" go build -trimpath -ldflags=-buildid=' + $(docker) run --rm -v "$(shell readlink -f .)":/go/katzen/ katzen/go_mod bash -c 'cd /go/katzen/; CGO_CFLAGS_ALLOW="-DPARAMS=sphincs-shake-256f" go build -trimpath -ldflags="${ldflags}"' docker-build-windows: docker-go-mod - $(docker) run --rm -v "$(shell readlink -f .)":/go/katzen/ katzen/go_mod bash -c 'cd /go/katzen/; GOOS=windows CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc CGO_CFLAGS_ALLOW="-DPARAMS=sphincs-shake-256f" go build -trimpath -ldflags="-H windowsgui -buildid=" -o katzen.exe' + $(docker) run --rm -v "$(shell readlink -f .)":/go/katzen/ katzen/go_mod bash -c 'cd /go/katzen/; GOOS=windows CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc CGO_CFLAGS_ALLOW="-DPARAMS=sphincs-shake-256f" go build -trimpath -ldflags="-H windowsgui ${ldflags}" -o katzen.exe' docker-android-base: if ! $(docker) images|grep katzen/android_sdk; then \ From 21153e2509826fb696644a938368dd1311370fc0 Mon Sep 17 00:00:00 2001 From: Masala Date: Tue, 6 Dec 2022 15:40:32 -0500 Subject: [PATCH 06/11] tweak spool creation UX --- spool.go | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/spool.go b/spool.go index 4244e55..3a1d0ad 100644 --- a/spool.go +++ b/spool.go @@ -20,6 +20,7 @@ type SpoolPage struct { provider *layout.List providerClicks map[string]*gesture.Click connect *widget.Clickable + settings *widget.Clickable back *widget.Clickable submit *widget.Clickable once *sync.Once @@ -62,20 +63,27 @@ func (p *SpoolPage) Layout(gtx layout.Context) layout.Dimensions { } return layout.Rigid(button(th, p.connect, disconnectIcon).Layout) }(), - //layout.Rigid(button(th, p.showSettings, settingsIcon).Layout), + layout.Rigid(button(th, p.settings, settingsIcon).Layout), //layout.Rigid(button(th, p.addContact, addContactIcon).Layout), ) }), + // Add a caption + layout.Rigid(func(gtx C) D { + if err == catshadow.ErrNotOnline { + return material.Body2(th, "Welcome to Katzen. Please connect to choose a message storage provider").Layout(gtx) + } + if isConnecting { + return material.Body2(th, "Connecting...").Layout(gtx) + } + return material.Body2(th, "Please choose a message storage provider").Layout(gtx) + }), + // show list of providers layout.Flexed(1, func(gtx C) D { gtx.Constraints.Min.X = gtx.Dp(unit.Dp(300)) - // Display some message if not online - if err == catshadow.ErrNotOnline { - if isConnecting { - return material.Body2(th, "Welcome to Katzen. Please stand by, connecting...").Layout(gtx) - } else { - return material.Body2(th, "Welcome to Katzen. Please connect to create place to store your messages").Layout(gtx) - } + // skip the provider list if there was an error + if err != nil { + return layout.Dimensions{} } return p.provider.Layout(gtx, len(providers), func(gtx C, i int) layout.Dimensions { in := layout.Inset{Top: unit.Dp(8), Bottom: unit.Dp(8), Left: unit.Dp(12), Right: unit.Dp(12)} @@ -119,6 +127,9 @@ func (p *SpoolPage) Event(gtx layout.Context) interface{} { } return OfflineClick{} } + if p.settings.Clicked() { + return ShowSettingsClick{} + } for provider, click := range p.providerClicks { for _, e := range click.Events(gtx.Queue) { if e.Type == gesture.TypeClick { @@ -135,6 +146,7 @@ func (p *SpoolPage) Event(gtx layout.Context) interface{} { select { case e := <-p.errCh: if e == nil { + notify.Push("Success", "Katzen created a spool") return BackEvent{} } else { notify.Push("Failure", e.Error()) @@ -151,6 +163,7 @@ func newSpoolPage(a *App) *SpoolPage { p.provider = &layout.List{Axis: layout.Vertical} p.back = &widget.Clickable{} p.connect = &widget.Clickable{} + p.settings = &widget.Clickable{} p.once = new(sync.Once) p.errCh = make(chan error) p.submit = &widget.Clickable{} From 49eb0b213f79f45f8cd69f8c130881c655f84b7e Mon Sep 17 00:00:00 2001 From: Masala Date: Thu, 22 Dec 2022 21:12:01 +0000 Subject: [PATCH 07/11] update keys --- default_config_with_tor.toml | 229 +++++++++++++++++++------------- default_config_without_tor.toml | 229 +++++++++++++++++++------------- go.mod | 2 +- testdata/catshadow.toml | 2 +- 4 files changed, 269 insertions(+), 193 deletions(-) diff --git a/default_config_with_tor.toml b/default_config_with_tor.toml index 84ac3ad..587279c 100644 --- a/default_config_with_tor.toml +++ b/default_config_with_tor.toml @@ -8,55 +8,20 @@ Level = "DEBUG" File = "" -[VotingAuthority] -[[VotingAuthority.Peers]] - Addresses = ["65.108.220.173:40000", "[2a01:4f9:c011:4e7b::1]:40000" ] # nurtria - IdentityPublicKeyPem = """ ------BEGIN ED25519 SPHINCS+ PUBLIC KEY----- -TUchIOZ98fc7UABosstqDlRN7aRQtKk/NTeVkhoNdSI62g883BupqMBY2RafKJfS -l2WZdf75HCsxMigPJwQhB64HD8i+cg2VgLF0ndZh703HnNjiv1EH+2Z2uYH3El6Z ------END ED25519 SPHINCS+ PUBLIC KEY----- -""" - LinkPublicKeyPem = """ ------BEGIN KYBER768-X25519 PUBLIC KEY----- -eoRieDZr+HV4lqUcEtLRUzJKQ0anel3dEsm737d0TwW3l6zwsMDm8kaW7BuwRT4d -53Bs98rpgGxrvMWFagQdHE9jnITJ02m3I4GJwJJQgj2pZ4py0ckBK3/cdKXK6FVU -KZtuywueUKCLci2RGD6/GRYDdJV5yplQs58kBDAgSaUFY2d6VCnaSrdP1UnVmiWB -lJitY76X6yjqN6LeApTdGR0CTLGdZa9tBh466bWXtXcnap1GCTCR4YR2GQzo2Wdp -GkmLcydO+Q+cEJXYd3Mg5mA7ZbCFpBF8kUfiSlxySaVppMtmc7qozElDI2lMCFcf -YTtXtYqB4lh/gSK5EU/p4rzJc04MKG4Wk0gfo7ofOlbdsZc8eT+SUxcr0JA35iy+ -mTCiS4Il8BxgRKxGFa0dOEGaqrbVZRZJ2IsdBqwAiZa5m51v6iieCS7jlFcIFkaJ -I8O+a0mZZ5p2V2NeEbRht4RUcbOajDm4dySwaQEa5jTS9HLPQc6l1z5RtzuZvE1u -E1YjdwGDi5sfc3ZhFqUNDDgLOHPmBptLyV8lSGk3u2LUMgudBkP/DKx+kUHhFjUs -ljjVCiRiRn3RSmwZ0jjTwrnCkRfpKKn3Sro/MlWkkqK+9kn4YR2397gqkpqOczJa -SoHhND6BELcJGBRlSl8iOD8i7J5beaoyNKgWbElzE4xfrGUNRoLFCjdXBZkeWDhL -HJYgoVPHGwOoPC6mtWGjFRGoeqJth4SvdBKiECwol0+6QJGHtIx8DIabA2m7nDoI -gEgOU8XL12pIKzIMbLik4SEBnLg3uH9D5mm/oyBTmUSud7+rRLekcK4bqGuH427K -EJ50Nsy71DVju4dWpsS9MshU160xoGwfFAUb8LfCmsgQiZQjGJ0DqcFeOqC/GpUM -uMoEQyQlkrLuMp5y66+xQai567CoksxdxnngjBFOipkToS0eIBVnk8DmSs4qg2pS -Rb2gmUusTGUsN2iAWMFVdAOCxWDbUJ8thLhEaRVyJj4cqTcyoX7v0Q5AWEY9CplN -GDZSmrU2liIGNj+kyUGeAgKWFKi69YNMqH8Ax6TmuaGe40fZ7IoVCxk+WUZnJTof -AHZjk0vzOQ5QMr81ODV0smlJJbJg2HGoBamIbDdLFldgU8HsgG066IJK4Z1+ZxYc -xJ0+CDrayFENQIc32VABibnxsgU/FokhIHcIfG2UtjO0lhaQelTOkj9BTMPjpJ+s -IGjM0II9SYBtqGH5lxikfKlmohgIWc/EVqIHSLCZg7mnFjdUY0BTeyAJGiX5ZCSp -KsgdAIp8ML9J+mySyM+DPLgheBClRApT2xZ+bAzcYosShiFuqnmu+2mFSLGr9lkv -5SboAL8/ZIXQ11zMJ34uqieq0W2UpYkf+m6+e5j8swAdyhKlFR0jmRNfhpKc+cvB -qmE71M5dRKqpyZZBVULpMnSBwVtvyrfJQDABO7TreVMmcjF6hQjiSj4I6F/44AjX -J5+teBYtVEqWuIq6FkbZAXKd8nv1psIJ9Y3DqDTT3LMztlrF8X/GclTeMXn32A3U -Zr/rFB4vmUBVk6N9dA8cBhyGIW8tQ8O17LyE4hXtWjvmEbFffh8Si1kegPKObPTS -xKymaSdIB5pbFkGCV1C0ew== ------END KYBER768-X25519 PUBLIC KEY----- -""" +[Debug] + DisableDecoyTraffic = false + PreferedTransports = ["onion"] -[[VotingAuthority.Peers]] - Addresses = ["131.155.69.135:65534"] # annares - IdentityPublicKeyPem = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY----- +[VotingAuthority] + [[VotingAuthority.Peers]] +# annares +Addresses = ["131.155.69.135:65534"] +IdentityPublicKey = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY----- /fjoRTnyDITTtD1ialtNWSzfTp9Vd47kEUa7sc3LM2I+PRgv+JbeuaLpEbJLfAoR K1Q/TqWuvrUThx2FvnRDMIQtUnlAUleZT/ScJJ2av9Qh0gx8v2yZG0TuqpCiJmY0 -----END ED25519 SPHINCS+ PUBLIC KEY----- """ - LinkPublicKeyPem = """ ------BEGIN KYBER768-X25519 PUBLIC KEY----- +LinkPublicKey = """-----BEGIN KYBER768-X25519 PUBLIC KEY----- 7NNX023odnDnPM5oB9jR+A6onG4Af3hfU+pjtu2j3Sm8jCR3R5ct9JYSw2H8VcLB lj+k9Jb+I2MmhzT0gCK/yYbWC1R7UjZqlKJLtXZFjA3TuIX4wHfXUpn9+HUSA4hz Bn1v8RALFg5kJrmxSK/5BJQIoSoDUCVdoF4Rp5dhEFpXolqscI2T1lY9Kp+jgSZ2 @@ -86,53 +51,15 @@ hm8ySnLAh52a0CsVDKFgYWY6MGJRupt0aiQXIzCZQUdgWsE6AnxHzBgHsAhemrhG -----END KYBER768-X25519 PUBLIC KEY----- """ -[[VotingAuthority.Peers]] - Addresses = ["74.50.67.182:40002"] # windfall - # from windfall_auth_id_pub_key.pem" - IdentityPublicKeyPem = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY----- -WuNRfvRM/WvVoAQ3OD5Sa+ljFNtRcHnTfERaQErvkSo34orbrib6Wf26e9A/dRDP -bP4+L0UWhgw7z1vGyGi7/zE38pM1hRW/tDoBe6tzTMq/sBEkYs+WbFG28SJGB9kV ------END ED25519 SPHINCS+ PUBLIC KEY----- -""" - # from windfall_auth_link_pub_key.pem - LinkPublicKeyPem = """-----BEGIN KYBER768-X25519 PUBLIC KEY----- -vJgHIVIwd6u6IpN8y8KLf8wlUXS2D8pMsQiJ1dAuKRQsk4yF0lk1qS2PmCNG4iL5 -V64qWAO/HFGxlijtwIwEZ1X4sMAp+XTbK3bXBL2sVsv/JcMN+c6k8rSIccYOZTGA -bFyLtFfnNLZOWsIqmTmK1lIYxDOz+rvvU3ZMwZTKF0vgbEl0eGLrM44XAAEyFbLV -iK03B5Qla3BsV2nS2g8bNbAu9b3vEBLCI4+QF3y28HGa+VGQGxXbrEpy8pHzMH8Q -mnZOeHCMxBM7FGMfpq0elGKydr1AkWxR2rnZBQQ3ISRgCFdeIEypa2t5xYX/t63X -VVhHhFe/3AzBFWOpdS1IATm7051umBh3qIM/9FHbg5RZay/N5HfnAwqE47U2VD0q -cznXEJvQEGzGhRHwHBDXYZBqB7b/gRCiClYrcVpJNhOVFs88YaTNbJY30SQ2FbeQ -ODVBSmsfYIw8tBM8mreNHFgJtIjSBEF9qCweVoweqq4UwCX0FYY7FL9bGaFdmU1H -WkuYJCkN4gey22R2sIyjuo4BYxGX57DXERYQiCuS2cSI1zaKwkIP9CRvURxoqxY+ -Rxwx9ken/HWSAUuLhcmmVM2mw3XkyCMqxia661xoNUc+Sws85RvDmsJzBAH7NHIC -d8o0zHOZYkTyAQu8Nc4CtsHUo5FJYh/v6b46555QOmRTE5KraietpFYl+ApgMVUR -MGCcuMX5nIg8RmwBZ8Dde2rJu75tMXspS7tjOWcZpUbP7IC9gRgrVVDvgn6JUTif -QUSK8TMCQb9xHBstMDh2QWJovGQ7KMG0ijS3hMg+tTWNcgxpizQbwTqO9DW39cuD -WikAS81ZIp1eGhHc4z7SV19vGDTscsBKSZpjSK0pOi+jZrbs2hSKASvIXJ0fTCCe -Kqw4doCTGJ2v1hASWSW2vDP+IVNd6SEXNwx2VltiyrpDS68t14x2cogsF1rdqBm+ -I3Dpl1hvCzZ7d5+LgVcbd4Wltm04Gba2eHSZmpc32a7tXIbsOj08d4+ImVmzlV3f -KR5ktbBo4K8AJmU9WCW7x7iKpYOYxhYq0AW+IHM0TLmZYnhli0ViuGAqCbgrapHB -BWZyx3qCtAsK1ibMKQMl6EvB+kQJtcS/JXmxZ3fL1p0d6sRkqI78vBSu26G0WGHp -ozgUalc+q03U5HRZ0QDWecK1rJHNwLUmkJCFxhNOSUfZK6Ibe7s2MpdAFsqD6hcw -1HUL7BFbMG0rgluGMQaacoiiVFGR21WhE3Sueq+qW6+JzA4UIgFeycf5R3HNRaBb -9GGZpMZbAhTx6sT05IlNQUVMhVTBSZPZNy4sOGJvcYS+cTb1K5q/9z7F6QLe+8n/ -5FTdN5r5A1eZ+2bl98cLm37yGIhDM87wyzkicYooFDJK6Kbv/LIIeQqEnKywuSHV -2HPLsAmdNafEEU8og7t0oXByOYg5AKdAgYDZpnUSFlgvWJmLissJ6DHltDWRMyvi -A3v3Csc0F7Q0wsvFcj60goJJk5260n9F0EX6aL2Oc5Kc8sNe8WTffAnvcGBat2YK -dWc2238sVUyl5xxk1nIDEYeJpQSX28dbk8oU+rBZwJNJfnwdLQMn1rU32zXHYHT4 -MCLfAP+B5Uru2k9fv+/YkA== ------END KYBER768-X25519 PUBLIC KEY----- -""" - -[[VotingAuthority.Peers]] - Addresses = [ "37.218.247.39:3333" ] # beeblebrox - IdentityPublicKeyPem = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY----- + [[VotingAuthority.Peers]] +# beeblebrox +Addresses = ["37.218.247.39:3333"] +IdentityPublicKey = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY----- sffL6SrX94zltrKWiCc1bxvgqPaKuCpUsErChV3bUEop4+YrTXDMgH3JzKemFBf8 nmKjcV8le0fvASF0COhBdCoSse7YWSuR0zCiB1YiZk4nkfyhClxcTmXMV4hY7pvp -----END ED25519 SPHINCS+ PUBLIC KEY----- """ - LinkPublicKeyPem = """-----BEGIN KYBER768-X25519 PUBLIC KEY----- +LinkPublicKey = """-----BEGIN KYBER768-X25519 PUBLIC KEY----- 4X5ezeYQSDsLZ9RBpIYGw3RUnj/trGRjwzD0ToFixV64VT9REsQMynI7BXtDtSLw yld5CR3ld2EPmUryF2gnODOTl5rzVWuXpALXyspscm3IZr1fayIphjqkpmy4cmjo RoViwVxQRspZcBjjUaGtc4KyAYs+A56tYGA7dRBGoWmg2wbqYlhy4LRuk4sAQsjg @@ -162,16 +89,54 @@ VSZNStzaExhQ9wxg7HeRaQ== -----END KYBER768-X25519 PUBLIC KEY----- """ -[[VotingAuthority.Peers]] - Addresses = ["191.101.71.152:40000", "[2a02:4780:14:af58::1]:40000" ] # marighella - IdentityPublicKeyPem = """ ------BEGIN ED25519 SPHINCS+ PUBLIC KEY----- + [[VotingAuthority.Peers]] +# gnunet +Addresses = [ "131.159.74.69:65534", "[2001:4ca0:2001:42:225:90ff:fe6b:d60]:65534" ] +IdentityPublicKey = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY----- +jclECUIi0bp4f627W/T3q/bVZTV/zBYiT4Ry/9RlTpEr7ul+qPLGaHNbtPwH1kxD +86iP48/CFAz8W0RVnwtGm14wruOrE1d02917Qn7StkVVDxRMyf8yyGY7pis1wgBL +-----END ED25519 SPHINCS+ PUBLIC KEY----- +""" +# from gnunet_auth_id_link_key. +LinkPublicKey = """-----BEGIN KYBER768-X25519 PUBLIC KEY----- +X+8liX6+O1jT7IAub2R/cC3d92V+JLl0xN7GjYWHr1TipqTHJBsj+4HRKMHNYGzG +/Aq3YsU+uiW1Spfn6BZOCbST5ggDNgzepYcVZ6TYwXhsgIk651PrIVtyMQ2MRTHw +CBDAG7DBuC+f04XWlbib/JXzUE+4pjziAqX8kTdNAUrgVwcOMjrD5U46yWD+86EX +IDcOYl/r9R2ca8RR+TNjtHFvFAPx1AQ6kUftgbUiFnGzZ4q1c7xdpCCMeCPdas8m +ycW52yKBOHgX6cp6Gp7eBH47y7TDx51VAJSz4IZTQ220hpX4KXl/e815eRC0CwGj +JzFXSH52wZDf1UTXca5iYcF1kMnYRRQ/CTWw+5b+Y6jhAp1P+0flEVqG0zyql2v/ +I80usqTuoh07BYFyXJIJ1MAYM0e2tb9BGElXwRJKyl8xKF5r4AOVBnaZBclZhKM5 ++W57ByWMSS13w0K5ccXyLLfxOI6lIKgZparhBgz81BFld7/xyGEkjKaK65PVyI/5 +wE18SRB4NnTmNYrNFgDytFIKaZr2ilPUiodsBLKCQYc7VaJLAcbBomCAQDCThnM8 +IlR1RhW5cKIP8s+YsbZyyiCZTFoPDDOK1y5FG4x5WXUZ2WCQMUGamHW6QjHOIIBg +kKusYERXl4VzgJ7uAA4dFwKT1RUrKVaFShw86qBDmjwMx4OX8lJDAz7HkhCDagV+ +dwfIop6bAC+VllpYUSE6KYbNY6p1hHU0C10wq7+a7LubQ5n49CncEWalQSktJ1mZ +KEzh8VpSCT+4gCN0q8Qwm03uZUFo4ENwiwqG0ieHyz+KKW220JhT1rPXugjhxAKx +u0uHa1yToxHR4E3/TE9Hw39rmVTAsiE1Y1mPVsR9kafco1aap4BVAT7gG0dqlZS6 +l7GN+ogpIqAMsI+PhFXoChynw2TEAgVKuwkrJRYoaAusuh++Ch2Z6hPdJ1B1Glrc +GwYITGzmWR/tdTBV4IiTmX0Z+J7Vuyzxd2MGJa5ukJO/RBCt9GK8QA5BkAhkJYmR +U8gm1lrXmEkjdTvrSpUB0HEKsGYgwF2O9J5S+LxZEAEj+VvIcsf8tCi+5iUBqTDp +JxScmqRB0H7sIWIg8jyl4VEIIDCm+SORtKo8HDOzoMVcqk5WeTNtgcFa15ZAhIpM ++VHGJI+O9TQEGVxq7HTC3Cl1wZr52iivG6QFuyc5xYHi6kwle2J7OUPNiss14bPz +KwEzubCMp36LtkT32LTbPBHUpIjo6zoCC3XbIUVX2IoBihu24FejanawQjonnGxQ +LEL2fFofNse78YcdHCni4URBbCUe8wmtBRn7FC+RYC7DGTHkK7Yjyh8hpaMtmj4I +u1GZ8ln10DGhQkPGm1T6KRLPRUSV1lIiBqssSxV0kJofJCy9ZWSiYwfCNFCiaBd+ +Zk+YfEmaCiXEqktLgIupR2AtZBlz/LT+Ixx1WM1ys8MFVE+Rh0M2AL/wE4elmc6S +pn+9aoQZMkB4wmlTulvrzHiLJ5o6c22magdGuzFRCoDQpKbYGsDrsgkkURAbzJjO +scRn1VnYgQ/tJ5aeBcqyhhhVJjxP54WjPBtLMbTXqS8wCPB3ghstPVJ7W7+fam4r +feOstL0pARWr1YI6PonRbQ== +-----END KYBER768-X25519 PUBLIC KEY----- +""" + + [[VotingAuthority.Peers]] +# marighella +Addresses = [ "191.101.71.152:40000", "[2a02:4780:14:af58::1]:40000" ] +IdentityPublicKey = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY----- cEAu8JISHrc9n45xz6vUkJfvPnf3LlzowA0pyc443q+TAWiB5+NaRgK42Y01hDiK m0bmjPCQnMjcLEPTRVjdHirHTZXQLJq+w2i0ubNhI/nFn1Xka08WHpvLYC+XqgM5 -----END ED25519 SPHINCS+ PUBLIC KEY----- """ - LinkPublicKeyPem = """ ------BEGIN KYBER768-X25519 PUBLIC KEY----- +LinkPublicKey = """-----BEGIN KYBER768-X25519 PUBLIC KEY----- 5Mr5o0xywq18GdC8l7JGcLNhzRTNqpPIvSA6q4XTIyeo4m0p9pORJ3gwmndUGHZE 0r+nu1o5crS46VGC4Xa6+mHdrDgVpr3SEI1FaIZ6Na4/JVWkkspUCSWQ0G1ESjY3 ZYORWR8rbEI24h2YCYKz9n0wNKr2R4kD3AFpyipsqAYJx71Ikmvd8lLIAI9twT6n @@ -201,6 +166,78 @@ d7pNKav+/Mrl4pfWQT5/kSMNHI+m61VemmQ3HJ5HoSbROjoS4ndumaOAOnFFVUAl -----END KYBER768-X25519 PUBLIC KEY----- """ -[Debug] - DisableDecoyTraffic = false - PreferedTransports = ["onion"] + [[VotingAuthority.Peers]] +# nutria +Addresses = ["65.108.220.173:40000", "[2a01:4f9:c011:4e7b::1]:40000"] +IdentityPublicKey = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY----- +TUchIOZ98fc7UABosstqDlRN7aRQtKk/NTeVkhoNdSI62g883BupqMBY2RafKJfS +l2WZdf75HCsxMigPJwQhB64HD8i+cg2VgLF0ndZh703HnNjiv1EH+2Z2uYH3El6Z +-----END ED25519 SPHINCS+ PUBLIC KEY----- +""" +LinkPublicKey = """-----BEGIN KYBER768-X25519 PUBLIC KEY----- +eoRieDZr+HV4lqUcEtLRUzJKQ0anel3dEsm737d0TwW3l6zwsMDm8kaW7BuwRT4d +53Bs98rpgGxrvMWFagQdHE9jnITJ02m3I4GJwJJQgj2pZ4py0ckBK3/cdKXK6FVU +KZtuywueUKCLci2RGD6/GRYDdJV5yplQs58kBDAgSaUFY2d6VCnaSrdP1UnVmiWB +lJitY76X6yjqN6LeApTdGR0CTLGdZa9tBh466bWXtXcnap1GCTCR4YR2GQzo2Wdp +GkmLcydO+Q+cEJXYd3Mg5mA7ZbCFpBF8kUfiSlxySaVppMtmc7qozElDI2lMCFcf +YTtXtYqB4lh/gSK5EU/p4rzJc04MKG4Wk0gfo7ofOlbdsZc8eT+SUxcr0JA35iy+ +mTCiS4Il8BxgRKxGFa0dOEGaqrbVZRZJ2IsdBqwAiZa5m51v6iieCS7jlFcIFkaJ +I8O+a0mZZ5p2V2NeEbRht4RUcbOajDm4dySwaQEa5jTS9HLPQc6l1z5RtzuZvE1u +E1YjdwGDi5sfc3ZhFqUNDDgLOHPmBptLyV8lSGk3u2LUMgudBkP/DKx+kUHhFjUs +ljjVCiRiRn3RSmwZ0jjTwrnCkRfpKKn3Sro/MlWkkqK+9kn4YR2397gqkpqOczJa +SoHhND6BELcJGBRlSl8iOD8i7J5beaoyNKgWbElzE4xfrGUNRoLFCjdXBZkeWDhL +HJYgoVPHGwOoPC6mtWGjFRGoeqJth4SvdBKiECwol0+6QJGHtIx8DIabA2m7nDoI +gEgOU8XL12pIKzIMbLik4SEBnLg3uH9D5mm/oyBTmUSud7+rRLekcK4bqGuH427K +EJ50Nsy71DVju4dWpsS9MshU160xoGwfFAUb8LfCmsgQiZQjGJ0DqcFeOqC/GpUM +uMoEQyQlkrLuMp5y66+xQai567CoksxdxnngjBFOipkToS0eIBVnk8DmSs4qg2pS +Rb2gmUusTGUsN2iAWMFVdAOCxWDbUJ8thLhEaRVyJj4cqTcyoX7v0Q5AWEY9CplN +GDZSmrU2liIGNj+kyUGeAgKWFKi69YNMqH8Ax6TmuaGe40fZ7IoVCxk+WUZnJTof +AHZjk0vzOQ5QMr81ODV0smlJJbJg2HGoBamIbDdLFldgU8HsgG066IJK4Z1+ZxYc +xJ0+CDrayFENQIc32VABibnxsgU/FokhIHcIfG2UtjO0lhaQelTOkj9BTMPjpJ+s +IGjM0II9SYBtqGH5lxikfKlmohgIWc/EVqIHSLCZg7mnFjdUY0BTeyAJGiX5ZCSp +KsgdAIp8ML9J+mySyM+DPLgheBClRApT2xZ+bAzcYosShiFuqnmu+2mFSLGr9lkv +5SboAL8/ZIXQ11zMJ34uqieq0W2UpYkf+m6+e5j8swAdyhKlFR0jmRNfhpKc+cvB +qmE71M5dRKqpyZZBVULpMnSBwVtvyrfJQDABO7TreVMmcjF6hQjiSj4I6F/44AjX +J5+teBYtVEqWuIq6FkbZAXKd8nv1psIJ9Y3DqDTT3LMztlrF8X/GclTeMXn32A3U +Zr/rFB4vmUBVk6N9dA8cBhyGIW8tQ8O17LyE4hXtWjvmEbFffh8Si1kegPKObPTS +xKymaSdIB5pbFkGCV1C0ew== +-----END KYBER768-X25519 PUBLIC KEY----- +""" + + [[VotingAuthority.Peers]] +# windfall +Addresses = ["74.50.67.182:40002"] +IdentityPublicKey = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY----- ++oxlrZurSc3JD/eJsRmSabtFVsbFB/N1fSZSHTEajndgX/rGGZTCiBqMDqXC/qTS +dfvVb+yOmo+pnbnEeWuCecXFplODH92p83pp+nzmMadGUprzadL9smufJlb7+GkD +-----END ED25519 SPHINCS+ PUBLIC KEY----- +""" +LinkPublicKey = """-----BEGIN KYBER768-X25519 PUBLIC KEY----- +MaoZ3OQXJXvoWu9v9Yq5aq+adWwzfAm8FYYXM0olCCXxTKnR/FPRoJKEGTtOU7VA +VqgtGcFyFoxctB82pAapdjcn1FHxXMjUyMWUh4810MRiAVgU9F3/BKuv/HVholmX +KLlRegvlhcf+VQlsAVDbXA3d87nHbG7gRqEARkRniTh4FlAok0eecZPmFkbt5EgT +mcziKq75+HeF1hgvB7pd1jy+tBLlhTE6FoMcBZSWyEFO1jQLxsQVVmtJa6+G6WwM +CJz0t1EVSlY9kC2Ze2y1FpS4ZlVFQC2gkxvu6q3/67T4ykzxc1pNuHSX+ClfJ2wu +8TJnEJqL9D/xsIORS5/l7DmoMRwd1cl24cpN0lQ464Heur0Bg6nr5LwlcbM+eKFx +Uik94wnW6JqI4r8eOTF/Qz6kuKUCqU3Yq3YKdqfwKo0apiogd4d1aIaTGBhxwbsn +XAOs3LfohlpXnEMQGw5r9ExKZnFDWpXZAsXE4roKJ1/foVRfgMjPqnQ3S0LMOsMs +44G83Hd+anUQ5lKXNB89NFIVZ479FoGApGgAtn7nAcPQAAbv83ElGQ7gpQjzkCOJ +6sfyFzSNSSdzK4YXdbHwnIplMCBZuylm8QsYsa2IuhR811XJ5EiGQkmIpjsnwiNe +tJBYhSczB5WiIVTkHJJPoKeAI6xEWDke+kxUR8EsdhVPZDBXEU6le2Ttiju0/J2v ++WLM81fV2h/+SxMOt0uhXJDWBX34IzU1loGZQlhEmBh04lCMhTXXmlzlpjBRF1+A +YsHnAgYs5bjCRhZCYI5KSwrf5TZ/NTKzqK64eJlGjF8/1WSMJneXyE0QJmz2YQqm +gFSvgFLyNXLecFxJiq0ml095cz5sopzBFg8D07mtgpWaGkWgbDY1F2YCc2kygwfu +8bXIN7yX5llDPF5RAcDOekVvAln826/EuzDbpA9ek1a3DC4oaqvqKMos+cFlSaCF +YExGaSpUhZVMMcHDQav7u0bhV5R4x55dJkzFciEpUwEb/Eb1I3qEAbb4CD5YQJGw +uzgQ6hX7AwGSJKcnsbcMExs56LkoFZ9FYDaRLFwDh83qUJGBqi+BLF6ryU7/5zYo +WH+Nt3dd4lryasggsYQkMym714XK95uF9Zv9esUUQhPK1ZdxCUI0U80zV1YFPIsf +1l9D5K+zgGGpK6YZZwS8tsppFyvqRKA7sGBwopYCNcFANsiFNAIkRxAFgSVWWbVE +RL3Zt6comB4PNszXHLbKVwjbs4NUxyrZ+pD2oALIBqGYC2aMTDk80CgdzF/Awg2J +4XATEHmOJ5fwV7GepRy7XDxvFb9UAhD4o5oNB7za0FfahySEvLVeKYOl4WsTUIEJ +TDIetFrfpJ2FeDAK+EaAOBGKaMvv9XSVSIPZxinC2yNYi3TQ53M3W33nemGtVcXQ +yrq1kMVuC4EozLxgycOWpkr9XAdtyIzTB7uJhby7Fqem0L5BhBnhcqH9kF1rB1M7 +onmS01k6RBL2tB38AkcFpykFeVoQ1FT8tW22pTQFo88RIowRcT4YQmq2LKThpRHx +EQQMNqHcB8Z61ya7aG6K9wHLlnNpF0ZPV8n4k0Sp1QmJGJYt7/HMTAIK/ZHtHoQf +vkdQm1uuoKMh1qC6oRRsgQ== +-----END KYBER768-X25519 PUBLIC KEY----- +""" diff --git a/default_config_without_tor.toml b/default_config_without_tor.toml index b85dc15..3172c10 100644 --- a/default_config_without_tor.toml +++ b/default_config_without_tor.toml @@ -6,55 +6,19 @@ Level = "DEBUG" File = "" -[VotingAuthority] -[[VotingAuthority.Peers]] - Addresses = ["65.108.220.173:40000", "[2a01:4f9:c011:4e7b::1]:40000" ] # nurtria - IdentityPublicKeyPem = """ ------BEGIN ED25519 SPHINCS+ PUBLIC KEY----- -TUchIOZ98fc7UABosstqDlRN7aRQtKk/NTeVkhoNdSI62g883BupqMBY2RafKJfS -l2WZdf75HCsxMigPJwQhB64HD8i+cg2VgLF0ndZh703HnNjiv1EH+2Z2uYH3El6Z ------END ED25519 SPHINCS+ PUBLIC KEY----- -""" - LinkPublicKeyPem = """ ------BEGIN KYBER768-X25519 PUBLIC KEY----- -eoRieDZr+HV4lqUcEtLRUzJKQ0anel3dEsm737d0TwW3l6zwsMDm8kaW7BuwRT4d -53Bs98rpgGxrvMWFagQdHE9jnITJ02m3I4GJwJJQgj2pZ4py0ckBK3/cdKXK6FVU -KZtuywueUKCLci2RGD6/GRYDdJV5yplQs58kBDAgSaUFY2d6VCnaSrdP1UnVmiWB -lJitY76X6yjqN6LeApTdGR0CTLGdZa9tBh466bWXtXcnap1GCTCR4YR2GQzo2Wdp -GkmLcydO+Q+cEJXYd3Mg5mA7ZbCFpBF8kUfiSlxySaVppMtmc7qozElDI2lMCFcf -YTtXtYqB4lh/gSK5EU/p4rzJc04MKG4Wk0gfo7ofOlbdsZc8eT+SUxcr0JA35iy+ -mTCiS4Il8BxgRKxGFa0dOEGaqrbVZRZJ2IsdBqwAiZa5m51v6iieCS7jlFcIFkaJ -I8O+a0mZZ5p2V2NeEbRht4RUcbOajDm4dySwaQEa5jTS9HLPQc6l1z5RtzuZvE1u -E1YjdwGDi5sfc3ZhFqUNDDgLOHPmBptLyV8lSGk3u2LUMgudBkP/DKx+kUHhFjUs -ljjVCiRiRn3RSmwZ0jjTwrnCkRfpKKn3Sro/MlWkkqK+9kn4YR2397gqkpqOczJa -SoHhND6BELcJGBRlSl8iOD8i7J5beaoyNKgWbElzE4xfrGUNRoLFCjdXBZkeWDhL -HJYgoVPHGwOoPC6mtWGjFRGoeqJth4SvdBKiECwol0+6QJGHtIx8DIabA2m7nDoI -gEgOU8XL12pIKzIMbLik4SEBnLg3uH9D5mm/oyBTmUSud7+rRLekcK4bqGuH427K -EJ50Nsy71DVju4dWpsS9MshU160xoGwfFAUb8LfCmsgQiZQjGJ0DqcFeOqC/GpUM -uMoEQyQlkrLuMp5y66+xQai567CoksxdxnngjBFOipkToS0eIBVnk8DmSs4qg2pS -Rb2gmUusTGUsN2iAWMFVdAOCxWDbUJ8thLhEaRVyJj4cqTcyoX7v0Q5AWEY9CplN -GDZSmrU2liIGNj+kyUGeAgKWFKi69YNMqH8Ax6TmuaGe40fZ7IoVCxk+WUZnJTof -AHZjk0vzOQ5QMr81ODV0smlJJbJg2HGoBamIbDdLFldgU8HsgG066IJK4Z1+ZxYc -xJ0+CDrayFENQIc32VABibnxsgU/FokhIHcIfG2UtjO0lhaQelTOkj9BTMPjpJ+s -IGjM0II9SYBtqGH5lxikfKlmohgIWc/EVqIHSLCZg7mnFjdUY0BTeyAJGiX5ZCSp -KsgdAIp8ML9J+mySyM+DPLgheBClRApT2xZ+bAzcYosShiFuqnmu+2mFSLGr9lkv -5SboAL8/ZIXQ11zMJ34uqieq0W2UpYkf+m6+e5j8swAdyhKlFR0jmRNfhpKc+cvB -qmE71M5dRKqpyZZBVULpMnSBwVtvyrfJQDABO7TreVMmcjF6hQjiSj4I6F/44AjX -J5+teBYtVEqWuIq6FkbZAXKd8nv1psIJ9Y3DqDTT3LMztlrF8X/GclTeMXn32A3U -Zr/rFB4vmUBVk6N9dA8cBhyGIW8tQ8O17LyE4hXtWjvmEbFffh8Si1kegPKObPTS -xKymaSdIB5pbFkGCV1C0ew== ------END KYBER768-X25519 PUBLIC KEY----- -""" +[Debug] + DisableDecoyTraffic = false -[[VotingAuthority.Peers]] - Addresses = ["131.155.69.135:65534"] # annares - IdentityPublicKeyPem = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY----- +[VotingAuthority] + [[VotingAuthority.Peers]] +# annares +Addresses = ["131.155.69.135:65534"] +IdentityPublicKey = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY----- /fjoRTnyDITTtD1ialtNWSzfTp9Vd47kEUa7sc3LM2I+PRgv+JbeuaLpEbJLfAoR K1Q/TqWuvrUThx2FvnRDMIQtUnlAUleZT/ScJJ2av9Qh0gx8v2yZG0TuqpCiJmY0 -----END ED25519 SPHINCS+ PUBLIC KEY----- """ - LinkPublicKeyPem = """ ------BEGIN KYBER768-X25519 PUBLIC KEY----- +LinkPublicKey = """-----BEGIN KYBER768-X25519 PUBLIC KEY----- 7NNX023odnDnPM5oB9jR+A6onG4Af3hfU+pjtu2j3Sm8jCR3R5ct9JYSw2H8VcLB lj+k9Jb+I2MmhzT0gCK/yYbWC1R7UjZqlKJLtXZFjA3TuIX4wHfXUpn9+HUSA4hz Bn1v8RALFg5kJrmxSK/5BJQIoSoDUCVdoF4Rp5dhEFpXolqscI2T1lY9Kp+jgSZ2 @@ -84,53 +48,15 @@ hm8ySnLAh52a0CsVDKFgYWY6MGJRupt0aiQXIzCZQUdgWsE6AnxHzBgHsAhemrhG -----END KYBER768-X25519 PUBLIC KEY----- """ -[[VotingAuthority.Peers]] - Addresses = ["74.50.67.182:40002"] # windfall - # from windfall_auth_id_pub_key.pem" - IdentityPublicKeyPem = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY----- -WuNRfvRM/WvVoAQ3OD5Sa+ljFNtRcHnTfERaQErvkSo34orbrib6Wf26e9A/dRDP -bP4+L0UWhgw7z1vGyGi7/zE38pM1hRW/tDoBe6tzTMq/sBEkYs+WbFG28SJGB9kV ------END ED25519 SPHINCS+ PUBLIC KEY----- -""" - # from windfall_auth_link_pub_key.pem - LinkPublicKeyPem = """-----BEGIN KYBER768-X25519 PUBLIC KEY----- -vJgHIVIwd6u6IpN8y8KLf8wlUXS2D8pMsQiJ1dAuKRQsk4yF0lk1qS2PmCNG4iL5 -V64qWAO/HFGxlijtwIwEZ1X4sMAp+XTbK3bXBL2sVsv/JcMN+c6k8rSIccYOZTGA -bFyLtFfnNLZOWsIqmTmK1lIYxDOz+rvvU3ZMwZTKF0vgbEl0eGLrM44XAAEyFbLV -iK03B5Qla3BsV2nS2g8bNbAu9b3vEBLCI4+QF3y28HGa+VGQGxXbrEpy8pHzMH8Q -mnZOeHCMxBM7FGMfpq0elGKydr1AkWxR2rnZBQQ3ISRgCFdeIEypa2t5xYX/t63X -VVhHhFe/3AzBFWOpdS1IATm7051umBh3qIM/9FHbg5RZay/N5HfnAwqE47U2VD0q -cznXEJvQEGzGhRHwHBDXYZBqB7b/gRCiClYrcVpJNhOVFs88YaTNbJY30SQ2FbeQ -ODVBSmsfYIw8tBM8mreNHFgJtIjSBEF9qCweVoweqq4UwCX0FYY7FL9bGaFdmU1H -WkuYJCkN4gey22R2sIyjuo4BYxGX57DXERYQiCuS2cSI1zaKwkIP9CRvURxoqxY+ -Rxwx9ken/HWSAUuLhcmmVM2mw3XkyCMqxia661xoNUc+Sws85RvDmsJzBAH7NHIC -d8o0zHOZYkTyAQu8Nc4CtsHUo5FJYh/v6b46555QOmRTE5KraietpFYl+ApgMVUR -MGCcuMX5nIg8RmwBZ8Dde2rJu75tMXspS7tjOWcZpUbP7IC9gRgrVVDvgn6JUTif -QUSK8TMCQb9xHBstMDh2QWJovGQ7KMG0ijS3hMg+tTWNcgxpizQbwTqO9DW39cuD -WikAS81ZIp1eGhHc4z7SV19vGDTscsBKSZpjSK0pOi+jZrbs2hSKASvIXJ0fTCCe -Kqw4doCTGJ2v1hASWSW2vDP+IVNd6SEXNwx2VltiyrpDS68t14x2cogsF1rdqBm+ -I3Dpl1hvCzZ7d5+LgVcbd4Wltm04Gba2eHSZmpc32a7tXIbsOj08d4+ImVmzlV3f -KR5ktbBo4K8AJmU9WCW7x7iKpYOYxhYq0AW+IHM0TLmZYnhli0ViuGAqCbgrapHB -BWZyx3qCtAsK1ibMKQMl6EvB+kQJtcS/JXmxZ3fL1p0d6sRkqI78vBSu26G0WGHp -ozgUalc+q03U5HRZ0QDWecK1rJHNwLUmkJCFxhNOSUfZK6Ibe7s2MpdAFsqD6hcw -1HUL7BFbMG0rgluGMQaacoiiVFGR21WhE3Sueq+qW6+JzA4UIgFeycf5R3HNRaBb -9GGZpMZbAhTx6sT05IlNQUVMhVTBSZPZNy4sOGJvcYS+cTb1K5q/9z7F6QLe+8n/ -5FTdN5r5A1eZ+2bl98cLm37yGIhDM87wyzkicYooFDJK6Kbv/LIIeQqEnKywuSHV -2HPLsAmdNafEEU8og7t0oXByOYg5AKdAgYDZpnUSFlgvWJmLissJ6DHltDWRMyvi -A3v3Csc0F7Q0wsvFcj60goJJk5260n9F0EX6aL2Oc5Kc8sNe8WTffAnvcGBat2YK -dWc2238sVUyl5xxk1nIDEYeJpQSX28dbk8oU+rBZwJNJfnwdLQMn1rU32zXHYHT4 -MCLfAP+B5Uru2k9fv+/YkA== ------END KYBER768-X25519 PUBLIC KEY----- -""" - -[[VotingAuthority.Peers]] - Addresses = [ "37.218.247.39:3333" ] # beeblebrox - IdentityPublicKeyPem = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY----- + [[VotingAuthority.Peers]] +# beeblebrox +Addresses = ["37.218.247.39:3333"] +IdentityPublicKey = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY----- sffL6SrX94zltrKWiCc1bxvgqPaKuCpUsErChV3bUEop4+YrTXDMgH3JzKemFBf8 nmKjcV8le0fvASF0COhBdCoSse7YWSuR0zCiB1YiZk4nkfyhClxcTmXMV4hY7pvp -----END ED25519 SPHINCS+ PUBLIC KEY----- """ - LinkPublicKeyPem = """-----BEGIN KYBER768-X25519 PUBLIC KEY----- +LinkPublicKey = """-----BEGIN KYBER768-X25519 PUBLIC KEY----- 4X5ezeYQSDsLZ9RBpIYGw3RUnj/trGRjwzD0ToFixV64VT9REsQMynI7BXtDtSLw yld5CR3ld2EPmUryF2gnODOTl5rzVWuXpALXyspscm3IZr1fayIphjqkpmy4cmjo RoViwVxQRspZcBjjUaGtc4KyAYs+A56tYGA7dRBGoWmg2wbqYlhy4LRuk4sAQsjg @@ -160,16 +86,54 @@ VSZNStzaExhQ9wxg7HeRaQ== -----END KYBER768-X25519 PUBLIC KEY----- """ -[[VotingAuthority.Peers]] - Addresses = ["191.101.71.152:40000", "[2a02:4780:14:af58::1]:40000" ] # marighella - IdentityPublicKeyPem = """ ------BEGIN ED25519 SPHINCS+ PUBLIC KEY----- + [[VotingAuthority.Peers]] +# gnunet +Addresses = [ "131.159.74.69:65534", "[2001:4ca0:2001:42:225:90ff:fe6b:d60]:65534" ] +IdentityPublicKey = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY----- +jclECUIi0bp4f627W/T3q/bVZTV/zBYiT4Ry/9RlTpEr7ul+qPLGaHNbtPwH1kxD +86iP48/CFAz8W0RVnwtGm14wruOrE1d02917Qn7StkVVDxRMyf8yyGY7pis1wgBL +-----END ED25519 SPHINCS+ PUBLIC KEY----- +""" +# from gnunet_auth_id_link_key. +LinkPublicKey = """-----BEGIN KYBER768-X25519 PUBLIC KEY----- +X+8liX6+O1jT7IAub2R/cC3d92V+JLl0xN7GjYWHr1TipqTHJBsj+4HRKMHNYGzG +/Aq3YsU+uiW1Spfn6BZOCbST5ggDNgzepYcVZ6TYwXhsgIk651PrIVtyMQ2MRTHw +CBDAG7DBuC+f04XWlbib/JXzUE+4pjziAqX8kTdNAUrgVwcOMjrD5U46yWD+86EX +IDcOYl/r9R2ca8RR+TNjtHFvFAPx1AQ6kUftgbUiFnGzZ4q1c7xdpCCMeCPdas8m +ycW52yKBOHgX6cp6Gp7eBH47y7TDx51VAJSz4IZTQ220hpX4KXl/e815eRC0CwGj +JzFXSH52wZDf1UTXca5iYcF1kMnYRRQ/CTWw+5b+Y6jhAp1P+0flEVqG0zyql2v/ +I80usqTuoh07BYFyXJIJ1MAYM0e2tb9BGElXwRJKyl8xKF5r4AOVBnaZBclZhKM5 ++W57ByWMSS13w0K5ccXyLLfxOI6lIKgZparhBgz81BFld7/xyGEkjKaK65PVyI/5 +wE18SRB4NnTmNYrNFgDytFIKaZr2ilPUiodsBLKCQYc7VaJLAcbBomCAQDCThnM8 +IlR1RhW5cKIP8s+YsbZyyiCZTFoPDDOK1y5FG4x5WXUZ2WCQMUGamHW6QjHOIIBg +kKusYERXl4VzgJ7uAA4dFwKT1RUrKVaFShw86qBDmjwMx4OX8lJDAz7HkhCDagV+ +dwfIop6bAC+VllpYUSE6KYbNY6p1hHU0C10wq7+a7LubQ5n49CncEWalQSktJ1mZ +KEzh8VpSCT+4gCN0q8Qwm03uZUFo4ENwiwqG0ieHyz+KKW220JhT1rPXugjhxAKx +u0uHa1yToxHR4E3/TE9Hw39rmVTAsiE1Y1mPVsR9kafco1aap4BVAT7gG0dqlZS6 +l7GN+ogpIqAMsI+PhFXoChynw2TEAgVKuwkrJRYoaAusuh++Ch2Z6hPdJ1B1Glrc +GwYITGzmWR/tdTBV4IiTmX0Z+J7Vuyzxd2MGJa5ukJO/RBCt9GK8QA5BkAhkJYmR +U8gm1lrXmEkjdTvrSpUB0HEKsGYgwF2O9J5S+LxZEAEj+VvIcsf8tCi+5iUBqTDp +JxScmqRB0H7sIWIg8jyl4VEIIDCm+SORtKo8HDOzoMVcqk5WeTNtgcFa15ZAhIpM ++VHGJI+O9TQEGVxq7HTC3Cl1wZr52iivG6QFuyc5xYHi6kwle2J7OUPNiss14bPz +KwEzubCMp36LtkT32LTbPBHUpIjo6zoCC3XbIUVX2IoBihu24FejanawQjonnGxQ +LEL2fFofNse78YcdHCni4URBbCUe8wmtBRn7FC+RYC7DGTHkK7Yjyh8hpaMtmj4I +u1GZ8ln10DGhQkPGm1T6KRLPRUSV1lIiBqssSxV0kJofJCy9ZWSiYwfCNFCiaBd+ +Zk+YfEmaCiXEqktLgIupR2AtZBlz/LT+Ixx1WM1ys8MFVE+Rh0M2AL/wE4elmc6S +pn+9aoQZMkB4wmlTulvrzHiLJ5o6c22magdGuzFRCoDQpKbYGsDrsgkkURAbzJjO +scRn1VnYgQ/tJ5aeBcqyhhhVJjxP54WjPBtLMbTXqS8wCPB3ghstPVJ7W7+fam4r +feOstL0pARWr1YI6PonRbQ== +-----END KYBER768-X25519 PUBLIC KEY----- +""" + + [[VotingAuthority.Peers]] +# marighella +Addresses = [ "191.101.71.152:40000", "[2a02:4780:14:af58::1]:40000" ] +IdentityPublicKey = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY----- cEAu8JISHrc9n45xz6vUkJfvPnf3LlzowA0pyc443q+TAWiB5+NaRgK42Y01hDiK m0bmjPCQnMjcLEPTRVjdHirHTZXQLJq+w2i0ubNhI/nFn1Xka08WHpvLYC+XqgM5 -----END ED25519 SPHINCS+ PUBLIC KEY----- """ - LinkPublicKeyPem = """ ------BEGIN KYBER768-X25519 PUBLIC KEY----- +LinkPublicKey = """-----BEGIN KYBER768-X25519 PUBLIC KEY----- 5Mr5o0xywq18GdC8l7JGcLNhzRTNqpPIvSA6q4XTIyeo4m0p9pORJ3gwmndUGHZE 0r+nu1o5crS46VGC4Xa6+mHdrDgVpr3SEI1FaIZ6Na4/JVWkkspUCSWQ0G1ESjY3 ZYORWR8rbEI24h2YCYKz9n0wNKr2R4kD3AFpyipsqAYJx71Ikmvd8lLIAI9twT6n @@ -198,5 +162,80 @@ d7pNKav+/Mrl4pfWQT5/kSMNHI+m61VemmQ3HJ5HoSbROjoS4ndumaOAOnFFVUAl 1+F2LV8O/F13m4S4g1tj8g== -----END KYBER768-X25519 PUBLIC KEY----- """ -[Debug] - DisableDecoyTraffic = false + + [[VotingAuthority.Peers]] +# nutria +Addresses = ["65.108.220.173:40000", "[2a01:4f9:c011:4e7b::1]:40000"] +IdentityPublicKey = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY----- +TUchIOZ98fc7UABosstqDlRN7aRQtKk/NTeVkhoNdSI62g883BupqMBY2RafKJfS +l2WZdf75HCsxMigPJwQhB64HD8i+cg2VgLF0ndZh703HnNjiv1EH+2Z2uYH3El6Z +-----END ED25519 SPHINCS+ PUBLIC KEY----- +""" +LinkPublicKey = """-----BEGIN KYBER768-X25519 PUBLIC KEY----- +eoRieDZr+HV4lqUcEtLRUzJKQ0anel3dEsm737d0TwW3l6zwsMDm8kaW7BuwRT4d +53Bs98rpgGxrvMWFagQdHE9jnITJ02m3I4GJwJJQgj2pZ4py0ckBK3/cdKXK6FVU +KZtuywueUKCLci2RGD6/GRYDdJV5yplQs58kBDAgSaUFY2d6VCnaSrdP1UnVmiWB +lJitY76X6yjqN6LeApTdGR0CTLGdZa9tBh466bWXtXcnap1GCTCR4YR2GQzo2Wdp +GkmLcydO+Q+cEJXYd3Mg5mA7ZbCFpBF8kUfiSlxySaVppMtmc7qozElDI2lMCFcf +YTtXtYqB4lh/gSK5EU/p4rzJc04MKG4Wk0gfo7ofOlbdsZc8eT+SUxcr0JA35iy+ +mTCiS4Il8BxgRKxGFa0dOEGaqrbVZRZJ2IsdBqwAiZa5m51v6iieCS7jlFcIFkaJ +I8O+a0mZZ5p2V2NeEbRht4RUcbOajDm4dySwaQEa5jTS9HLPQc6l1z5RtzuZvE1u +E1YjdwGDi5sfc3ZhFqUNDDgLOHPmBptLyV8lSGk3u2LUMgudBkP/DKx+kUHhFjUs +ljjVCiRiRn3RSmwZ0jjTwrnCkRfpKKn3Sro/MlWkkqK+9kn4YR2397gqkpqOczJa +SoHhND6BELcJGBRlSl8iOD8i7J5beaoyNKgWbElzE4xfrGUNRoLFCjdXBZkeWDhL +HJYgoVPHGwOoPC6mtWGjFRGoeqJth4SvdBKiECwol0+6QJGHtIx8DIabA2m7nDoI +gEgOU8XL12pIKzIMbLik4SEBnLg3uH9D5mm/oyBTmUSud7+rRLekcK4bqGuH427K +EJ50Nsy71DVju4dWpsS9MshU160xoGwfFAUb8LfCmsgQiZQjGJ0DqcFeOqC/GpUM +uMoEQyQlkrLuMp5y66+xQai567CoksxdxnngjBFOipkToS0eIBVnk8DmSs4qg2pS +Rb2gmUusTGUsN2iAWMFVdAOCxWDbUJ8thLhEaRVyJj4cqTcyoX7v0Q5AWEY9CplN +GDZSmrU2liIGNj+kyUGeAgKWFKi69YNMqH8Ax6TmuaGe40fZ7IoVCxk+WUZnJTof +AHZjk0vzOQ5QMr81ODV0smlJJbJg2HGoBamIbDdLFldgU8HsgG066IJK4Z1+ZxYc +xJ0+CDrayFENQIc32VABibnxsgU/FokhIHcIfG2UtjO0lhaQelTOkj9BTMPjpJ+s +IGjM0II9SYBtqGH5lxikfKlmohgIWc/EVqIHSLCZg7mnFjdUY0BTeyAJGiX5ZCSp +KsgdAIp8ML9J+mySyM+DPLgheBClRApT2xZ+bAzcYosShiFuqnmu+2mFSLGr9lkv +5SboAL8/ZIXQ11zMJ34uqieq0W2UpYkf+m6+e5j8swAdyhKlFR0jmRNfhpKc+cvB +qmE71M5dRKqpyZZBVULpMnSBwVtvyrfJQDABO7TreVMmcjF6hQjiSj4I6F/44AjX +J5+teBYtVEqWuIq6FkbZAXKd8nv1psIJ9Y3DqDTT3LMztlrF8X/GclTeMXn32A3U +Zr/rFB4vmUBVk6N9dA8cBhyGIW8tQ8O17LyE4hXtWjvmEbFffh8Si1kegPKObPTS +xKymaSdIB5pbFkGCV1C0ew== +-----END KYBER768-X25519 PUBLIC KEY----- +""" + + [[VotingAuthority.Peers]] +# windfall +Addresses = ["74.50.67.182:40002"] +IdentityPublicKey = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY----- ++oxlrZurSc3JD/eJsRmSabtFVsbFB/N1fSZSHTEajndgX/rGGZTCiBqMDqXC/qTS +dfvVb+yOmo+pnbnEeWuCecXFplODH92p83pp+nzmMadGUprzadL9smufJlb7+GkD +-----END ED25519 SPHINCS+ PUBLIC KEY----- +""" +LinkPublicKey = """-----BEGIN KYBER768-X25519 PUBLIC KEY----- +MaoZ3OQXJXvoWu9v9Yq5aq+adWwzfAm8FYYXM0olCCXxTKnR/FPRoJKEGTtOU7VA +VqgtGcFyFoxctB82pAapdjcn1FHxXMjUyMWUh4810MRiAVgU9F3/BKuv/HVholmX +KLlRegvlhcf+VQlsAVDbXA3d87nHbG7gRqEARkRniTh4FlAok0eecZPmFkbt5EgT +mcziKq75+HeF1hgvB7pd1jy+tBLlhTE6FoMcBZSWyEFO1jQLxsQVVmtJa6+G6WwM +CJz0t1EVSlY9kC2Ze2y1FpS4ZlVFQC2gkxvu6q3/67T4ykzxc1pNuHSX+ClfJ2wu +8TJnEJqL9D/xsIORS5/l7DmoMRwd1cl24cpN0lQ464Heur0Bg6nr5LwlcbM+eKFx +Uik94wnW6JqI4r8eOTF/Qz6kuKUCqU3Yq3YKdqfwKo0apiogd4d1aIaTGBhxwbsn +XAOs3LfohlpXnEMQGw5r9ExKZnFDWpXZAsXE4roKJ1/foVRfgMjPqnQ3S0LMOsMs +44G83Hd+anUQ5lKXNB89NFIVZ479FoGApGgAtn7nAcPQAAbv83ElGQ7gpQjzkCOJ +6sfyFzSNSSdzK4YXdbHwnIplMCBZuylm8QsYsa2IuhR811XJ5EiGQkmIpjsnwiNe +tJBYhSczB5WiIVTkHJJPoKeAI6xEWDke+kxUR8EsdhVPZDBXEU6le2Ttiju0/J2v ++WLM81fV2h/+SxMOt0uhXJDWBX34IzU1loGZQlhEmBh04lCMhTXXmlzlpjBRF1+A +YsHnAgYs5bjCRhZCYI5KSwrf5TZ/NTKzqK64eJlGjF8/1WSMJneXyE0QJmz2YQqm +gFSvgFLyNXLecFxJiq0ml095cz5sopzBFg8D07mtgpWaGkWgbDY1F2YCc2kygwfu +8bXIN7yX5llDPF5RAcDOekVvAln826/EuzDbpA9ek1a3DC4oaqvqKMos+cFlSaCF +YExGaSpUhZVMMcHDQav7u0bhV5R4x55dJkzFciEpUwEb/Eb1I3qEAbb4CD5YQJGw +uzgQ6hX7AwGSJKcnsbcMExs56LkoFZ9FYDaRLFwDh83qUJGBqi+BLF6ryU7/5zYo +WH+Nt3dd4lryasggsYQkMym714XK95uF9Zv9esUUQhPK1ZdxCUI0U80zV1YFPIsf +1l9D5K+zgGGpK6YZZwS8tsppFyvqRKA7sGBwopYCNcFANsiFNAIkRxAFgSVWWbVE +RL3Zt6comB4PNszXHLbKVwjbs4NUxyrZ+pD2oALIBqGYC2aMTDk80CgdzF/Awg2J +4XATEHmOJ5fwV7GepRy7XDxvFb9UAhD4o5oNB7za0FfahySEvLVeKYOl4WsTUIEJ +TDIetFrfpJ2FeDAK+EaAOBGKaMvv9XSVSIPZxinC2yNYi3TQ53M3W33nemGtVcXQ +yrq1kMVuC4EozLxgycOWpkr9XAdtyIzTB7uJhby7Fqem0L5BhBnhcqH9kF1rB1M7 +onmS01k6RBL2tB38AkcFpykFeVoQ1FT8tW22pTQFo88RIowRcT4YQmq2LKThpRHx +EQQMNqHcB8Z61ya7aG6K9wHLlnNpF0ZPV8n4k0Sp1QmJGJYt7/HMTAIK/ZHtHoQf +vkdQm1uuoKMh1qC6oRRsgQ== +-----END KYBER768-X25519 PUBLIC KEY----- +""" + diff --git a/go.mod b/go.mod index 95c9d55..f649099 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( gioui.org/x/notify v0.0.0-20211102210401-cead9283b8ff github.com/benc-uk/gofract v0.0.0-20211012214247-47caccaf3aac github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b - github.com/katzenpost/katzenpost v0.0.15-0.20221206173037-0e69a16ffc75 + github.com/katzenpost/katzenpost v0.0.18-0.20221222201539-9da4dc24f641 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e golang.org/x/exp/shiny v0.0.0-20220827204233-334a2380cb91 golang.org/x/image v0.0.0-20220722155232-062f8c9fd539 diff --git a/testdata/catshadow.toml b/testdata/catshadow.toml index 3a3205e..92fe228 100644 --- a/testdata/catshadow.toml +++ b/testdata/catshadow.toml @@ -26,7 +26,7 @@ DataDir = "./testdata/" File = "" [Debug] - DisableDecoyTraffic = true + DisableDecoyTraffic = false #[NonvotingAuthority] # Address = "127.0.0.1:29483" From 97032c959dbccfe7c1720c607f3d5fdc709ea91d Mon Sep 17 00:00:00 2001 From: Masala Date: Fri, 23 Dec 2022 00:30:56 +0000 Subject: [PATCH 08/11] fix user supplied config without socks proxy bug --- setup.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.go b/setup.go index 13b5467..39cf312 100644 --- a/setup.go +++ b/setup.go @@ -108,7 +108,7 @@ func setupCatShadow(passphrase []byte, result chan interface{}) { // initialize default options if state.Blob == nil { state.Blob = make(map[string][]byte) - if hasTor() { + if hasTor() && len(*clientConfigFile) == 0 { state.Blob["UseTor"] = []byte{1} state.Blob["AutoConnect"] = []byte{1} } @@ -119,6 +119,7 @@ func setupCatShadow(passphrase []byte, result chan interface{}) { if len(*clientConfigFile) != 0 { // a user-supplied configuration file was specified if cfg.UpstreamProxy.Type != "socks5" { + state.Blob["UseTor"] = []byte{0} result <- errors.New("User supplied configuration and client settings mismatch! UseTor option selected without valid UpstreamProxy!") return } From 6d33d06a49c5e7a692ed3152659a9722b28a9939 Mon Sep 17 00:00:00 2001 From: Masala Date: Fri, 23 Dec 2022 14:52:20 +0000 Subject: [PATCH 09/11] WIP: pin to devel --- go.mod | 5 ++--- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index f649099..b5a6b04 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( gioui.org/x/notify v0.0.0-20211102210401-cead9283b8ff github.com/benc-uk/gofract v0.0.0-20211012214247-47caccaf3aac github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b - github.com/katzenpost/katzenpost v0.0.18-0.20221222201539-9da4dc24f641 + github.com/katzenpost/katzenpost v0.0.18-0.20221223142819-3ced03e06378 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e golang.org/x/exp/shiny v0.0.0-20220827204233-334a2380cb91 golang.org/x/image v0.0.0-20220722155232-062f8c9fd539 @@ -24,8 +24,7 @@ require ( gioui.org/cpu v0.0.0-20220307141130-bd82e69a82aa // indirect gioui.org/shader v1.0.6 // indirect git.wow.st/gmp/jni v0.0.0-20210610011705-34026c7e22d0 // indirect - github.com/BurntSushi/toml v1.0.0 // indirect - github.com/akavel/rsrc v0.10.1 // indirect + github.com/BurntSushi/toml v1.2.1 // indirect github.com/awnumar/memcall v0.1.2 // indirect github.com/awnumar/memguard v0.22.2 // indirect github.com/benoitkugler/textlayout v0.1.3 // indirect diff --git a/go.sum b/go.sum index 2ea31d5..2c6be83 100644 --- a/go.sum +++ b/go.sum @@ -14,8 +14,8 @@ gioui.org/x/notify v0.0.0-20211102210401-cead9283b8ff/go.mod h1:d+DpSD2DT24qGBFD git.wow.st/gmp/jni v0.0.0-20210610011705-34026c7e22d0 h1:bGG/g4ypjrCJoSvFrP5hafr9PPB5aw8SjcOWWila7ZI= git.wow.st/gmp/jni v0.0.0-20210610011705-34026c7e22d0/go.mod h1:+axXBRUTIDlCeE73IKeD/os7LoEnTKdkp8/gQOFjqyo= git.xx.network/elixxir/ctidh_cgo v0.0.0-20221019215055-572ef9cc61bd h1:nj2JC4yOzJfpnrh7usVEIvsQxHIxwc1asOGXxZqvrs0= -github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU= -github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak= +github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/akavel/rsrc v0.10.1 h1:hCCPImjmFKVNGpeLZyTDRHEFC283DzyTXTo0cO0Rq9o= github.com/akavel/rsrc v0.10.1/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c= @@ -82,8 +82,8 @@ github.com/katzenpost/chacha20poly1305 v0.0.0-20211026103954-7b6fb2fc0129 h1:BkX github.com/katzenpost/chacha20poly1305 v0.0.0-20211026103954-7b6fb2fc0129/go.mod h1:moU3dWG1uk4xayUNdUPs2Q3dx2Zsk5i9Ysfx+ujQrwM= github.com/katzenpost/doubleratchet v0.0.13 h1:XKm142nPgp9o7QGbJHs8o6udDSAQaaZ1BZGm63fZz4Y= github.com/katzenpost/doubleratchet v0.0.13/go.mod h1:1btKAEHf4Af7xY/SCooy5xMKE8hYWxtfaAdvzMqwGz0= -github.com/katzenpost/katzenpost v0.0.15-0.20221206173037-0e69a16ffc75 h1:ViVLGuT9Zl1wcLLyE8WbuvhBR3d0Z1BLWs+XeVt+SgY= -github.com/katzenpost/katzenpost v0.0.15-0.20221206173037-0e69a16ffc75/go.mod h1:GPm9MYwMeDyuv36vrp6pvZRaal/gZ10eEk2jGaD4Q+k= +github.com/katzenpost/katzenpost v0.0.18-0.20221223142819-3ced03e06378 h1:bK4MXy64JOgOYweQz+gJaPKeM4UcS+hyxle6vgLMDck= +github.com/katzenpost/katzenpost v0.0.18-0.20221223142819-3ced03e06378/go.mod h1:hus+Qj4T9PPkILG3rmLY9PQh6+Dt5HZ6A3Yx6W46BuY= github.com/katzenpost/noise v0.0.3 h1:bpYnozkk8j0XE1FAX9iRYgKtfIywuAINF+vMdBOidrM= github.com/katzenpost/nyquist v0.0.0-20220905145943-9f7e8b431eaf h1:iTvu+cdByoEzF1Hatwbl8AoFfTEB2ZITE2FOeJUyz78= github.com/katzenpost/nyquist v0.0.0-20220905145943-9f7e8b431eaf/go.mod h1:wzbXAL9lcBAiryER2XStcCww3HGTKl7jjzf2BCgHWrI= From d300c6575342f06f466f0b6db0488db684a3dfc7 Mon Sep 17 00:00:00 2001 From: Masala Date: Fri, 23 Dec 2022 17:49:58 +0000 Subject: [PATCH 10/11] go mod tidy --- go.mod | 7 +++---- go.sum | 14 +++++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index b5a6b04..221df5c 100644 --- a/go.mod +++ b/go.mod @@ -8,23 +8,23 @@ replace gioui.org/cmd => github.com/mixmasala/gio-cmd v0.0.0-20220915145538-a9fe require ( gioui.org v0.0.0-20220628163331-e21c665e70ae + gioui.org/cmd v0.0.0-00010101000000-000000000000 gioui.org/x/notify v0.0.0-20211102210401-cead9283b8ff github.com/benc-uk/gofract v0.0.0-20211012214247-47caccaf3aac github.com/hako/durafmt v0.0.0-20210608085754-5c1018a4e16b - github.com/katzenpost/katzenpost v0.0.18-0.20221223142819-3ced03e06378 + github.com/katzenpost/katzenpost v0.0.18-0.20221223161630-9dca135458fa github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e golang.org/x/exp/shiny v0.0.0-20220827204233-334a2380cb91 golang.org/x/image v0.0.0-20220722155232-062f8c9fd539 - golang.org/x/term v0.1.0 ) require ( filippo.io/edwards25519 v1.0.0-rc.1 // indirect - gioui.org/cmd v0.0.0-20220818080936-02068d6340fc // indirect gioui.org/cpu v0.0.0-20220307141130-bd82e69a82aa // indirect gioui.org/shader v1.0.6 // indirect git.wow.st/gmp/jni v0.0.0-20210610011705-34026c7e22d0 // indirect github.com/BurntSushi/toml v1.2.1 // indirect + github.com/akavel/rsrc v0.10.1 // indirect github.com/awnumar/memcall v0.1.2 // indirect github.com/awnumar/memguard v0.22.2 // indirect github.com/benoitkugler/textlayout v0.1.3 // indirect @@ -58,7 +58,6 @@ require ( golang.org/x/sys v0.1.0 // indirect golang.org/x/text v0.4.0 // indirect golang.org/x/tools v0.1.12 // indirect - golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect google.golang.org/protobuf v1.27.1 // indirect gopkg.in/eapache/channels.v1 v1.1.0 // indirect gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect diff --git a/go.sum b/go.sum index 2c6be83..e0b3549 100644 --- a/go.sum +++ b/go.sum @@ -33,6 +33,8 @@ github.com/benoitkugler/textlayout v0.1.3/go.mod h1:o+1hFV+JSHBC9qNLIuwVoLedERU7 github.com/benoitkugler/textlayout-testdata v0.1.1 h1:AvFxBxpfrQd8v55qH59mZOJOQjtD6K2SFe9/HvnIbJk= github.com/benoitkugler/textlayout-testdata v0.1.1/go.mod h1:i/qZl09BbUOtd7Bu/W1CAubRwTWrEXWq6JwMkw8wYxo= github.com/bwesterb/go-ristretto v1.2.2/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= +github.com/chromedp/cdproto v0.0.0-20191114225735-6626966fbae4 h1:QD3KxSJ59L2lxG6MXBjNHxiQO2RmxTQ3XcK+wO44WOg= +github.com/chromedp/chromedp v0.5.2 h1:W8xBXQuUnd2dZK0SN/lyVwsQM7KgW+kY5HGnntms194= github.com/cloudflare/circl v1.2.1-0.20220831060716-4cf0150356fc h1:307gdRLiZ08dwOIKwc5lAQ19DRFaQQvdhHalyB4Asx8= github.com/cloudflare/circl v1.2.1-0.20220831060716-4cf0150356fc/go.mod h1:+CauBF6R70Jqcyl8N2hC8pAXYbWkGIezuSbuGLtRhnw= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -51,6 +53,9 @@ github.com/go-text/typesetting v0.0.0-20220411150340-35994bc27a7b h1:WINlj3ANt+C github.com/go-text/typesetting v0.0.0-20220411150340-35994bc27a7b/go.mod h1:ZNYu5saGoMOqtkVH5T8onTwhzenDUVszI+5WFHJRaxQ= github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4 h1:qZNfIGkIANxGv/OqtnntR4DfOY2+BgwR60cAcu/i3SE= github.com/go-toast/toast v0.0.0-20190211030409-01e6764cf0a4/go.mod h1:kW3HQ4UdaAyrUCSSDR4xUzBKW6O2iA4uHhk7AtyYp10= +github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0= +github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8= +github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo= github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.5/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= @@ -82,11 +87,12 @@ github.com/katzenpost/chacha20poly1305 v0.0.0-20211026103954-7b6fb2fc0129 h1:BkX github.com/katzenpost/chacha20poly1305 v0.0.0-20211026103954-7b6fb2fc0129/go.mod h1:moU3dWG1uk4xayUNdUPs2Q3dx2Zsk5i9Ysfx+ujQrwM= github.com/katzenpost/doubleratchet v0.0.13 h1:XKm142nPgp9o7QGbJHs8o6udDSAQaaZ1BZGm63fZz4Y= github.com/katzenpost/doubleratchet v0.0.13/go.mod h1:1btKAEHf4Af7xY/SCooy5xMKE8hYWxtfaAdvzMqwGz0= -github.com/katzenpost/katzenpost v0.0.18-0.20221223142819-3ced03e06378 h1:bK4MXy64JOgOYweQz+gJaPKeM4UcS+hyxle6vgLMDck= -github.com/katzenpost/katzenpost v0.0.18-0.20221223142819-3ced03e06378/go.mod h1:hus+Qj4T9PPkILG3rmLY9PQh6+Dt5HZ6A3Yx6W46BuY= +github.com/katzenpost/katzenpost v0.0.18-0.20221223161630-9dca135458fa h1:ZwpY2l+oow5pyChGU+p68QDfrseww4gKDT/L3hv+T1g= +github.com/katzenpost/katzenpost v0.0.18-0.20221223161630-9dca135458fa/go.mod h1:hus+Qj4T9PPkILG3rmLY9PQh6+Dt5HZ6A3Yx6W46BuY= github.com/katzenpost/noise v0.0.3 h1:bpYnozkk8j0XE1FAX9iRYgKtfIywuAINF+vMdBOidrM= github.com/katzenpost/nyquist v0.0.0-20220905145943-9f7e8b431eaf h1:iTvu+cdByoEzF1Hatwbl8AoFfTEB2ZITE2FOeJUyz78= github.com/katzenpost/nyquist v0.0.0-20220905145943-9f7e8b431eaf/go.mod h1:wzbXAL9lcBAiryER2XStcCww3HGTKl7jjzf2BCgHWrI= +github.com/knq/sysutil v0.0.0-20191005231841-15668db23d08 h1:V0an7KRw92wmJysvFvtqtKMAPmvS5O0jtB0nYo6t+gs= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= @@ -96,6 +102,7 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= +github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mattn/go-pointer v0.0.1 h1:n+XhsuGeVO6MEAp7xyEukFINEa+Quek5psIR/ylA6o0= github.com/mixmasala/gio v0.0.0-20221110164814-c517124e183a h1:QtOfvyU6v44Y1NepERLC1x0Fjrpxfdkw9YwjFaevmuM= github.com/mixmasala/gio v0.0.0-20221110164814-c517124e183a/go.mod h1:GN091SCcGAfHfQiSOetXx7Abdy+8nmONj0ZN63Xxf7w= @@ -192,8 +199,6 @@ golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw= -golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -211,7 +216,6 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= From ceb70493b01570a8ec424eadcf7a0f69e0171e2d Mon Sep 17 00:00:00 2001 From: Masala Date: Fri, 23 Dec 2022 17:50:45 +0000 Subject: [PATCH 11/11] update testdata key names --- testdata/catshadow.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/testdata/catshadow.toml b/testdata/catshadow.toml index 92fe228..3595019 100644 --- a/testdata/catshadow.toml +++ b/testdata/catshadow.toml @@ -71,7 +71,7 @@ DataDir = "./testdata/" [VotingAuthority] [[VotingAuthority.Peers]] Addresses = ["127.0.0.1:21483"] - LinkPublicKeyPem = """ + LinkPublicKey = """ -----BEGIN Kyber768-X25519 PUBLIC KEY----- +WOSbmi5nJWBFx/FePcx+46MindcROtr7mMuS5aJE0r2Z6mIXASEOc5hASZZ4SDs lRU1URiBoKQRFRM0UmzgJjpUMhm4miM0ShCwJEEV1RWW5AF+1RlHa2PC7En5gI4O @@ -101,7 +101,7 @@ rJoEjFXoChJF5xWicIVxi0F3k6KTZYTCus+SlMJkVLFwmf9Ui+rDIqVwJ1C6tzKm 7pZc295vLdQ4w4gOVmGd9w== -----END Kyber768-X25519 PUBLIC KEY----- """ - IdentityPublicKeyPem = """ + IdentityPublicKey = """ -----BEGIN ED25519 SPHINCS+ PUBLIC KEY----- 3zXGXWKZeW7cgLRKZPeF73Yi0+J+BtEzfoHM1SXMqdB30p0iAy1JDzaLWPOdAJNq jWmeAbCVBJkDkRtdzghri6me5ZgEwQ3tr/OVK2Podxl3dIKP+riONi3po+D57ryg @@ -110,7 +110,7 @@ jWmeAbCVBJkDkRtdzghri6me5ZgEwQ3tr/OVK2Podxl3dIKP+riONi3po+D57ryg [[VotingAuthority.Peers]] Addresses = ["127.0.0.1:22483"] - LinkPublicKeyPem = """ + LinkPublicKey = """ -----BEGIN Kyber768-X25519 PUBLIC KEY----- XB8eD5IHOJQB8gJWTKCYAuu4rqxCf+wgKmI1VSYUJRzGu8GKIotwOXC+8zVlCpKm 8rtzdZ4hKbnO6ZrK671Fqk2xl3vyi7Ov0q6fXA7eq5yDQ435VS+MAbQRhqeQ2lq9 @@ -140,7 +140,7 @@ DItdZYMn3LUW+TrwisixXFSQG5/u4ncHBQkZZJmeiYcx4UrIY22oh1MQpa/UmLNZ TJ7QlleBWMH03LJsY2uokw== -----END Kyber768-X25519 PUBLIC KEY----- """ - IdentityPublicKeyPem = """ + IdentityPublicKey = """ -----BEGIN ED25519 SPHINCS+ PUBLIC KEY----- hgEs8udDDyojLLqsURI0HIl1kgoue5MSmHPWw1g4TFgcLQ36HIGdlJfl4CoAHzOr bxm4u7dz+tD35hAvs54V9Jrmo2yjWMzJQeT7QgHmmoWyH/O5pk6mHEsrQnHe9baY @@ -149,7 +149,7 @@ bxm4u7dz+tD35hAvs54V9Jrmo2yjWMzJQeT7QgHmmoWyH/O5pk6mHEsrQnHe9baY [[VotingAuthority.Peers]] Addresses = ["127.0.0.1:23483"] - LinkPublicKeyPem = """ + LinkPublicKey = """ -----BEGIN Kyber768-X25519 PUBLIC KEY----- xYaM/pX6HwZsFqbpwDU9JYcQ6KSj3YD5lfpHgE7BOhVr1C2eincbO8eyCk/k1oWG KcbWFGp6Gjic6ytaxgnvWVpq+beNIT1PXCk8XKhe57/hAbfCAY3rrJpFoLvciD+E @@ -179,7 +179,7 @@ canqB2SXsVTgcF6mDE054jd5NHu4om+DikAkiijippO2WfVKXjyk3KkU/6+7tWun J36qY23I6qGScGjq4tPu3w== -----END Kyber768-X25519 PUBLIC KEY----- """ - IdentityPublicKeyPem = """ + IdentityPublicKey = """ -----BEGIN ED25519 SPHINCS+ PUBLIC KEY----- F9mrgVb9WMGRl6XvHQcMFBVa5zLXdUxlRRDSsG9ZdQwrSCz4tPwiMhn+eFSjdOk1 1vr7lFe3GYwSFA3xy9IDSzyKS2cDWT45FOiiOQqWMBmAI0MEma81dwkTb77a7cd1