From 85a90658b93dc7b1decb566260b4bb8a190ff1e9 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Fri, 5 Nov 2021 13:05:07 -0700 Subject: [PATCH 1/3] server functionality init create servers directory --- features/servers/servers_functionality.go | 5 ++++- go.mod | 2 +- go.sum | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/features/servers/servers_functionality.go b/features/servers/servers_functionality.go index 4dd0c62..cecf544 100644 --- a/features/servers/servers_functionality.go +++ b/features/servers/servers_functionality.go @@ -6,6 +6,7 @@ import ( "git.openprivacy.ca/cwtch.im/libcwtch-go/constants" "git.openprivacy.ca/cwtch.im/server" "git.openprivacy.ca/openprivacy/connectivity" + "os" "path" "sync" ) @@ -44,7 +45,9 @@ func InitServers(acn connectivity.ACN, appdir string) { lock.Lock() defer lock.Unlock() if appServers == nil { - appServers = server.NewServers(acn, path.Join(appdir, "servers")) + serversDir := path.Join(appdir, "servers") + os.MkdirAll(serversDir, 700) + appServers = server.NewServers(acn, serversDir) appServers.LoadServers(constants.DefactoPasswordForUnencryptedProfiles) } } diff --git a/go.mod b/go.mod index 1a2c3a0..3a7b799 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( cwtch.im/cwtch v0.13.2 - git.openprivacy.ca/cwtch.im/server v1.3.2 + git.openprivacy.ca/cwtch.im/server v1.3.3 git.openprivacy.ca/openprivacy/connectivity v1.5.0 git.openprivacy.ca/openprivacy/log v1.0.3 golang.org/x/mobile v0.0.0-20210716004757-34ab1303b554 // indirect diff --git a/go.sum b/go.sum index 17ccadd..b742616 100644 --- a/go.sum +++ b/go.sum @@ -12,6 +12,8 @@ git.openprivacy.ca/cwtch.im/server v1.3.1 h1:Kt4TnlGxGPk1KTjvs1cXtnFWDx+hYqu8w+2 git.openprivacy.ca/cwtch.im/server v1.3.1/go.mod h1:gps6glXDt/ra66Do491csrm0TwatAc2lMLOAKCkh5Vw= git.openprivacy.ca/cwtch.im/server v1.3.2 h1:dUNMM88IWER6cmgCfhekahkef7laH597hqTp9CE2tYg= git.openprivacy.ca/cwtch.im/server v1.3.2/go.mod h1:gps6glXDt/ra66Do491csrm0TwatAc2lMLOAKCkh5Vw= +git.openprivacy.ca/cwtch.im/server v1.3.3 h1:LhHXlFAKzl2zM6Jd2Z3w3qMZM3UnRUA0qXWrlRBvKv8= +git.openprivacy.ca/cwtch.im/server v1.3.3/go.mod h1:gps6glXDt/ra66Do491csrm0TwatAc2lMLOAKCkh5Vw= git.openprivacy.ca/cwtch.im/tapir v0.4.9 h1:LXonlztwvI1F1++0IyomIcDH1/Bxzo+oN8YjGonNvjM= git.openprivacy.ca/cwtch.im/tapir v0.4.9/go.mod h1:p4bHo3DAO8wwimU6JAeZXbfPQ4jnoA2bV+4YvknWTNQ= git.openprivacy.ca/openprivacy/bine v0.0.4 h1:CO7EkGyz+jegZ4ap8g5NWRuDHA/56KKvGySR6OBPW+c= -- 2.25.1 From d519a4d0b243b29db0d4b86193e3f3caaa3a29e9 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Fri, 5 Nov 2021 16:16:13 -0400 Subject: [PATCH 2/3] fix perms --- features/servers/servers_functionality.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/features/servers/servers_functionality.go b/features/servers/servers_functionality.go index cecf544..0a8e7be 100644 --- a/features/servers/servers_functionality.go +++ b/features/servers/servers_functionality.go @@ -3,6 +3,7 @@ package servers import ( "cwtch.im/cwtch/event" "fmt" + "git.openprivacy.ca/openprivacy/log" "git.openprivacy.ca/cwtch.im/libcwtch-go/constants" "git.openprivacy.ca/cwtch.im/server" "git.openprivacy.ca/openprivacy/connectivity" @@ -46,7 +47,10 @@ func InitServers(acn connectivity.ACN, appdir string) { defer lock.Unlock() if appServers == nil { serversDir := path.Join(appdir, "servers") - os.MkdirAll(serversDir, 700) + err := os.MkdirAll(serversDir, 0700) + if err != nil { + log.Errorf("Could not init servers directory: %s", err) + } appServers = server.NewServers(acn, serversDir) appServers.LoadServers(constants.DefactoPasswordForUnencryptedProfiles) } @@ -134,4 +138,4 @@ func (si *ServerInfo) EnrichEvent(e *event.Event) { } else { e.Data["Running"] = "false" } -} \ No newline at end of file +} -- 2.25.1 From e96639223371d4f813f07fe4fe37da90a3ab8bf6 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Fri, 5 Nov 2021 13:21:48 -0700 Subject: [PATCH 3/3] path -> filepath --- features/servers/servers_functionality.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/features/servers/servers_functionality.go b/features/servers/servers_functionality.go index 0a8e7be..4457218 100644 --- a/features/servers/servers_functionality.go +++ b/features/servers/servers_functionality.go @@ -3,12 +3,12 @@ package servers import ( "cwtch.im/cwtch/event" "fmt" - "git.openprivacy.ca/openprivacy/log" "git.openprivacy.ca/cwtch.im/libcwtch-go/constants" "git.openprivacy.ca/cwtch.im/server" "git.openprivacy.ca/openprivacy/connectivity" + "git.openprivacy.ca/openprivacy/log" "os" - "path" + "path/filepath" "sync" ) @@ -46,7 +46,7 @@ func InitServers(acn connectivity.ACN, appdir string) { lock.Lock() defer lock.Unlock() if appServers == nil { - serversDir := path.Join(appdir, "servers") + serversDir := filepath.Join(appdir, "servers") err := os.MkdirAll(serversDir, 0700) if err != nil { log.Errorf("Could not init servers directory: %s", err) -- 2.25.1