idk/Go_I2p
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Setup up VSCodium

Browse Source
This commit is contained in:
idk
2021-10-22 17:17:55 -04:00
parent c181a974cd
commit bffc1dfe38
6 changed files with 45 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -5,4 +5,4 @@
*.coverprofile
*exportable-fuzz.zip
go-i2p
*.exe
*.exe*.log

7
.vscode/launch.json vendored Normal file
View File

@ -0,0 +1,7 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": []
}

3
Makefile
View File

@ -26,3 +26,6 @@ clean:
fmt:
find . -name '*.go' -exec gofmt -w -s {} \;
testcommon:
$(GO) test -v -failfast ./lib/common/...

15
lib/common/certificate.go
View File

@ -28,6 +28,7 @@ payload :: data
import (
"errors"
log "github.com/sirupsen/logrus"
)
@ -148,7 +149,6 @@ func (certificate Certificate) Data() (data []byte, err error) {
return
}
}
return
}
@ -174,9 +174,16 @@ func ReadCertificate(data []byte) (certificate *Certificate, remainder []byte, e
} else {
certificate.CertLen, err = NewInteger(data[1:CERT_MIN_SIZE])
// _, err = certificate.Type()
// if err != nil {
// return
// }
if err != nil {
//return
log.WithFields(log.Fields{
"at": "(Certificate) ReadCertificate",
"certificate_bytes_length": cert_len,
"certificate_min_size": CERT_MIN_SIZE,
"reason": "certificate size is invalid",
}).Warn("certificate format warning")
err = errors.New("error parsing certificate type: certificate type is invalid")
}
certificate.CertBytes = data[CERT_MIN_SIZE:]
_, err = certificate.Length()
if err != nil {

37
lib/common/keys_and_cert.go
View File

@ -47,6 +47,7 @@ total length: 387+ bytes
import (
"errors"
"github.com/go-i2p/go-i2p/lib/crypto"
log "github.com/sirupsen/logrus"
)
@ -137,17 +138,18 @@ func (keys_and_cert KeysAndCert) GetSigningPublicKey() (signing_public_key crypt
// KeysAndCert or Certificate.
//
func (keys_and_cert KeysAndCert) GetCertificate() (cert CertificateInterface, err error) {
data_len := len(keys_and_cert.Cert())
if data_len < CERT_MIN_SIZE {
data_len := len(keys_and_cert.Bytes())
log.Println("LEN IS", data_len, "KEYS_AND_CERT_MIN_SIZE", KEYS_AND_CERT_MIN_SIZE)
if data_len < KEYS_AND_CERT_MIN_SIZE {
log.WithFields(log.Fields{
"at": "ReadKeysAndCert",
"at": "GetCertificate",
"data_len": data_len,
"required_len": KEYS_AND_CERT_MIN_SIZE,
"reason": "not enough data",
}).Error("error parsing keys and cert")
err = errors.New("certificate parsing warning: certificate data is shorter than specified by length")
}
if data_len > CERT_MIN_SIZE {
/*if data_len > CERT_MIN_SIZE {
log.WithFields(log.Fields{
"at": "ReadKeysAndCert",
"data_len": data_len,
@ -155,7 +157,7 @@ func (keys_and_cert KeysAndCert) GetCertificate() (cert CertificateInterface, er
"reason": "too much data",
}).Error("error parsing keys and cert")
err = errors.New("certificate parsing warning: certificate data is longer than specified by length")
}
}*/
cert = keys_and_cert.CertificateInterface
return
}
@ -164,7 +166,7 @@ func ReadKeys(data []byte, cert CertificateInterface) (spk crypto.SigningPublicK
data_len := len(data)
if data_len < KEYS_AND_CERT_MIN_SIZE {
log.WithFields(log.Fields{
"at": "ReadKeysAndCert",
"at": "ReadKeys",
"data_len": data_len,
"required_len": KEYS_AND_CERT_MIN_SIZE,
"reason": "not enough data",
@ -180,7 +182,8 @@ func ReadKeys(data []byte, cert CertificateInterface) (spk crypto.SigningPublicK
pk = elg_key
} else {
// A Certificate is present in this KeysAndCert
cert_type, cert_bytes, _ := cert.Type()
cert_type, cert_bytes, e := cert.Type()
err = e
if cert_type == CERT_KEY {
// This KeysAndCert contains a Key Certificate, construct
// a PublicKey from the data in the KeysAndCert and
@ -210,7 +213,8 @@ func ReadKeys(data []byte, cert CertificateInterface) (spk crypto.SigningPublicK
spk = dsa_pk
} else {
// A Certificate is present in this KeysAndCert
cert_type, cert_bytes, _ := cert.Type()
cert_type, cert_bytes, e := cert.Type()
err = e
if cert_type == CERT_KEY {
// This KeysAndCert contains a Key Certificate, construct
// a SigningPublicKey from the data in the KeysAndCert and
@ -228,7 +232,8 @@ func ReadKeys(data []byte, cert CertificateInterface) (spk crypto.SigningPublicK
spk = dsa_pk
}
}
cert_len, _ := cert.Length()
cert_len, e := cert.Length()
err = e
if cert_len == 0 {
remainder = data[KEYS_AND_CERT_MIN_SIZE:]
return
@ -257,22 +262,8 @@ func ReadKeysAndCert(data []byte) (keys_and_cert KeysAndCert, remainder []byte,
// return
}
cert, remainder, err := ReadCertificate(data[KEYS_AND_CERT_DATA_SIZE:])
if err != nil {
//return
log.Error("ERROR READ CERTIFICATE", err)
err = nil
}
log.Println("READ CERTIFICATE", cert.Cert())
keys_and_cert.CertificateInterface = cert
spk, pk, remainder, err := ReadKeys(data, cert)
if err != nil {
// return
log.Error("ERROR READ KEYS", err)
err = nil
}
log.Println("READ KEYS")
keys_and_cert.SigningPublicKey = spk
keys_and_cert.PublicKey = pk
return

13
lib/common/keys_and_cert_test.go
View File

@ -12,14 +12,19 @@ func TestCertificateWithMissingData(t *testing.T) {
data := make([]byte, 128+256)
data = append(data, cert_data...)
keys_and_cert, _, err := ReadKeysAndCert(data)
assert.Nil(err)
cert, err := keys_and_cert.GetCertificate()
if assert.NotNil(err) {
assert.Equal("certificate parsing warning: certificate data is shorter than specified by length", err.Error())
}
cert_bytes := []byte(cert.Cert())
cert, err := keys_and_cert.GetCertificate()
t.Log("\n\nSTART\n\n")
if assert.NotNil(err) {
assert.Equal("certificate parsing warning: certificate data is shorter than specified by length", err.Error())
}else{
t.Log("\n\nEND\n\n", cert.Cert())
}
// cert_bytes := []byte(cert.Cert())
// if assert.Equal(len(cert_data), len(cert_bytes)) {
assert.Equal(cert_bytes, cert_data, "keys_and_cert.GetCertificate() did not return available data when cert was missing some data")
// assert.Equal(cert_bytes, cert_data, "keys_and_cert.GetCertificate() did not return available data when cert was missing some data")
// }
}