jmug/ccclip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Push keys and db config to server package.

Browse source
This commit is contained in:
Mariano Uvalle 2023-11-12 07:40:09 +00:00
parent 33fdec9f28
commit ae49f30c96
3 changed files with 51 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

23
internal/server/server.go
View file

@ -3,16 +3,16 @@ package server
import (
"crypto/ecdh"
"encoding/json"
"fmt"
"log"
"net/http"
"os"
"github.com/gorilla/mux"
"golang.org/x/crypto/bcrypt"
"github.com/AYM1607/ccclip/internal/config"
"github.com/AYM1607/ccclip/internal/db"
"github.com/AYM1607/ccclip/pkg/api"
"github.com/AYM1607/ccclip/pkg/crypto"
)
func New(addr string) *http.Server {
@ -24,7 +24,10 @@ func New(addr string) *http.Server {
}
}
const minPasswordWork = 12
const (
minPasswordWork = 12
dbLocationEnv = "CCCLIP_DATABASE_LOCATION"
)
type controller struct {
store db.DB
@ -37,20 +40,16 @@ type controller struct {
func newHttpHandler() http.Handler {
r := mux.NewRouter()
pbk, err := crypto.LoadPublicKeyFromFile(config.Default.PublicKeyPath)
pvk, pbk, err := loadKeys()
if err != nil {
panic("could not load server's public key")
}
pvk, err := crypto.LoadPrivateKeyFromFile(config.Default.PrivateKeyPath)
if err != nil {
panic("could not load server's private key")
panic(fmt.Errorf("could not load keys for the server: %w", err))
}
var store db.DB
if config.Default.DatabaseLocation == "" {
store = db.NewLocalDB()
if dbLocation := os.Getenv(dbLocationEnv); dbLocation != "" {
store = db.NewSQLiteDB(dbLocation)
} else {
store = db.NewSQLiteDB(config.Default.DatabaseLocation)
store = db.NewLocalDB()
}
c := &controller{