go-i2p/i2pkeys
1
0
Fork 0
mirror of https://github.com/go-i2p/i2pkeys.git synced 2025-06-08 09:16:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add ability to pass different flags to the DEST GENERATE function

Browse Source
This commit is contained in:
eyedeekay
2024-12-08 15:48:46 -05:00
parent 8e42fd9a18
commit 9694fe011c
5 changed files with 128 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
I2PAddr.go
View File

@ -13,7 +13,6 @@ const (
// Domain suffixes // Domain suffixes
I2PDomainSuffix = ".i2p" I2PDomainSuffix = ".i2p"
B32DomainSuffix = ".b32.i2p"
) )
// I2PAddr represents an I2P destination, equivalent to an IP address. // I2PAddr represents an I2P destination, equivalent to an IP address.
@ -66,8 +65,8 @@ func validateAddressFormat(addr string) error {
len(addr), MinAddressLength, MaxAddressLength) len(addr), MinAddressLength, MaxAddressLength)
} }
if strings.HasSuffix(addr, B32DomainSuffix) { if strings.HasSuffix(addr, B32Suffix) {
return fmt.Errorf("cannot convert %s to full destination", B32DomainSuffix) return fmt.Errorf("cannot convert %s to full destination", B32Suffix)
} }
return nil return nil

16
NewI2PKeys.go
View File

@ -16,7 +16,7 @@ const (
maxResponseSize = 4096 maxResponseSize = 4096
cmdHello = "HELLO VERSION MIN=3.1 MAX=3.1\n" cmdHello = "HELLO VERSION MIN=3.1 MAX=3.1\n"
cmdGenerate = "DEST GENERATE SIGNATURE_TYPE=7\n" cmdGenerate = "DEST GENERATE SIGNATURE_TYPE=%s\n"
responseOK = "RESULT=OK" responseOK = "RESULT=OK"
pubKeyPrefix = "PUB=" pubKeyPrefix = "PUB="
privKeyPrefix = "PRIV=" privKeyPrefix = "PRIV="
@ -44,16 +44,19 @@ func newSAMClient(options ...func(*samClient)) *samClient {
// NewDestination generates a new I2P destination using the SAM bridge. // NewDestination generates a new I2P destination using the SAM bridge.
// This is the only public function that external code should use. // This is the only public function that external code should use.
func NewDestination() (*I2PKeys, error) { func NewDestination(keyType ...string) (*I2PKeys, error) {
ctx, cancel := context.WithTimeout(context.Background(), defaultTimeout) ctx, cancel := context.WithTimeout(context.Background(), defaultTimeout)
defer cancel() defer cancel()
if keyType == nil {
keyType = []string{"7"}
}
client := newSAMClient() client := newSAMClient()
return client.generateDestination(ctx) return client.generateDestination(ctx, keyType[0])
} }
// generateDestination handles the key generation process // generateDestination handles the key generation process
func (c *samClient) generateDestination(ctx context.Context) (*I2PKeys, error) { func (c *samClient) generateDestination(ctx context.Context, keyType string) (*I2PKeys, error) {
conn, err := c.dial(ctx) conn, err := c.dial(ctx)
if err != nil { if err != nil {
return nil, fmt.Errorf("connecting to SAM bridge: %w", err) return nil, fmt.Errorf("connecting to SAM bridge: %w", err)
@ -64,7 +67,7 @@ func (c *samClient) generateDestination(ctx context.Context) (*I2PKeys, error) {
return nil, fmt.Errorf("SAM handshake failed: %w", err) return nil, fmt.Errorf("SAM handshake failed: %w", err)
} }
keys, err := c.generateKeys(ctx, conn) keys, err := c.generateKeys(ctx, conn, keyType)
if err != nil { if err != nil {
return nil, fmt.Errorf("generating keys: %w", err) return nil, fmt.Errorf("generating keys: %w", err)
} }
@ -98,7 +101,8 @@ func (c *samClient) handshake(ctx context.Context, conn net.Conn) error {
return nil return nil
} }
func (c *samClient) generateKeys(ctx context.Context, conn net.Conn) (*I2PKeys, error) { func (c *samClient) generateKeys(ctx context.Context, conn net.Conn, keyType string) (*I2PKeys, error) {
cmdGenerate := fmt.Sprintf(cmdGenerate, keyType)
if err := c.writeCommand(conn, cmdGenerate); err != nil { if err := c.writeCommand(conn, cmdGenerate); err != nil {
return nil, err return nil, err
} }