Added gencerts command, fixed unreachable code, added missing argument, fixed few golint errors

cmd/convert.go

@@ -32,12 +32,14 @@ import (
 	"time"
 )
 
+//Convert struct
 type Convert struct {
 	Password string `short:"p" long:"password" description:"the encryption password if the database is encrypted"`
 	DataDir  string `short:"d" long:"datadir" description:"specify the data directory to be used"`
 	Testnet  bool   `short:"t" long:"testnet" description:"use the test network"`
 }
 
+//Execute convert command
 func (x *Convert) Execute(args []string) error {
 	if len(args) == 0 {
 		fmt.Fprintf(os.Stderr, "Please specify the cryptocurrency you wish to convert to. Examples:\nopenbazaar-go convert bitcoin\nopenbazaar-go convert bitcoincash\nopenbazaar-go convert zcash /path/to/zcashd\n")

cmd/decrypt.go

@@ -15,10 +15,12 @@ import (
 	"golang.org/x/crypto/ssh/terminal"
 )
 
+//DecryptDatabase struct
 type DecryptDatabase struct {
 	DataDir string `short:"d" long:"datadir" description:"specify the data directory to be used"`
 }
 
+//Execute decryptdatabase command
 func (x *DecryptDatabase) Execute(args []string) error {
 	reader := bufio.NewReader(os.Stdin)
 

cmd/encrypt.go

@@ -15,10 +15,12 @@ import (
 	"golang.org/x/crypto/ssh/terminal"
 )
 
+//EncryptDatabase struct
 type EncryptDatabase struct {
 	DataDir string `short:"d" long:"datadir" description:"specify the data directory to be used"`
 }
 
+//Execute encryptdatabase command
 func (x *EncryptDatabase) Execute(args []string) error {
 	reader := bufio.NewReader(os.Stdin)
 	var repoPath string

cmd/gencerts.go

@@ -0,0 +1,130 @@
+package cmd
+
+import (
+	"crypto/rand"
+	"crypto/rsa"
+	"crypto/x509"
+	"crypto/x509/pkix"
+	"encoding/pem"
+	"flag"
+	"math/big"
+	"net"
+	"os"
+	"path"
+	"strings"
+	"time"
+
+	"github.com/OpenBazaar/openbazaar-go/repo"
+)
+
+// GenerateCertificates struct
+type GenerateCertificates struct {
+	DataDir  string        `short:"d" long:"datadir" description:"specify the data directory to be used"`
+	Testnet  bool          `short:"t" long:"testnet" description:"config file is for testnet node"`
+	Host     string        `short:"h" long:"host" description:"comma-separated hostnames and IPs to generate a certificate for"`
+	ValidFor time.Duration `long:"duration" description:"duration that certificate is valid for"`
+}
+
+// Execute gencerts command
+func (x *GenerateCertificates) Execute(args []string) error {
+
+	flag.Parse()
+
+	// Set repo path
+	repoPath, err := repo.GetRepoPath(x.Testnet)
+	if err != nil {
+		return err
+	}
+	if x.DataDir != "" {
+		repoPath = x.DataDir
+	}
+
+	// Check if host was entered
+	if len(x.Host) == 0 {
+		log.Fatalf("Missing required --host parameter")
+	}
+
+	// Set default duration
+	if x.ValidFor == 0 {
+		x.ValidFor = 365 * 24 * time.Hour
+	}
+
+	var priv interface{}
+
+	// Generate key
+	priv, err = rsa.GenerateKey(rand.Reader, 2048)
+	if err != nil {
+		log.Fatalf("failed to generate private key: %s", err)
+	}
+
+	// Set creation date
+	var notBefore = time.Now()
+	notAfter := notBefore.Add(x.ValidFor)
+
+	// Create serial nmuber
+	serialNumberLimit := new(big.Int).Lsh(big.NewInt(1), 128)
+	serialNumber, err := rand.Int(rand.Reader, serialNumberLimit)
+	if err != nil {
+		log.Fatalf("failed to generate serial number: %s", err)
+	}
+
+	// Check if host ip or dns name and count their quantity
+	ipAddresses := []net.IP{}
+	dnsNames := []string{}
+	hosts := strings.Split(x.Host, ",")
+	for _, h := range hosts {
+		if ip := net.ParseIP(h); ip != nil {
+			ipAddresses = append(ipAddresses, ip)
+		} else {
+			dnsNames = append(dnsNames, h)
+		}
+	}
+
+	template := x509.Certificate{
+		SerialNumber: serialNumber,
+		IPAddresses:  ipAddresses,
+		DNSNames:     dnsNames,
+		Subject: pkix.Name{
+			Organization: []string{"OpenBazaar"},
+		},
+		NotBefore:             notBefore,
+		NotAfter:              notAfter,
+		KeyUsage:              x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
+		ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
+		BasicConstraintsValid: true,
+		IsCA: true,
+	}
+
+	// Create certificate
+	derBytes, err := x509.CreateCertificate(rand.Reader, &template, &template, &priv.(*rsa.PrivateKey).PublicKey, priv)
+	if err != nil {
+		log.Fatalf("Failed to create certificate: %s", err)
+	}
+
+	// Create ssl directory
+	err = os.MkdirAll(path.Join(repoPath, "ssl"), os.ModePerm)
+	if err != nil {
+		log.Fatalf("Failed to create ssl directory: %s", err)
+	}
+
+	// Create and write cert.pem
+	certOut, err := os.Create(path.Join(repoPath, "ssl", "cert.pem"))
+	if err != nil {
+		log.Fatalf("failed to open cert.pem for writing: %s", err)
+	}
+	pem.Encode(certOut, &pem.Block{Type: "CERTIFICATE", Bytes: derBytes})
+	certOut.Close()
+	log.Noticef("wrote cert.pem\n")
+
+	// Create and write key.pem
+	keyOut, err := os.OpenFile(path.Join(repoPath, "ssl", "key.pem"), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
+	if err != nil {
+		log.Noticef("failed to open key.pem for writing:", err)
+		return err
+	}
+	pem.Encode(keyOut, &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(priv.(*rsa.PrivateKey))})
+	keyOut.Close()
+	log.Noticef("wrote key.pem\n")
+
+	return nil
+}

cmd/init.go

@@ -13,6 +13,7 @@ import (
 
 var log = logging.MustGetLogger("cmd")
 
+//Init struct
 type Init struct {
 	Password           string `short:"p" long:"password" description:"the encryption password if the database is to be encrypted"`
 	DataDir            string `short:"d" long:"datadir" description:"specify the data directory to be used"`
@@ -22,6 +23,7 @@ type Init struct {
 	WalletCreationDate string `short:"w" long:"walletcreationdate" description:"specify the date the seed was created. if omitted the wallet will sync from the oldest checkpoint."`
 }
 
+//Execute init command
 func (x *Init) Execute(args []string) error {
 	// Set repo path
 	repoPath, err := repo.GetRepoPath(x.Testnet)
@@ -55,9 +57,8 @@ func (x *Init) Execute(args []string) error {
 			}
 			fmt.Printf("OpenBazaar repo initialized at %s\n", repoPath)
 			return nil
-		} else {
-			return nil
 		}
+		return nil
 	} else if err != nil {
 		return err
 	}

cmd/restore.go

@@ -57,6 +57,7 @@ type Restore struct {
 	WalletCreationDate string `short:"w" long:"walletcreationdate" description:"specify the date the seed was created. if omitted the wallet will sync from the oldest checkpoint."`
 }
 
+//Execute restore command
 func (x *Restore) Execute(args []string) error {
 	reader := bufio.NewReader(os.Stdin)
 	if x.Mnemonic == "" {
@@ -332,6 +333,7 @@ func (x *Restore) Execute(args []string) error {
 	return nil
 }
 
+//RestoreFile restore the file
 func RestoreFile(repoPath, peerID, filename string, ctx commands.Context, wg *sync.WaitGroup) {
 	defer wg.Done()
 	b, err := ipfs.ResolveThenCat(ctx, ipfspath.FromString(path.Join(peerID, filename)), time.Minute)
@@ -346,6 +348,7 @@ func RestoreFile(repoPath, peerID, filename string, ctx commands.Context, wg *sy
 	}
 }
 
+//RestoreDirectory restore the directory
 func RestoreDirectory(repoPath, directory string, nd *ipfscore.IpfsNode, id *cid.Cid, wg *sync.WaitGroup) {
 	defer wg.Done()
 	links, err := nd.DAG.GetLinks(context.Background(), id)
@@ -375,6 +378,7 @@ func RestoreDirectory(repoPath, directory string, nd *ipfscore.IpfsNode, id *cid
 
 }
 
+//PrintError print error
 func PrintError(e string) {
 	os.Stderr.Write([]byte(e))
 }

cmd/setapicreds.go

@@ -15,11 +15,13 @@ import (
 	"syscall"
 )
 
+//SetAPICreds struct
 type SetAPICreds struct {
 	DataDir string `short:"d" long:"datadir" description:"specify the data directory to be used"`
 	Testnet bool   `short:"t" long:"testnet" description:"config file is for testnet node"`
 }
 
+//Execute setapicreds command
 func (x *SetAPICreds) Execute(args []string) error {
 	// Set repo path
 	repoPath, err := repo.GetRepoPath(x.Testnet)
@@ -86,8 +88,10 @@ func (x *SetAPICreds) Execute(args []string) error {
 		apiCfg.AllowedIPs = []string{}
 	}
 
-	if err := r.SetConfigKey("JSON-API", apiCfg); err != nil {
+	err = r.SetConfigKey("JSON-API", apiCfg)
+	if err != nil {
 		return err
 	}
+
 	return nil
 }

cmd/start.go

@@ -91,10 +91,12 @@ var fileLogFormat = logging.MustStringFormatter(
 	`%{time:15:04:05.000} [%{shortfunc}] [%{level}] %{message}`,
 )
 
+//ErrNoGateways
 var (
 	ErrNoGateways = errors.New("No gateway addresses configured")
 )
 
+//Start struct
 type Start struct {
 	Password             string   `short:"p" long:"password" description:"the encryption password if the database is encrypted"`
 	Testnet              bool     `short:"t" long:"testnet" description:"use the test network"`
@@ -117,6 +119,7 @@ type Start struct {
 	ZCash                string   `long:"zcash" description:"use a ZCash wallet in a dedicated data directory. To use this you must pass in the location of the zcashd binary."`
 }
 
+//Execute start command
 func (x *Start) Execute(args []string) error {
 	printSplashScreen(x.Verbose)
 
@@ -553,7 +556,7 @@ func (x *Start) Execute(args []string) error {
 				return err
 			}
 		}
-		feeApi, err := url.Parse(walletCfg.FeeAPI)
+		feeAPI, err := url.Parse(walletCfg.FeeAPI)
 		if err != nil {
 			log.Error(err)
 			return err
@@ -565,7 +568,7 @@ func (x *Start) Execute(args []string) error {
 			LowFee:       uint64(walletCfg.LowFeeDefault),
 			MediumFee:    uint64(walletCfg.MediumFeeDefault),
 			HighFee:      uint64(walletCfg.HighFeeDefault),
-			FeeAPI:       *feeApi,
+			FeeAPI:       *feeAPI,
 			RepoPath:     repoPath,
 			CreationDate: creationDate,
 			DB:           sqliteDB,
@@ -590,7 +593,7 @@ func (x *Start) Execute(args []string) error {
 				return err
 			}
 		}
-		feeApi, err := url.Parse(walletCfg.FeeAPI)
+		feeAPI, err := url.Parse(walletCfg.FeeAPI)
 		if err != nil {
 			log.Error(err)
 			return err
@@ -603,7 +606,7 @@ func (x *Start) Execute(args []string) error {
 			LowFee:               uint64(walletCfg.LowFeeDefault),
 			MediumFee:            uint64(walletCfg.MediumFeeDefault),
 			HighFee:              uint64(walletCfg.HighFeeDefault),
-			FeeAPI:               *feeApi,
+			FeeAPI:               *feeAPI,
 			RepoPath:             repoPath,
 			CreationDate:         creationDate,
 			DB:                   sqliteDB,
@@ -712,7 +715,7 @@ func (x *Start) Execute(args []string) error {
 			f.Close()
 		} else {
 			if string(cookie)[:len(cookiePrefix)] != cookiePrefix {
-				return errors.New("Invalid authentication cookie. Delete it to generate a new one.")
+				return errors.New("Invalid authentication cookie. Delete it to generate a new one")
 			}
 			split := strings.SplitAfter(string(cookie), cookiePrefix)
 			authCookie.Value = split[1]
@@ -890,25 +893,30 @@ func printSwarmAddrs(node *ipfscore.IpfsNode) {
 	}
 }
 
+//DummyWriter struct
 type DummyWriter struct{}
 
 func (d *DummyWriter) Write(p []byte) (n int, err error) {
 	return 0, nil
 }
 
+//DummyListener struct
 type DummyListener struct {
 	addr net.Addr
 }
 
+//Addr return addr
 func (d *DummyListener) Addr() net.Addr {
 	return d.addr
 }
 
+//Accept retunr conn
 func (d *DummyListener) Accept() (net.Conn, error) {
 	conn, _ := net.FileConn(nil)
 	return conn, nil
 }
 
+//Close return nil
 func (d *DummyListener) Close() error {
 	return nil
 }
@@ -983,6 +991,7 @@ func newHTTPGateway(node *core.OpenBazaarNode, authCookie http.Cookie, config re
 	return api.NewGateway(node, authCookie, gwLis.NetListener(), config, ml, opts...)
 }
 
+//DHTOption variable
 var DHTOption ipfscore.RoutingOption = constructDHTRouting
 
 func constructDHTRouting(ctx context.Context, host p2phost.Host, dstore ipfsrepo.Datastore) (routing.IpfsRouting, error) {
@@ -1054,6 +1063,7 @@ func serveHTTPApi(cctx *commands.Context) (<-chan error, error) {
 	return errc, nil
 }
 
+//InitializeRepo initialize repo
 func InitializeRepo(dataDir, password, mnemonic string, testnet bool, creationDate time.Time) (*db.SQLiteDatastore, error) {
 	// Database
 	sqliteDB, err := db.Create(dataDir, password, testnet)

cmd/status.go

@@ -9,11 +9,13 @@ import (
 	"os"
 )
 
+//Status strcut
 type Status struct {
 	DataDir string `short:"d" long:"datadir" description:"specify the data directory to be used"`
 	Testnet bool   `short:"t" long:"testnet" description:"use the test network"`
 }
 
+//Execute status command
 func (x *Status) Execute(args []string) error {
 	// Set repo path
 	repoPath, err := repo.GetRepoPath(x.Testnet)
@@ -31,7 +33,6 @@ func (x *Status) Execute(args []string) error {
 	if fsrepo.IsInitialized(repoPath) {
 		sqliteDB, err := db.Create(repoPath, "", x.Testnet)
 		if err != nil {
-			return err
 			os.Exit(1)
 		}
 		defer sqliteDB.Close()

core/net.go

@@ -402,7 +402,6 @@ func (n *OpenBazaarNode) SendDisputeClose(peerId string, k *libp2p.PubKey, resol
 		Payload:     a,
 	}
 	return n.sendMessage(peerId, k, m)
-	return nil
 }
 
 func (n *OpenBazaarNode) SendChat(peerId string, chatMessage *pb.Chat) error {