cwtch.im
/
cwtch
16
20
Fork 16
Code Issues 10 Pull Requests 2 Releases 163 Wiki Activity

move server auto keygen to app/main

This commit is contained in:
Dan Ballard 2018-05-03 15:45:50 -07:00
parent fffe18344e
commit 13eaa3a684
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/app/main.go
View File

@ -11,14 +11,14 @@ import (
const privateKeyFile = "./private_key"
func checkAndGenPrivateKey(privateKeyFile string) {
if _, err := os.Stat(privateKeyFile); os.IsNotExist(err) {
if _, err := os.Stat(privateKeyFile); os.IsNotExist(err) {
log.Printf("no private key found!")
log.Printf("generating new private key...")
pk, err := utils.GeneratePrivateKey()
if err != nil {
pk, pk_err := utils.GeneratePrivateKey()
if pk_err != nil {
log.Fatalf("error generating new private key: %v\n", err)
}
err = ioutil.WriteFile(privateKeyFile, []byte(utils.PrivateKeyToString(pk)), 0400)
err := ioutil.WriteFile(privateKeyFile, []byte(utils.PrivateKeyToString(pk)), 0400)
if err != nil {
log.Fatalf("error writing new private key to file %s: %v\n", privateKeyFile, err)
}

12
server/server.go
View File

@ -9,8 +9,6 @@ import (
"github.com/s-rah/go-ricochet/channels"
"github.com/s-rah/go-ricochet/utils"
"log"
"os"
"io/ioutil"
)
// Server encapsulates a complete, compliant Cwtch server.
@ -23,16 +21,6 @@ type Server struct {
func (s *Server) Run(privateKeyFile string) {
cwtchserver := new(application.RicochetApplication)
if _, err := os.Stat(privateKeyFile); os.IsNotExist(err) {
log.Printf("no private key found!")
log.Printf("generating new private key...")
pk, pk_err := utils.GeneratePrivateKey()
if pk_err != nil {
log.Fatalf("error generating new private key: %v", err)
}
ioutil.WriteFile(privateKeyFile, []byte(utils.PrivateKeyToString(pk)), 0400)
}
pk, err := utils.LoadPrivateKeyFromFile(privateKeyFile)
if err != nil {