eric/onix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'beckn-onix-v1.0-develop' of https://github.com/beckn/beckn-onix into feature/contex_id

Browse Source
This commit is contained in:
MohitKatare-protean
2025-04-09 08:22:56 +05:30
parent e50dd96a34 3c688ca458
commit da93ca2326
12 changed files with 103 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/model/model.go
View File

@@ -16,6 +16,10 @@ type Subscriber struct {
Domain string `json:"domain"`
}
type ContextKey string
const ContextKeyModuleId ContextKey = "module_id"
// Subscription represents subscription details of a network participant.
type Subscription struct {
Subscriber `json:",inline"`

8
pkg/plugin/implementation/decrypter/decrypter.go
View File

@@ -9,6 +9,8 @@ import (
"fmt"
"github.com/zenazn/pkcs7pad"
"github.com/beckn/beckn-onix/pkg/model"
)
// decrypter implements the Decrypter interface and handles the decryption process.
@@ -24,18 +26,18 @@ func New(ctx context.Context) (*decrypter, func() error, error) {
func (d *decrypter) Decrypt(ctx context.Context, encryptedData, privateKeyBase64, publicKeyBase64 string) (string, error) {
privateKeyBytes, err := base64.StdEncoding.DecodeString(privateKeyBase64)
if err != nil {
return "", fmt.Errorf("invalid private key: %w", err)
return "", model.NewBadReqErr(fmt.Errorf("invalid private key: %w", err))
}
publicKeyBytes, err := base64.StdEncoding.DecodeString(publicKeyBase64)
if err != nil {
return "", fmt.Errorf("invalid public key: %w", err)
return "", model.NewBadReqErr(fmt.Errorf("invalid public key: %w", err))
}
// Decode the Base64 encoded encrypted data.
messageByte, err := base64.StdEncoding.DecodeString(encryptedData)
if err != nil {
return "", fmt.Errorf("failed to decode encrypted data: %w", err)
return "", model.NewBadReqErr(fmt.Errorf("failed to decode encrypted data: %w", err))
}
aesCipher, err := createAESCipher(privateKeyBytes, publicKeyBytes)

9
pkg/plugin/implementation/encrypter/encrypter.go
View File

@@ -8,6 +8,7 @@ import (
"encoding/base64"
"fmt"
"github.com/beckn/beckn-onix/pkg/model"
"github.com/zenazn/pkcs7pad"
)
@@ -23,12 +24,12 @@ func New(ctx context.Context) (*encrypter, func() error, error) {
func (e *encrypter) Encrypt(ctx context.Context, data string, privateKeyBase64, publicKeyBase64 string) (string, error) {
privateKeyBytes, err := base64.StdEncoding.DecodeString(privateKeyBase64)
if err != nil {
return "", fmt.Errorf("invalid private key: %w", err)
return "", model.NewBadReqErr(fmt.Errorf("invalid private key: %w", err))
}
publicKeyBytes, err := base64.StdEncoding.DecodeString(publicKeyBase64)
if err != nil {
return "", fmt.Errorf("invalid public key: %w", err)
return "", model.NewBadReqErr(fmt.Errorf("invalid public key: %w", err))
}
// Convert the input string to a byte slice.
@@ -50,11 +51,11 @@ func createAESCipher(privateKey, publicKey []byte) (cipher.Block, error) {
x25519Curve := ecdh.X25519()
x25519PrivateKey, err := x25519Curve.NewPrivateKey(privateKey)
if err != nil {
return nil, fmt.Errorf("failed to create private key: %w", err)
return nil, model.NewBadReqErr(fmt.Errorf("failed to create private key: %w", err))
}
x25519PublicKey, err := x25519Curve.NewPublicKey(publicKey)
if err != nil {
return nil, fmt.Errorf("failed to create public key: %w", err)
return nil, model.NewBadReqErr(fmt.Errorf("failed to create public key: %w", err))
}
sharedSecret, err := x25519PrivateKey.ECDH(x25519PublicKey)
if err != nil {

15
pkg/plugin/implementation/schemavalidator/schemavalidator.go
View File

@@ -3,6 +3,7 @@ package schemavalidator
import (
"context"
"encoding/json"
"errors"
"fmt"
"net/url"
"os"
@@ -10,6 +11,7 @@ import (
"path/filepath"
"strings"
"github.com/beckn/beckn-onix/pkg/log"
"github.com/beckn/beckn-onix/pkg/model"
"github.com/santhosh-tekuri/jsonschema/v6"
@@ -57,7 +59,7 @@ func (v *schemaValidator) Validate(ctx context.Context, url *url.URL, data []byt
var payloadData payload
err := json.Unmarshal(data, &payloadData)
if err != nil {
return fmt.Errorf("failed to parse JSON payload: %v", err)
return model.NewBadReqErr(fmt.Errorf("failed to parse JSON payload: %v", err))
}
// Extract domain, version, and endpoint from the payload and uri.
@@ -66,8 +68,7 @@ func (v *schemaValidator) Validate(ctx context.Context, url *url.URL, data []byt
version = fmt.Sprintf("v%s", version)
endpoint := path.Base(url.String())
// ToDo Add debug log here
fmt.Println("Handling request for endpoint:", endpoint)
log.Debugf(ctx, "Handling request for endpoint: %s", endpoint)
domain := strings.ToLower(cxtDomain)
domain = strings.ReplaceAll(domain, ":", "_")
@@ -77,12 +78,12 @@ func (v *schemaValidator) Validate(ctx context.Context, url *url.URL, data []byt
// Retrieve the schema from the cache.
schema, exists := v.schemaCache[schemaFileName]
if !exists {
return fmt.Errorf("schema not found for domain: %s", schemaFileName)
return model.NewBadReqErr(errors.New("schema not found for domain"))
}
var jsonData any
if err := json.Unmarshal(data, &jsonData); err != nil {
return fmt.Errorf("failed to parse JSON data: %v", err)
return model.NewBadReqErr(fmt.Errorf("failed to parse JSON data: %v", err))
}
err = schema.Validate(jsonData)
if err != nil {
@@ -104,7 +105,6 @@ func (v *schemaValidator) Validate(ctx context.Context, url *url.URL, data []byt
// Return the array of schema validation errors
return &model.SchemaValidationErr{Errors: schemaErrors}
}
// Return a generic error for non-validation errors
return fmt.Errorf("validation failed: %v", err)
}
@@ -112,9 +112,6 @@ func (v *schemaValidator) Validate(ctx context.Context, url *url.URL, data []byt
return nil
}
// ValidatorProvider provides instances of Validator.
type ValidatorProvider struct{}
// Initialise initialises the validator provider by compiling all the JSON schema files
// from the specified directory and storing them in a cache indexed by their schema filenames.
func (v *schemaValidator) initialise() error {

19
pkg/plugin/implementation/signvalidator/signvalidator.go
View File

@@ -9,6 +9,7 @@ import (
"strings"
"time"
"github.com/beckn/beckn-onix/pkg/model"
"golang.org/x/crypto/blake2b"
)
@@ -32,20 +33,17 @@ func New(ctx context.Context, config *Config) (*validator, func() error, error)
func (v *validator) Validate(ctx context.Context, body []byte, header string, publicKeyBase64 string) error {
createdTimestamp, expiredTimestamp, signature, err := parseAuthHeader(header)
if err != nil {
// TODO: Return appropriate error code when Error Code Handling Module is ready
return fmt.Errorf("error parsing header: %w", err)
return model.NewSignValidationErr(fmt.Errorf("error parsing header: %w", err))
}
signatureBytes, err := base64.StdEncoding.DecodeString(signature)
if err != nil {
// TODO: Return appropriate error code when Error Code Handling Module is ready
return fmt.Errorf("error decoding signature: %w", err)
}
currentTime := time.Now().Unix()
if createdTimestamp > currentTime || currentTime > expiredTimestamp {
// TODO: Return appropriate error code when Error Code Handling Module is ready
return fmt.Errorf("signature is expired or not yet valid")
return model.NewSignValidationErr(fmt.Errorf("signature is expired or not yet valid"))
}
createdTime := time.Unix(createdTimestamp, 0)
@@ -55,13 +53,11 @@ func (v *validator) Validate(ctx context.Context, body []byte, header string, pu
decodedPublicKey, err := base64.StdEncoding.DecodeString(publicKeyBase64)
if err != nil {
// TODO: Return appropriate error code when Error Code Handling Module is ready
return fmt.Errorf("error decoding public key: %w", err)
return model.NewSignValidationErr(fmt.Errorf("error decoding public key: %w", err))
}
if !ed25519.Verify(ed25519.PublicKey(decodedPublicKey), []byte(signingString), signatureBytes) {
// TODO: Return appropriate error code when Error Code Handling Module is ready
return fmt.Errorf("signature verification failed")
return model.NewSignValidationErr(fmt.Errorf("signature verification failed"))
}
return nil
@@ -91,14 +87,13 @@ func parseAuthHeader(header string) (int64, int64, string, error) {
expiredTimestamp, err := strconv.ParseInt(signatureMap["expires"], 10, 64)
if err != nil {
// TODO: Return appropriate error code when Error Code Handling Module is ready
return 0, 0, "", fmt.Errorf("invalid expires timestamp: %w", err)
return 0, 0, "", model.NewSignValidationErr(fmt.Errorf("invalid expires timestamp: %w", err))
}
signature := signatureMap["signature"]
if signature == "" {
// TODO: Return appropriate error code when Error Code Handling Module is ready
return 0, 0, "", fmt.Errorf("signature missing in header")
return 0, 0, "", model.NewSignValidationErr(fmt.Errorf("signature missing in header"))
}
return createdTimestamp, expiredTimestamp, signature, nil

4
pkg/plugin/manager.go
View File

@@ -131,7 +131,7 @@ func (m *Manager) Publisher(ctx context.Context, cfg *Config) (definition.Publis
return nil, err
}
if closer != nil {
m.addCloser(func() {
m.closers = append(m.closers, func() {
if err := closer(); err != nil {
panic(err)
}
@@ -159,7 +159,7 @@ func (m *Manager) SchemaValidator(ctx context.Context, cfg *Config) (definition.
return nil, err
}
if closer != nil {
m.addCloser(func() {
m.closers = append(m.closers, func() {
if err := closer(); err != nil {
panic(err)
}