PolyculeConnect/polycule-connect
4
0
Fork 0
Code Issues Pull requests Releases Packages 1 Wiki Activity Actions

Fix some bugs when adding a new backend using the CLI #15

Merged
faercol merged 2 commits from fix-add-backend into main 2024-01-03 16:55:59 +00:00
Conversation 0 Commits 2 Files changed 4 +15
3 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 088f4faf82 - Show all commits

2
README.md
View file

@ -51,6 +51,8 @@ The rest of the configuration is handled through environment variables
# Can be debug,info,warning,error # Can be debug,info,warning,error
LOG_LEVEL = "info" LOG_LEVEL = "info"
ISSUER = "http://localhost"
# Can be net,unix # Can be net,unix
SERVER_MODE = "net" SERVER_MODE = "net"
SERVER_HOST = "0.0.0.0" SERVER_HOST = "0.0.0.0"

10
polyculeconnect/config/config.go
View file

@ -22,6 +22,8 @@ const (
varServerPort envVar = "SERVER_PORT" varServerPort envVar = "SERVER_PORT"
varServerSocket envVar = "SERVER_SOCK_PATH" varServerSocket envVar = "SERVER_SOCK_PATH"
varIssuer envVar = "ISSUER"
varStorageType envVar = "STORAGE_TYPE" varStorageType envVar = "STORAGE_TYPE"
varStorageFile envVar = "STORAGE_FILEPATH" varStorageFile envVar = "STORAGE_FILEPATH"
varStorageHost envVar = "STORAGE_HOST" varStorageHost envVar = "STORAGE_HOST"
@ -55,6 +57,8 @@ const (
defaultServerPort = 5000 defaultServerPort = 5000
defaultServerSocket = "" defaultServerSocket = ""
defaultIssuer = "locahost"
defaultStorageType = Memory defaultStorageType = Memory
defaultStorageFile = "./polyculeconnect.db" defaultStorageFile = "./polyculeconnect.db"
defaultStorageHost = "127.0.0.1" defaultStorageHost = "127.0.0.1"
@ -125,6 +129,9 @@ func (ac *AppConfig) UnmarshalJSON(data []byte) error {
return fmt.Errorf("failed to read JSON: %w", err) return fmt.Errorf("failed to read JSON: %w", err)
} }
ac.OpenConnectConfig = jsonConf.OpenConnectConfig ac.OpenConnectConfig = jsonConf.OpenConnectConfig
if ac.OpenConnectConfig == nil {
ac.OpenConnectConfig = &OpenConnectConfig{}
}
return nil return nil
} }
@ -145,6 +152,8 @@ func (ac *AppConfig) getConfFromEnv() {
ac.StorageConfig.Password = getStringFromEnv(varStoragePassword, defaultStoragePassword) ac.StorageConfig.Password = getStringFromEnv(varStoragePassword, defaultStoragePassword)
ac.StorageConfig.Ssl.CaFile = getStringFromEnv(varStorageSSLCaFile, defaultStorageSSLCaFile) ac.StorageConfig.Ssl.CaFile = getStringFromEnv(varStorageSSLCaFile, defaultStorageSSLCaFile)
ac.StorageConfig.Ssl.Mode = getStringFromEnv(varStorageSSLMode, defaultStorageSSLMode) ac.StorageConfig.Ssl.Mode = getStringFromEnv(varStorageSSLMode, defaultStorageSSLMode)
ac.OpenConnectConfig.Issuer = getStringFromEnv(varIssuer, defaultIssuer)
} }
func (ac *AppConfig) RedirectURI() string { func (ac *AppConfig) RedirectURI() string {
@ -154,6 +163,7 @@ func (ac *AppConfig) RedirectURI() string {
func New(filepath string) (*AppConfig, error) { func New(filepath string) (*AppConfig, error) {
var conf AppConfig var conf AppConfig
conf.StorageConfig = &StorageConfig{} conf.StorageConfig = &StorageConfig{}
conf.OpenConnectConfig = &OpenConnectConfig{}
content, err := os.ReadFile(filepath) content, err := os.ReadFile(filepath)
if err != nil { if err != nil {
if !errors.Is(err, fs.ErrNotExist) { if !errors.Is(err, fs.ErrNotExist) {

3
polyculeconnect/config/config_test.go
View file

@ -29,6 +29,9 @@ var defaultConfig = AppConfig{
CaFile string CaFile string
}{Mode: defaultStorageSSLMode, CaFile: defaultStorageSSLCaFile}, }{Mode: defaultStorageSSLMode, CaFile: defaultStorageSSLCaFile},
}, },
OpenConnectConfig: &OpenConnectConfig{
Issuer: defaultIssuer,
},
} }
func initJson(t *testing.T, content string) string { func initJson(t *testing.T, content string) string {