diff --git a/cmd/keyforge/main.go b/cmd/keyforge/main.go index f9df12b9..bc3fe475 100644 --- a/cmd/keyforge/main.go +++ b/cmd/keyforge/main.go @@ -16,7 +16,6 @@ const ( peerIDFileName = "peerid.txt" privKeyPermissions = 0600 pubKeyPermissions = 0644 - ) func main() { @@ -60,7 +59,7 @@ func main() { if flagPublicKey != "" && flagMessage != "" && flagSignature != "" { VerifyGivenSignature(flagPublicKey, flagMessage, flagSignature) } - + if flagPeerID != "" && flagMessage != "" && flagSignature != "" { VerifyGivenSignatureWithPeerID(flagPeerID, flagMessage, flagSignature) } diff --git a/cmd/manager/bin.go b/cmd/manager/bin.go index a540eeac..b2f2f58c 100644 --- a/cmd/manager/bin.go +++ b/cmd/manager/bin.go @@ -15,68 +15,68 @@ import ( ) func installBinary(url, folder string) { - usr, err := user.Current() - if err != nil { - log.Fatal(err) - } - - targetPath := filepath.Join(usr.HomeDir, folder) - os.MkdirAll(targetPath, os.ModePerm) - - resp, err := http.Get(url) - if err != nil { - log.Fatal(err) - } - defer resp.Body.Close() - - archiveData, err := io.ReadAll(resp.Body) - if err != nil { - log.Fatal(err) - } - - gzipReader, err := gzip.NewReader(bytes.NewReader(archiveData)) - if err != nil { - log.Fatal(err) - } - defer gzipReader.Close() - - tarReader := tar.NewReader(gzipReader) - - for { - header, err := tarReader.Next() - if err == io.EOF { - break - } - if err != nil { - log.Fatal(err) - } - - path := filepath.Join(targetPath, header.Name) - switch header.Typeflag { - case tar.TypeDir: - if err := os.MkdirAll(path, os.FileMode(header.Mode)); err != nil { - log.Fatal(err) - } - - case tar.TypeReg: - outFile, err := os.Create(path) - if err != nil { - log.Fatal(err) - } - - if _, err := io.Copy(outFile, tarReader); err != nil { - log.Fatal(err) - } - - outFile.Close() - - if err := os.Chmod(path, os.FileMode(header.Mode)); err != nil { - log.Fatal(err) - } - - log.Printf("File %s installed in %s", header.Name, targetPath) - } - } + usr, err := user.Current() + if err != nil { + log.Fatal(err) + } + + targetPath := filepath.Join(usr.HomeDir, folder) + os.MkdirAll(targetPath, os.ModePerm) + + resp, err := http.Get(url) + if err != nil { + log.Fatal(err) + } + defer resp.Body.Close() + + archiveData, err := io.ReadAll(resp.Body) + if err != nil { + log.Fatal(err) + } + + gzipReader, err := gzip.NewReader(bytes.NewReader(archiveData)) + if err != nil { + log.Fatal(err) + } + defer gzipReader.Close() + + tarReader := tar.NewReader(gzipReader) + + for { + header, err := tarReader.Next() + if err == io.EOF { + break + } + if err != nil { + log.Fatal(err) + } + + path := filepath.Join(targetPath, header.Name) + switch header.Typeflag { + case tar.TypeDir: + if err := os.MkdirAll(path, os.FileMode(header.Mode)); err != nil { + log.Fatal(err) + } + + case tar.TypeReg: + outFile, err := os.Create(path) + if err != nil { + log.Fatal(err) + } + + if _, err := io.Copy(outFile, tarReader); err != nil { + log.Fatal(err) + } + + outFile.Close() + + if err := os.Chmod(path, os.FileMode(header.Mode)); err != nil { + log.Fatal(err) + } + + log.Printf("File %s installed in %s", header.Name, targetPath) + } + } } func installB7s(baseURL, version string) { @@ -105,18 +105,18 @@ func installRuntime(baseURL, version string) { arch := runtime.GOARCH platform := runtime.GOOS - if(platform == "darwin") { + if platform == "darwin" { platform = "macos" } - if(arch == "amd64") { + if arch == "amd64" { arch = "x86_64" } - if(arch == "arm64") { + if arch == "arm64" { arch = "aarch64" } url := fmt.Sprintf("%s/%s/blockless-runtime.%s-latest.%s.tar.gz", baseURL, version, platform, arch) installBinary(url, ".b7s/runtime") -} \ No newline at end of file +} diff --git a/cmd/manager/main.go b/cmd/manager/main.go index 2af9ffc5..cc3725cf 100644 --- a/cmd/manager/main.go +++ b/cmd/manager/main.go @@ -56,7 +56,6 @@ func main() { <-ctx.Done() } - func makeBasicHost(listenPort int, insecure bool, privKeyPath string) (host.Host, error) { priv, err := loadPrivateKey(privKeyPath) if err != nil { @@ -76,20 +75,18 @@ func makeBasicHost(listenPort int, insecure bool, privKeyPath string) (host.Host return libp2p.New(opts...) } - - func loadPrivateKey(filePath string) (crypto.PrivKey, error) { - keyBytes, err := ioutil.ReadFile(filePath) - if err != nil { - return nil, err - } + keyBytes, err := ioutil.ReadFile(filePath) + if err != nil { + return nil, err + } - priv, err := crypto.UnmarshalPrivateKey(keyBytes) - if err != nil { - return nil, err - } + priv, err := crypto.UnmarshalPrivateKey(keyBytes) + if err != nil { + return nil, err + } - return priv, nil + return priv, nil } func getHostAddress(ha host.Host) string { diff --git a/cmd/manager/service.go b/cmd/manager/service.go index 01d7b479..7857e2f9 100644 --- a/cmd/manager/service.go +++ b/cmd/manager/service.go @@ -178,4 +178,4 @@ func removeMacOSService() { func removeWindowsService() { log.Fatal("Removing a service on Windows is not supported in this code.") -} \ No newline at end of file +}