Skip to content
Snippets Groups Projects
Commit 688379c9 authored by Josh Brooks's avatar Josh Brooks
Browse files

Merge branch 'hotfix/NoUdbAuth' into 'release'

Hotfix/no udb auth

See merge request !9
parents 33fd046a 746a0774
No related branches found
No related tags found
2 merge requests!23Release,!9Hotfix/no udb auth
...@@ -307,6 +307,11 @@ func LoginWithNewBaseNDF_UNSAFE(storageDir string, password []byte, ...@@ -307,6 +307,11 @@ func LoginWithNewBaseNDF_UNSAFE(storageDir string, password []byte,
// initialize the auth tracker // initialize the auth tracker
c.auth = auth.NewManager(c.switchboard, c.storage, c.network) c.auth = auth.NewManager(c.switchboard, c.storage, c.network)
err = c.registerFollower()
if err != nil {
return nil, err
}
return c, nil return c, nil
} }
......
...@@ -84,8 +84,10 @@ var singleCmd = &cobra.Command{ ...@@ -84,8 +84,10 @@ var singleCmd = &cobra.Command{
callbackChan <- responseCallbackChan{payload, c} callbackChan <- responseCallbackChan{payload, c}
} }
singleMng.RegisterCallback(tag, callback) singleMng.RegisterCallback(tag, callback)
client.AddService(singleMng.StartProcesses) err = client.AddService(singleMng.StartProcesses)
if err != nil {
jww.FATAL.Panicf("Could not add single use process: %+v", err)
}
timeout := viper.GetDuration("timeout") timeout := viper.GetDuration("timeout")
// If the send flag is set, then send a message // If the send flag is set, then send a message
......
...@@ -74,7 +74,10 @@ var udCmd = &cobra.Command{ ...@@ -74,7 +74,10 @@ var udCmd = &cobra.Command{
// Make single-use manager and start receiving process // Make single-use manager and start receiving process
singleMng := single.NewManager(client) singleMng := single.NewManager(client)
client.AddService(singleMng.StartProcesses) err = client.AddService(singleMng.StartProcesses)
if err != nil {
jww.FATAL.Panicf("Failed to add single use process: %+v", err)
}
// Make user discovery manager // Make user discovery manager
userDiscoveryMgr, err := ud.NewManager(client, singleMng) userDiscoveryMgr, err := ud.NewManager(client, singleMng)
......
...@@ -17,7 +17,7 @@ require ( ...@@ -17,7 +17,7 @@ require (
github.com/spf13/jwalterweatherman v1.1.0 github.com/spf13/jwalterweatherman v1.1.0
github.com/spf13/viper v1.7.1 github.com/spf13/viper v1.7.1
gitlab.com/elixxir/bloomfilter v0.0.0-20200930191214-10e9ac31b228 gitlab.com/elixxir/bloomfilter v0.0.0-20200930191214-10e9ac31b228
gitlab.com/elixxir/comms v0.0.4-0.20210813172950-d9be85bbd52d gitlab.com/elixxir/comms v0.0.4-0.20210818165710-59b7caa0a21b
gitlab.com/elixxir/crypto v0.0.7-0.20210803232056-ba3ff44cc618 gitlab.com/elixxir/crypto v0.0.7-0.20210803232056-ba3ff44cc618
gitlab.com/elixxir/ekv v0.1.5 gitlab.com/elixxir/ekv v0.1.5
gitlab.com/elixxir/primitives v0.0.3-0.20210803231939-7b924f78eaac gitlab.com/elixxir/primitives v0.0.3-0.20210803231939-7b924f78eaac
......
...@@ -253,6 +253,8 @@ gitlab.com/elixxir/bloomfilter v0.0.0-20200930191214-10e9ac31b228 h1:Gi6rj4mAlK0 ...@@ -253,6 +253,8 @@ gitlab.com/elixxir/bloomfilter v0.0.0-20200930191214-10e9ac31b228 h1:Gi6rj4mAlK0
gitlab.com/elixxir/bloomfilter v0.0.0-20200930191214-10e9ac31b228/go.mod h1:H6jztdm0k+wEV2QGK/KYA+MY9nj9Zzatux/qIvDDv3k= gitlab.com/elixxir/bloomfilter v0.0.0-20200930191214-10e9ac31b228/go.mod h1:H6jztdm0k+wEV2QGK/KYA+MY9nj9Zzatux/qIvDDv3k=
gitlab.com/elixxir/comms v0.0.4-0.20210813172950-d9be85bbd52d h1:88rpXvSS9EXrQ9LyMKJbaWp5/e3PQXFJqmNQGfvwGbk= gitlab.com/elixxir/comms v0.0.4-0.20210813172950-d9be85bbd52d h1:88rpXvSS9EXrQ9LyMKJbaWp5/e3PQXFJqmNQGfvwGbk=
gitlab.com/elixxir/comms v0.0.4-0.20210813172950-d9be85bbd52d/go.mod h1:1fHnPjj5Sv2qfnQplu8+BKlehQy54vtgM7khp5axXMU= gitlab.com/elixxir/comms v0.0.4-0.20210813172950-d9be85bbd52d/go.mod h1:1fHnPjj5Sv2qfnQplu8+BKlehQy54vtgM7khp5axXMU=
gitlab.com/elixxir/comms v0.0.4-0.20210818165710-59b7caa0a21b h1:upXcxqq423BtEeJzfQ3j4tJHCyZZEsAKCp9WfczpGl8=
gitlab.com/elixxir/comms v0.0.4-0.20210818165710-59b7caa0a21b/go.mod h1:1fHnPjj5Sv2qfnQplu8+BKlehQy54vtgM7khp5axXMU=
gitlab.com/elixxir/crypto v0.0.0-20200804182833-984246dea2c4/go.mod h1:ucm9SFKJo+K0N2GwRRpaNr+tKXMIOVWzmyUD0SbOu2c= gitlab.com/elixxir/crypto v0.0.0-20200804182833-984246dea2c4/go.mod h1:ucm9SFKJo+K0N2GwRRpaNr+tKXMIOVWzmyUD0SbOu2c=
gitlab.com/elixxir/crypto v0.0.3/go.mod h1:ZNgBOblhYToR4m8tj4cMvJ9UsJAUKq+p0gCp07WQmhA= gitlab.com/elixxir/crypto v0.0.3/go.mod h1:ZNgBOblhYToR4m8tj4cMvJ9UsJAUKq+p0gCp07WQmhA=
gitlab.com/elixxir/crypto v0.0.7-0.20210803232056-ba3ff44cc618 h1:Z1SI2a8mXP4Zf2xfhURT1Hbmtq3tufTdebNLgCdlufg= gitlab.com/elixxir/crypto v0.0.7-0.20210803232056-ba3ff44cc618 h1:Z1SI2a8mXP4Zf2xfhURT1Hbmtq3tufTdebNLgCdlufg=
......
...@@ -94,6 +94,7 @@ func NewManager(client *api.Client, single *single.Manager) (*Manager, error) { ...@@ -94,6 +94,7 @@ func NewManager(client *api.Client, single *single.Manager) (*Manager, error) {
hp.KaClientOpts.Time = time.Duration(math.MaxInt64) hp.KaClientOpts.Time = time.Duration(math.MaxInt64)
hp.MaxRetries = 3 hp.MaxRetries = 3
hp.SendTimeout = 3 * time.Second hp.SendTimeout = 3 * time.Second
hp.AuthEnabled = false
m.host, err = m.comms.AddHost(&id.UDB, def.UDB.Address, []byte(def.UDB.Cert), hp) m.host, err = m.comms.AddHost(&id.UDB, def.UDB.Address, []byte(def.UDB.Cert), hp)
if err != nil { if err != nil {
return nil, errors.WithMessage(err, "User Discovery host object could "+ return nil, errors.WithMessage(err, "User Discovery host object could "+
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment