mirror of
https://github.com/onsonr/sonr.git
synced 2025-03-10 13:07:09 +00:00
* refactor: remove redundant branch trigger for scheduled releases * refactor: simplify process-compose commands and improve logging * refactor: remove redundant command * refactor: remove unused error variables and simplify database configuration * feat: introduce task runner for project automation * refactor: Remove hardcoded action and method from form components * refactor: move server setup to main.go and add prometheus metrics * refactor: move index handlers to render handlers * refactor: improve user identification logic in gateway and vault handlers * refactor: rename TitleDescription to TitleDesc for consistency * feat: integrate go-useragent library for enhanced user agent parsing * feat: enhance initial view rendering based on device type * feat: Add support for PostgreSQL database * fix: Use formatPsqlDSN() to properly set PostgreSQL DSN from command flags * feat: Add PostgreSQL support with fallback to SQLite in NewGormDB * feat: Add PostgreSQL connection validation with SQLite fallback * chore: update golang.org/x/crypto dependency to v0.31.0 * feat: add PKL-based configuration initialization * refactor: improve file naming consistency in cmd/sonrd * refactor: Improve init-pkl command with safer config file generation and error handling * fix: add logging for pkl evaluation results * refactor: Move credential handling to gateway context * refactor: Migrate session models to gateway package * refactor: rename models and update User model * chore: initial commit for address and pubkey functionality * refactor: move pubkey package to keys package * refactor: Rename models and add resolver service * feat: add gRPC clients for bank, DID, DWN, and SVC modules * refactor: Migrate title and description components from text package to hero package * refactor: improve file naming conventions * feat: add user credential validation * refactor: rename registration handlers and routes for clarity * <no value> * refactor: Decouple database and IPFS interactions from server setup * refactor: Migrate configuration from class-based to TOML-based structure * refactor: move network configuration files to sonr.net module * feature/1120-leverage-service-authorization * fix: correct DID identifier creation function name * feat: add compressed and uncompressed public keys to keyset * refactor: move address packages to crypto/address * feat: implement pubkey verification * refactor: remove ECDSA-related functions from keyshare and protocol modules * feat: Implement ECDSA signature serialization * <no value> * feat: add vault service for IPFS token storage * refactor: update ucan codec to use new DID generation method * refactor: refactor key management and move address parsers to keys package * refactor: rename key parsers and move to parsers package * fix: resolved import issues with the new spec * feat: improve user onboarding experience by updating button text and functionality * refactor: update point marshaling and unmarshaling methods to use JSON * refactor: remove unnecessary DID method from PubKey * refactor: Rename and refactor MPC key generation functions * test: Add comprehensive test suite for keyshare generation and validation * test: Fix keyshare role validation and encoding tests * feat: Update key share role tests with enclave initialization validation * test(mpc): refactor tests to focus on public API and remove internal role checks * refactor: Remove unnecessary role check in initKeyEnclave function * fix: Enforce strict order for validator and user keyshares in enclave initialization * fix: Update codec_test to match latest codec implementation * refactor: Update KeyEnclave to use string-based key shares and improve error handling * fix: Refactor MPC enclave to use string-based encoding and simplify key management * refactor: Remove redundant keyshare decoding tests in codec_test.go * fix: Resolve type conversion issues in MPC crypto enclave initialization * fix: Convert CID to byte slice in addEnclaveIPFS function * fix: Resolve type conversion and constant definition errors in MPC crypto utils * refactor: Simplify KeyShare encoding and role handling in MPC codec * fix: Resolve JSON unmarshaling type mismatch in KeyShare.Message() * fix: Refactor KeyEnclave to use struct and Enclave interface * fix: Resolve type and naming conflicts in MPC crypto package * refactor: Update codec_test.go to use new KeyEnclave struct fields * refactor: remove keyshare encoding and decoding logic * refactor: Remove unused JSON marshaling functions for curve points * fix: Improve signature serialization and deserialization in MPC crypto This commit addresses several issues with signature handling: - Fixed signature length to 65 bytes - Added proper padding for R and S values - Added nil and zero value checks - Improved error messages for signature parsing The changes ensure more robust signature encoding and decoding, preventing potential nil pointer and invalid signature issues. * fix: Update signature serialization to match protocol test approach * refactor: Simplify KeyEnclave struct and improve message handling * fix: Improve signature serialization and verification in MPC crypto module * refactor: Simplify enclave validation using IsValid method in test * refactor: Add marshaling and comprehensive tests for KeyEnclave * feat: Add JSON marshaling support for Point in KeyEnclave * refactor: Rename KeyEnclave to Enclave and update related functions * refactor: Update PubKey verification to use SHA3-256 hashing * test: Add comprehensive tests for DID and PubKey implementations * refactor: simplify DID key retrieval * test: refactor CI workflow and remove unused DIDAuth middleware * The changes look good! The updated workflows will now: 1. Run tests on push to master 2. Bump the version if the commit doesn't already start with 'bump:' 3. Trigger a release workflow automatically with the new version tag 4. Create and publish the release A few things to note: - Make sure you have the `peter-evans/repository-dispatch` action installed/available - The `commitizen-tools/commitizen-action` should output the new tag for this to work - Ensure your release workflow can handle the repository dispatch event Would you like me to review or suggest any additional modifications to the workflows? * ci(github actions): add build stage dependency for tests * fix(workflow): update workflow to trigger on PR edits * test: Update unit test dependencies * ci: Add GoReleaser dry-run check for merge group events * test: remove unnecessary dependencies between test jobs * ci: Make race and coverage tests depend on build tests
102 lines
2.6 KiB
Go
102 lines
2.6 KiB
Go
package main
|
|
|
|
import (
|
|
"context"
|
|
"log"
|
|
"os"
|
|
"path/filepath"
|
|
|
|
"github.com/apple/pkl-go/pkl"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
var configDir string
|
|
|
|
func newPklInitCmd() *cobra.Command {
|
|
cmd := &cobra.Command{
|
|
Use: "init-pkl",
|
|
Short: "Initialize the Sonrd configuration using PKL",
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
ctx := context.Background()
|
|
evaluator, err := pkl.NewEvaluator(ctx, pkl.PreconfiguredOptions)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer evaluator.Close()
|
|
|
|
appPath := formatConfigPath(cmd, "app.toml")
|
|
configPath := formatConfigPath(cmd, "config.toml")
|
|
|
|
// Create app.toml
|
|
if err := createAppToml(evaluator, appPath); err != nil {
|
|
cmd.PrintErrf("Failed to create app.toml: %v\n", err)
|
|
return err
|
|
}
|
|
cmd.Printf("Successfully created %s\n", appPath)
|
|
|
|
// Create config.toml
|
|
if err := createConfigToml(evaluator, configPath); err != nil {
|
|
cmd.PrintErrf("Failed to create config.toml: %v\n", err)
|
|
return err
|
|
}
|
|
cmd.Printf("Successfully created %s\n", configPath)
|
|
|
|
return nil
|
|
},
|
|
}
|
|
cmd.Flags().StringVar(&configDir, "config-dir", "~/.sonr/config", "Path to where pkl files should be output")
|
|
return cmd
|
|
}
|
|
|
|
func createAppToml(evaluator pkl.Evaluator, path string) error {
|
|
appSource := pkl.UriSource("https://pkl.sh/sonr.chain/0.0.2/App.pkl")
|
|
res, err := evaluator.EvaluateOutputText(context.Background(), appSource)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
log.Printf("res: %s", res)
|
|
return writeConfigFile(path, res)
|
|
}
|
|
|
|
func createConfigToml(evaluator pkl.Evaluator, path string) error {
|
|
configSource := pkl.UriSource("https://pkl.sh/sonr.chain/0.0.2/Config.pkl")
|
|
res, err := evaluator.EvaluateOutputText(context.Background(), configSource)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
log.Printf("res: %s", res)
|
|
return writeConfigFile(path, res)
|
|
}
|
|
|
|
func formatConfigPath(cmd *cobra.Command, fileName string) string {
|
|
configDir := cmd.Flag("config-dir").Value.String()
|
|
// Expand home directory if needed
|
|
if configDir[:2] == "~/" {
|
|
home, err := os.UserHomeDir()
|
|
if err == nil {
|
|
configDir = filepath.Join(home, configDir[2:])
|
|
}
|
|
}
|
|
return filepath.Join(configDir, fileName)
|
|
}
|
|
|
|
func writeConfigFile(path string, content string) error {
|
|
// Create the directory path if it doesn't exist
|
|
dir := filepath.Dir(path)
|
|
if err := os.MkdirAll(dir, 0o755); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Check if file already exists
|
|
if _, err := os.Stat(path); err == nil {
|
|
// File exists, create backup
|
|
backupPath := path + ".backup"
|
|
if err := os.Rename(path, backupPath); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
// Write the new config file
|
|
return os.WriteFile(path, []byte(content), 0o644)
|
|
}
|