From ebee2c544348881de0f15ee8d10b7394e5ec6a6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Thu, 18 Jun 2020 16:42:50 +0200
Subject: [PATCH 1/2] create default accounts when dir does not exist
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
---
 pkg/service/v0/service.go | 88 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 86 insertions(+), 2 deletions(-)

diff --git a/pkg/service/v0/service.go b/pkg/service/v0/service.go
index a37b480e6..d1dcf99ad 100644
--- a/pkg/service/v0/service.go
+++ b/pkg/service/v0/service.go
@@ -43,8 +43,92 @@ func New(cfg *config.Config) (s *Service, err error) {
 		return nil, err
 	}
 
-	if err = os.MkdirAll(filepath.Join(cfg.Server.AccountsDataPath, "accounts"), 0700); err != nil {
-		return nil, err
+	// check if accounts exist
+	accountsDir := filepath.Join(cfg.Server.AccountsDataPath, "accounts")
+	var fi os.FileInfo
+	if fi, err = os.Stat(accountsDir); err != nil {
+		if os.IsNotExist(err) {
+			// create accounts directory
+			if err = os.MkdirAll(accountsDir, 0700); err != nil {
+				return nil, err
+			}
+			// create default accounts
+			accounts := []proto.Account{
+				{
+					Id:            "4c510ada-c86b-4815-8820-42cdf82c3d51",
+					PreferredName: "einstein",
+					Mail:          "einstein@example.org",
+					DisplayName:   "Albert Einstein",
+					UidNumber:     20000,
+					GidNumber:     30000,
+					PasswordProfile: &proto.PasswordProfile{
+						Password: "$6$rounds=35210$sa1u5Pmfo4cr23Vw$RJNGElaDB1D3xorWkfTEGm2Ko.o2QL3E0cimKx23MNxVWVFSkUUeRoC7FqC4RzYDNQBD6cKzovTEaDD.8TDkD.",
+					},
+				},
+				{
+					Id:            "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c",
+					PreferredName: "marie",
+					Mail:          "marie@example.org",
+					DisplayName:   "Marie Curie",
+					UidNumber:     20001,
+					GidNumber:     30000,
+					PasswordProfile: &proto.PasswordProfile{
+						Password: "$6$rounds=81434$sa1u5Pmfo4cr23Vw$W78cyL884GmuvDpxYPvSRBVzEj02T5QhTTcI8Dv4IKvMooDFGv4bwaWMkH9HfJ0wgpEBW7Lp.4Cad0xE/MYSg1",
+					},
+				},
+				{
+					Id:            "932b4540-8d16-481e-8ef4-588e4b6b151c",
+					PreferredName: "richard",
+					Mail:          "richard@example.org",
+					DisplayName:   "Richard Feynman",
+					UidNumber:     20002,
+					GidNumber:     30000,
+					PasswordProfile: &proto.PasswordProfile{
+						Password: "$6$rounds=5524$sa1u5Pmfo4cr23Vw$58bQVL/JeUlwM0RY21YKAFMvKvwKLLysGllYXox.vwKT5dHMwdzJjCxwTDMnB2o2pwexC8o/iOXyP2zrhALS40",
+					},
+				},
+				// technical users for kopao and reva
+				{
+					Id:            "820ba2a1-3f54-4538-80a4-2d73007e30bf",
+					PreferredName: "konnectd",
+					Mail:          "idp@example.org",
+					DisplayName:   "Kopano Konnectd",
+					UidNumber:     10000,
+					GidNumber:     15000,
+					PasswordProfile: &proto.PasswordProfile{
+						Password: "$6$rounds=9746$sa1u5Pmfo4cr23Vw$2hnwpkTvUkWX0v6mh8Aw1pbzEXa9EUJzmrey4g2W/8arwWCwhteqU//3aWnA3S0d5T21fOKYteoqlsN1IbTcN.",
+					},
+				},
+				{
+					Id:            "bc596f3c-c955-4328-80a0-60d018b4ad57",
+					PreferredName: "reva",
+					Mail:          "storage@example.org",
+					DisplayName:   "Reva Inter Operability Platform",
+					UidNumber:     10001,
+					GidNumber:     15000,
+					PasswordProfile: &proto.PasswordProfile{
+						Password: "$6$rounds=91087$sa1u5Pmfo4cr23Vw$wPC3BbMTbP/ytlo0p.f99zJifyO70AUCdKIK9hkhwutBKGCirLmZs/MsWAG6xHjVvmnmHN5NoON7FUGv5pPaN.",
+					},
+				},
+			}
+			// TODO groups
+			for i := range accounts {
+				var bytes []byte
+				if bytes, err = json.Marshal(accounts[i]); err != nil {
+					log.Error().Err(err).Interface("account", accounts[i]).Msg("could not marshal default account")
+					return
+				}
+				path := filepath.Join(accountsDir, accounts[i].Id)
+				if err = ioutil.WriteFile(path, bytes, 0600); err != nil {
+					accounts[i].PasswordProfile.Password = "***REMOVED***"
+					log.Error().Err(err).Str("path", path).Interface("account", accounts[i]).Msg("could not persist default account")
+					return
+				}
+			}
+
+		}
+	} else if !fi.IsDir() {
+		return nil, fmt.Errorf("%s is not a directory", accountsDir)
 	}
 
 	mapping := bleve.NewIndexMapping()

From 474cf53e3f66ac2a5c246ccaa7e986d8e99bb434 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Mon, 22 Jun 2020 10:54:03 +0200
Subject: [PATCH 2/2] fix typo

---
 pkg/service/v0/service.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/service/v0/service.go b/pkg/service/v0/service.go
index d1dcf99ad..6be43d700 100644
--- a/pkg/service/v0/service.go
+++ b/pkg/service/v0/service.go
@@ -87,7 +87,7 @@ func New(cfg *config.Config) (s *Service, err error) {
 						Password: "$6$rounds=5524$sa1u5Pmfo4cr23Vw$58bQVL/JeUlwM0RY21YKAFMvKvwKLLysGllYXox.vwKT5dHMwdzJjCxwTDMnB2o2pwexC8o/iOXyP2zrhALS40",
 					},
 				},
-				// technical users for kopao and reva
+				// technical users for kopano and reva
 				{
 					Id:            "820ba2a1-3f54-4538-80a4-2d73007e30bf",
 					PreferredName: "konnectd",