idk/go-i2p
1
0
Fork 0
mirror of https://github.com/go-i2p/go-i2p.git synced 2025-06-08 18:41:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

expanded logging in lease_set.go

Browse Source
This commit is contained in:
Haris Khan
2024-10-18 12:55:35 -04:00
parent b894e8fb17
commit a2fd65ee32
1 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
lib/common/lease_set/lease_set.go
View File

@ -3,6 +3,8 @@ package lease_set
import ( import (
"errors" "errors"
"github.com/go-i2p/go-i2p/lib/util/logger"
"github.com/sirupsen/logrus"
. "github.com/go-i2p/go-i2p/lib/common/certificate" . "github.com/go-i2p/go-i2p/lib/common/certificate"
. "github.com/go-i2p/go-i2p/lib/common/data" . "github.com/go-i2p/go-i2p/lib/common/data"
@ -12,9 +14,10 @@ import (
. "github.com/go-i2p/go-i2p/lib/common/lease" . "github.com/go-i2p/go-i2p/lib/common/lease"
. "github.com/go-i2p/go-i2p/lib/common/signature" . "github.com/go-i2p/go-i2p/lib/common/signature"
"github.com/go-i2p/go-i2p/lib/crypto" "github.com/go-i2p/go-i2p/lib/crypto"
log "github.com/sirupsen/logrus"
) )
var log = logger.GetLogger()
// Sizes of various structures in an I2P LeaseSet // Sizes of various structures in an I2P LeaseSet
const ( const (
LEASE_SET_PUBKEY_SIZE = 256 LEASE_SET_PUBKEY_SIZE = 256
@ -134,9 +137,15 @@ type LeaseSet struct {
func (lease_set LeaseSet) Destination() (destination Destination, err error) { func (lease_set LeaseSet) Destination() (destination Destination, err error) {
keys_and_cert, _, err := ReadKeysAndCert(lease_set) keys_and_cert, _, err := ReadKeysAndCert(lease_set)
if err != nil { if err != nil {
log.WithError(err).Error("Failed to read KeysAndCert from LeaseSet")
return return
} }
destination, _, err = ReadDestination(keys_and_cert.Bytes()) destination, _, err = ReadDestination(keys_and_cert.Bytes())
if err != nil {
log.WithError(err).Error("Failed to read Destination from KeysAndCert")
} else {
log.Debug("Successfully retrieved Destination from LeaseSet")
}
return return
} }
@ -146,7 +155,7 @@ func (lease_set LeaseSet) PublicKey() (public_key crypto.ElgPublicKey, err error
_, remainder, err := ReadKeysAndCert(lease_set) _, remainder, err := ReadKeysAndCert(lease_set)
remainder_len := len(remainder) remainder_len := len(remainder)
if remainder_len < LEASE_SET_PUBKEY_SIZE { if remainder_len < LEASE_SET_PUBKEY_SIZE {
log.WithFields(log.Fields{ log.WithFields(logrus.Fields{
"at": "(LeaseSet) PublicKey", "at": "(LeaseSet) PublicKey",
"data_len": remainder_len, "data_len": remainder_len,
"required_len": LEASE_SET_PUBKEY_SIZE, "required_len": LEASE_SET_PUBKEY_SIZE,
@ -157,25 +166,29 @@ func (lease_set LeaseSet) PublicKey() (public_key crypto.ElgPublicKey, err error
return return
} }
copy(public_key[:], remainder[:LEASE_SET_PUBKEY_SIZE]) copy(public_key[:], remainder[:LEASE_SET_PUBKEY_SIZE])
log.Debug("Successfully retrieved PublicKey from LeaseSet")
return return
} }
// SigningKey returns the signing public key as crypto.SigningPublicKey. // SigningKey returns the signing public key as crypto.SigningPublicKey.
// returns errors encountered during parsing. // returns errors encountered during parsing.
func (lease_set LeaseSet) SigningKey() (signing_public_key crypto.SigningPublicKey, err error) { func (lease_set LeaseSet) SigningKey() (signing_public_key crypto.SigningPublicKey, err error) {
log.Debug("Retrieving SigningKey from LeaseSet")
destination, err := lease_set.Destination() destination, err := lease_set.Destination()
if err != nil { if err != nil {
log.WithError(err).Error("Failed to retrieve Destination for SigningKey")
return return
} }
offset := len(destination.Bytes()) + LEASE_SET_PUBKEY_SIZE offset := len(destination.Bytes()) + LEASE_SET_PUBKEY_SIZE
cert := destination.Certificate() cert := destination.Certificate()
cert_len := cert.Length() cert_len := cert.Length()
if err != nil { if err != nil {
log.WithError(err).Error("Failed to get Certificate length")
return return
} }
lease_set_len := len(lease_set) lease_set_len := len(lease_set)
if lease_set_len < offset+LEASE_SET_SPK_SIZE { if lease_set_len < offset+LEASE_SET_SPK_SIZE {
log.WithFields(log.Fields{ log.WithFields(logrus.Fields{
"at": "(LeaseSet) SigningKey", "at": "(LeaseSet) SigningKey",
"data_len": lease_set_len, "data_len": lease_set_len,
"required_len": offset + LEASE_SET_SPK_SIZE, "required_len": offset + LEASE_SET_SPK_SIZE,
@ -190,6 +203,7 @@ func (lease_set LeaseSet) SigningKey() (signing_public_key crypto.SigningPublicK
var dsa_pk crypto.DSAPublicKey var dsa_pk crypto.DSAPublicKey
copy(dsa_pk[:], lease_set[offset:offset+LEASE_SET_SPK_SIZE]) copy(dsa_pk[:], lease_set[offset:offset+LEASE_SET_SPK_SIZE])
signing_public_key = dsa_pk signing_public_key = dsa_pk
log.Debug("Retrieved legacy DSA SHA1 SigningPublicKey")
} else { } else {
// A Certificate is present in this LeaseSet's Destination // A Certificate is present in this LeaseSet's Destination
cert_type := cert.Type() cert_type := cert.Type()
@ -200,14 +214,19 @@ func (lease_set LeaseSet) SigningKey() (signing_public_key crypto.SigningPublicK
signing_public_key, err = KeyCertificateFromCertificate(cert).ConstructSigningPublicKey( signing_public_key, err = KeyCertificateFromCertificate(cert).ConstructSigningPublicKey(
lease_set[offset : offset+LEASE_SET_SPK_SIZE], lease_set[offset : offset+LEASE_SET_SPK_SIZE],
) )
if err != nil {
log.WithError(err).Error("Failed to construct SigningPublicKey from KeyCertificate")
} else {
log.Debug("Retrieved SigningPublicKey from KeyCertificate")
}
} else { } else {
// No Certificate is present, return the LEASE_SET_SPK_SIZE byte // No Certificate is present, return the LEASE_SET_SPK_SIZE byte
// SigningPublicKey space as legacy DSA SHA1 SigningPublicKey. // SigningPublicKey space as legacy DSA SHA1 SigningPublicKey.
var dsa_pk crypto.DSAPublicKey var dsa_pk crypto.DSAPublicKey
copy(dsa_pk[:], lease_set[offset:offset+LEASE_SET_SPK_SIZE]) copy(dsa_pk[:], lease_set[offset:offset+LEASE_SET_SPK_SIZE])
signing_public_key = dsa_pk signing_public_key = dsa_pk
log.Debug("Retrieved legacy DSA SHA1 SigningPublicKey (Certificate present but not Key Certificate)")
} }
} }
return return
} }
@ -215,13 +234,15 @@ func (lease_set LeaseSet) SigningKey() (signing_public_key crypto.SigningPublicK
// LeaseCount returns the numbert of leases specified by the LeaseCount value as int. // LeaseCount returns the numbert of leases specified by the LeaseCount value as int.
// returns errors encountered during parsing. // returns errors encountered during parsing.
func (lease_set LeaseSet) LeaseCount() (count int, err error) { func (lease_set LeaseSet) LeaseCount() (count int, err error) {
log.Debug("Retrieving LeaseCount from LeaseSet")
_, remainder, err := ReadKeysAndCert(lease_set) _, remainder, err := ReadKeysAndCert(lease_set)
if err != nil { if err != nil {
log.WithError(err).Error("Failed to read KeysAndCert for LeaseCount")
return return
} }
remainder_len := len(remainder) remainder_len := len(remainder)
if remainder_len < LEASE_SET_PUBKEY_SIZE+LEASE_SET_SPK_SIZE+1 { if remainder_len < LEASE_SET_PUBKEY_SIZE+LEASE_SET_SPK_SIZE+1 {
log.WithFields(log.Fields{ log.WithFields(logrus.Fields{
"at": "(LeaseSet) LeaseCount", "at": "(LeaseSet) LeaseCount",
"data_len": remainder_len, "data_len": remainder_len,
"required_len": LEASE_SET_PUBKEY_SIZE + LEASE_SET_SPK_SIZE + 1, "required_len": LEASE_SET_PUBKEY_SIZE + LEASE_SET_SPK_SIZE + 1,
@ -233,12 +254,14 @@ func (lease_set LeaseSet) LeaseCount() (count int, err error) {
c := Integer([]byte{remainder[LEASE_SET_PUBKEY_SIZE+LEASE_SET_SPK_SIZE]}) c := Integer([]byte{remainder[LEASE_SET_PUBKEY_SIZE+LEASE_SET_SPK_SIZE]})
count = c.Int() count = c.Int()
if count > 16 { if count > 16 {
log.WithFields(log.Fields{ log.WithFields(logrus.Fields{
"at": "(LeaseSet) LeaseCount", "at": "(LeaseSet) LeaseCount",
"lease_count": count, "lease_count": count,
"reason": "more than 16 leases", "reason": "more than 16 leases",
}).Warn("invalid lease set") }).Warn("invalid lease set")
err = errors.New("invalid lease set: more than 16 leases") err = errors.New("invalid lease set: more than 16 leases")
} else {
log.WithField("lease_count", count).Debug("Retrieved LeaseCount from LeaseSet")
} }
return return
} }
@ -246,13 +269,16 @@ func (lease_set LeaseSet) LeaseCount() (count int, err error) {
// Leases returns the leases as []Lease. // Leases returns the leases as []Lease.
// returns errors encountered during parsing. // returns errors encountered during parsing.
func (lease_set LeaseSet) Leases() (leases []Lease, err error) { func (lease_set LeaseSet) Leases() (leases []Lease, err error) {
log.Debug("Retrieving Leases from LeaseSet")
destination, err := lease_set.Destination() destination, err := lease_set.Destination()
if err != nil { if err != nil {
log.WithError(err).Error("Failed to retrieve Destination for Leases")
return return
} }
offset := len(destination.Bytes()) + LEASE_SET_PUBKEY_SIZE + LEASE_SET_SPK_SIZE + 1 offset := len(destination.Bytes()) + LEASE_SET_PUBKEY_SIZE + LEASE_SET_SPK_SIZE + 1
count, err := lease_set.LeaseCount() count, err := lease_set.LeaseCount()
if err != nil { if err != nil {
log.WithError(err).Error("Failed to retrieve LeaseCount for Leases")
return return
} }
for i := 0; i < count; i++ { for i := 0; i < count; i++ {
@ -260,7 +286,7 @@ func (lease_set LeaseSet) Leases() (leases []Lease, err error) {
end := start + LEASE_SIZE end := start + LEASE_SIZE
lease_set_len := len(lease_set) lease_set_len := len(lease_set)
if lease_set_len < end { if lease_set_len < end {
log.WithFields(log.Fields{ log.WithFields(logrus.Fields{
"at": "(LeaseSet) Leases", "at": "(LeaseSet) Leases",
"data_len": lease_set_len, "data_len": lease_set_len,
"required_len": end, "required_len": end,
@ -273,18 +299,22 @@ func (lease_set LeaseSet) Leases() (leases []Lease, err error) {
copy(lease[:], lease_set[start:end]) copy(lease[:], lease_set[start:end])
leases = append(leases, lease) leases = append(leases, lease)
} }
log.WithField("lease_count", len(leases)).Debug("Retrieved Leases from LeaseSet")
return return
} }
// Signature returns the signature as Signature. // Signature returns the signature as Signature.
// returns errors encountered during parsing. // returns errors encountered during parsing.
func (lease_set LeaseSet) Signature() (signature Signature, err error) { func (lease_set LeaseSet) Signature() (signature Signature, err error) {
log.Debug("Retrieving Signature from LeaseSet")
destination, err := lease_set.Destination() destination, err := lease_set.Destination()
if err != nil { if err != nil {
log.WithError(err).Error("Failed to retrieve Destination for Signature")
return return
} }
lease_count, err := lease_set.LeaseCount() lease_count, err := lease_set.LeaseCount()
if err != nil { if err != nil {
log.WithError(err).Error("Failed to retrieve LeaseCount for Signature")
return return
} }
start := len(destination.Bytes()) + start := len(destination.Bytes()) +
@ -302,7 +332,7 @@ func (lease_set LeaseSet) Signature() (signature Signature, err error) {
} }
lease_set_len := len(lease_set) lease_set_len := len(lease_set)
if lease_set_len < end { if lease_set_len < end {
log.WithFields(log.Fields{ log.WithFields(logrus.Fields{
"at": "(LeaseSet) Signature", "at": "(LeaseSet) Signature",
"data_len": lease_set_len, "data_len": lease_set_len,
"required_len": end, "required_len": end,
@ -312,11 +342,13 @@ func (lease_set LeaseSet) Signature() (signature Signature, err error) {
return return
} }
signature = []byte(lease_set[start:end]) signature = []byte(lease_set[start:end])
log.WithField("signature_length", len(signature)).Debug("Retrieved Signature from LeaseSet")
return return
} }
// Verify returns nil // Verify returns nil
func (lease_set LeaseSet) Verify() error { func (lease_set LeaseSet) Verify() error {
log.Debug("Verifying LeaseSet")
//data_end := len(destination) + //data_end := len(destination) +
// LEASE_SET_PUBKEY_SIZE + // LEASE_SET_PUBKEY_SIZE +
// LEASE_SET_SPK_SIZE + // LEASE_SET_SPK_SIZE +
@ -330,14 +362,17 @@ func (lease_set LeaseSet) Verify() error {
//if err != nil { //if err != nil {
// return err // return err
//} //}
log.Warn("LeaseSet verification not implemented")
return nil // verifier.Verify(data, lease_set.Signature()) return nil // verifier.Verify(data, lease_set.Signature())
} }
// NewestExpiration returns the newest lease expiration as an I2P Date. // NewestExpiration returns the newest lease expiration as an I2P Date.
// Returns errors encountered during parsing. // Returns errors encountered during parsing.
func (lease_set LeaseSet) NewestExpiration() (newest Date, err error) { func (lease_set LeaseSet) NewestExpiration() (newest Date, err error) {
log.Debug("Finding newest expiration in LeaseSet")
leases, err := lease_set.Leases() leases, err := lease_set.Leases()
if err != nil { if err != nil {
log.WithError(err).Error("Failed to retrieve Leases for NewestExpiration")
return return
} }
newest = Date{0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} newest = Date{0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
@ -347,14 +382,17 @@ func (lease_set LeaseSet) NewestExpiration() (newest Date, err error) {
newest = date newest = date
} }
} }
log.WithField("newest_expiration", newest.Time()).Debug("Found newest expiration in LeaseSet")
return return
} }
// OldestExpiration returns the oldest lease expiration as an I2P Date. // OldestExpiration returns the oldest lease expiration as an I2P Date.
// Returns errors encountered during parsing. // Returns errors encountered during parsing.
func (lease_set LeaseSet) OldestExpiration() (earliest Date, err error) { func (lease_set LeaseSet) OldestExpiration() (earliest Date, err error) {
log.Debug("Finding oldest expiration in LeaseSet")
leases, err := lease_set.Leases() leases, err := lease_set.Leases()
if err != nil { if err != nil {
log.WithError(err).Error("Failed to retrieve Leases for OldestExpiration")
return return
} }
earliest = Date{0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff} earliest = Date{0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}
@ -364,5 +402,6 @@ func (lease_set LeaseSet) OldestExpiration() (earliest Date, err error) {
earliest = date earliest = date
} }
} }
log.WithField("oldest_expiration", earliest.Time()).Debug("Found oldest expiration in LeaseSet")
return return
} }