idk/sam-forwarder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

log even more, force key regeneration when save is not selected

Browse Source
This commit is contained in:
idk
2019-02-09 19:50:47 -05:00
parent ac76fc7a5c
commit 8b4b86b3ee
7 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
README.md.asc
View File

@ -131,12 +131,12 @@ Donate
BTC:159M8MEUwhTzE9RXmcZxtigKaEjgfwRbHt BTC:159M8MEUwhTzE9RXmcZxtigKaEjgfwRbHt
-----BEGIN PGP SIGNATURE----- -----BEGIN PGP SIGNATURE-----
iQEzBAEBCgAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAlxfYwMACgkQ11wDs5te iQEzBAEBCgAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAlxfdWIACgkQ11wDs5te
FOGGBAf+KZ0HykyBh7xajpRfUTxvP/2vUtVipvZ40OQNEd/3JHebke4stCqllFO+ FOH2Hwf+L63UsgKujukILs6/vPFe5rTvqVpM1NXko+49KcI8M0toiOS3Fqq66n4R
7xRqGWJPzEj439hfHaS268NAiEWRLoi0gNLEhmWkc/OfmaIxyKo0UD3Yp1CirvES o3iy7bKR9W0wlkbvXrhCAI6QHT4C4Rv3lneN18+Lw3L5l7AzbSqa/+nHGj7IoVg3
oLAYguijKjFRiIVfnHCLb+tWvTZM51WZ0Jza+aRQkb0yUN5JK6ORsYhqE7wjyJMi 5U8IH0HRv3LvAA4PJhmYmKCU/zO0Cblc8n1hFtVlT6Xby4NUNypqVRh9SK9NFg+i
sN/w+9o03C9pe90LjwiFKQ7TOXDqbWARsFctfRuoqHJLn5MaGfsGqwB4k6cV4oG7 AcenunoBMD6ggYR0nEZ9gKRW2LNY7+0kGc4oCwckQ5I9j1PIbhpwsQjVunLEUmd+
PongF7M1uS9zNiNEVKo6+vvGIhQMNNVcwWJjvA35rROs0t01VcXfHROJzZ5jQTI2 x1fFd4gzt4mnih06XkyVNbggMZQmgJ+BRv5kBMBlpfzrSsaFcolRRrvNeua2uLWm
NmoREqEn6mBLPueXuL80GROnRxgs5g== 3RZgd29GUvDU7OPALdbUcy0+a0Q6+g==
=fPec =0nQN
-----END PGP SIGNATURE----- -----END PGP SIGNATURE-----

2
forwarder-client.go
View File

@ -295,7 +295,7 @@ func NewSAMClientForwarderFromOptions(opts ...func(*SAMClientForwarder) error) (
if s.save { if s.save {
log.Println("Saving i2p keys") log.Println("Saving i2p keys")
} }
if s.SamKeys, err = i2pkeys.Load(s.FilePath, s.TunName, s.passfile, s.samConn); err != nil { if s.SamKeys, err = i2pkeys.Load(s.FilePath, s.TunName, s.passfile, s.samConn, s.save); err != nil {
return nil, err return nil, err
} }
log.Println("Destination keys generated, tunnel name:", s.TunName) log.Println("Destination keys generated, tunnel name:", s.TunName)

2
forwarder.go
View File

@ -400,7 +400,7 @@ func NewSAMForwarderFromOptions(opts ...func(*SAMForwarder) error) (*SAMForwarde
if s.save { if s.save {
log.Println("Saving i2p keys") log.Println("Saving i2p keys")
} }
if s.SamKeys, err = i2pkeys.Load(s.FilePath, s.TunName, s.passfile, s.samConn); err != nil { if s.SamKeys, err = i2pkeys.Load(s.FilePath, s.TunName, s.passfile, s.samConn, s.save); err != nil {
return nil, err return nil, err
} }
log.Println("Destination keys generated, tunnel name:", s.TunName) log.Println("Destination keys generated, tunnel name:", s.TunName)

5
i2pkeys/common.go
View File

@ -54,7 +54,10 @@ func Save(FilePath, TunName, passfile string, SamKeys sam3.I2PKeys) error {
return nil return nil
} }
func Load(FilePath, TunName, passfile string, samConn *sam3.SAM) (sam3.I2PKeys, error) { func Load(FilePath, TunName, passfile string, samConn *sam3.SAM, save bool) (sam3.I2PKeys, error) {
if ! save {
return samConn.NewKeys()
}
if _, err := os.Stat(filepath.Join(FilePath, TunName+".i2pkeys")); os.IsNotExist(err) { if _, err := os.Stat(filepath.Join(FilePath, TunName+".i2pkeys")); os.IsNotExist(err) {
log.Println("Generating keys from SAM bridge") log.Println("Generating keys from SAM bridge")
SamKeys, err := samConn.NewKeys() SamKeys, err := samConn.NewKeys()

4
i2pkeys/common_test.go
View File

@ -15,7 +15,7 @@ func TestKeysGenLoad(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
log.Println("Initialized SAM connection") log.Println("Initialized SAM connection")
sk, err := Load("./", "test", "", sc) sk, err := Load("./", "test", "", sc, true)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -32,7 +32,7 @@ func TestKeysGenLoadAgain(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
log.Println("Saved tunnel keys") log.Println("Saved tunnel keys")
sk, err := Load("./", "test", "", sc) sk, err := Load("./", "test", "", sc, true)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

2
udp/forwarder-client-udp.go
View File

@ -296,7 +296,7 @@ func NewSAMSSUClientForwarderFromOptions(opts ...func(*SAMSSUClientForwarder) er
if s.save { if s.save {
log.Println("Saving i2p keys") log.Println("Saving i2p keys")
} }
if s.SamKeys, err = i2pkeys.Load(s.FilePath, s.TunName, s.passfile, s.samConn); err != nil { if s.SamKeys, err = i2pkeys.Load(s.FilePath, s.TunName, s.passfile, s.samConn, s.save); err != nil {
return nil, err return nil, err
} }
log.Println("Destination keys generated, tunnel name:", s.TunName) log.Println("Destination keys generated, tunnel name:", s.TunName)

2
udp/forwarder-udp.go
View File

@ -292,7 +292,7 @@ func NewSAMSSUForwarderFromOptions(opts ...func(*SAMSSUForwarder) error) (*SAMSS
if s.save { if s.save {
log.Println("Saving i2p keys") log.Println("Saving i2p keys")
} }
if s.SamKeys, err = i2pkeys.Load(s.FilePath, s.TunName, s.passfile, s.samConn); err != nil { if s.SamKeys, err = i2pkeys.Load(s.FilePath, s.TunName, s.passfile, s.samConn, s.save); err != nil {
return nil, err return nil, err
} }
log.Println("Destination keys generated, tunnel name:", s.TunName) log.Println("Destination keys generated, tunnel name:", s.TunName)