update

CHANGELOG.md

@@ -16,6 +16,9 @@
 - Update `cmd/hidden_lake/service`: CNetworkMaxConns 64 -> 256
 - Update `examples/echo_service/prod_test`: append switch prod_1/prod_2 in Makefile with PROD param
 - Update `cmd/hidden_lake`: delete jino, timeweb.cloud providers
+- Update `cmd/hidden_lake/messenger`: delete auth
+- Update `cmd/hidden_lake/service`: delete SetPrivKey/ResetPrivKey
+- Update `cmd/hidden_lake/service`: generates priv key file
 
 ### BUG FIXES
 

README.md

@@ -76,8 +76,7 @@ Some final applications are compositions of other applications. Due to this, suc
 2. Go library (used by `cmd/hidden_lake/messenger`) [github.com/boombuler/barcode](https://github.com/boombuler/barcode "boombuler/barcode");
 3. Go library (used by `cmd/hidden_lake/messenger`) [golang.org/x/net](https://golang.org/x/net "x/net");
 4. Go library (used by `pkg/crypto/keybuilder`) [golang.org/x/crypto](https://golang.org/x/crypto "x/crypto");
-5. Go library (used by `cmd/hidden_lake/messenger`) [github.com/wagslane/go-password-validator](https://github.com/wagslane/go-password-validator "wagslane/go-password-validator");
-6. CSS/JS library (used by `cmd/hidden_lake/messenger`) [getbootstrap.com](https://getbootstrap.com "bootstrap")
+5. CSS/JS library (used by `cmd/hidden_lake/messenger`) [getbootstrap.com](https://getbootstrap.com "bootstrap")
 
 ## Library based applications
 
@@ -351,8 +350,8 @@ $ make run # run ./bin/hlm
 ```
 
 Open ports `9591` (HTTP, interface) and `9592` (HTTP, incoming).
-Creates `./hlm.cfg` or `./_mounted/hlm.cfg` (docker), `./hlm.db` or `./_mounted/hlm.db` (docker) files and `./hlm.stg` or `./_mounted/hlm.stg` (docker).
-The file `hlm.db` stores all sent/received messages in encrypted view. The file `hlm.stg` stores all auth information (logins, passwords, private keys) in encrypted view.
+Creates `./hlm.cfg` or `./_mounted/hlm.cfg` (docker) and `./hlm.db` or `./_mounted/hlm.db` (docker) files.
+The file `hlm.db` stores all sent/received messages in encrypted view. 
 
 Default config `hlm.cfg`
 

cmd/hidden_lake/composite/service_messenger/Makefile

@@ -22,4 +22,4 @@ run:
 	./$(BINPATH)/hlc_sm
 clean:
 	rm -f $(BINPATH)/hlc_sm $(BINPATH)/hlc_sm_*
-	rm -rf hls.cfg hlm.cfg hlm.stg hls.db hlm.db
+	rm -rf hls.cfg hlm.cfg hls.db hlm.db

cmd/hidden_lake/composite/service_messenger/cmd/hlc_sm/init_app.go

@@ -16,8 +16,8 @@ type sApp struct {
 	fHLM types.ICommand
 }
 
-func initApp(pPath string) (types.ICommand, error) {
-	hlsApp, err := hls_app.InitApp(pPath)
+func initApp(pPath, pKey string) (types.ICommand, error) {
+	hlsApp, err := hls_app.InitApp(pPath, pKey)
 	if err != nil {
 		return nil, err
 	}

cmd/hidden_lake/composite/service_messenger/cmd/hlc_sm/main.go

@@ -7,7 +7,7 @@ import (
 )
 
 func main() {
-	app, err := initApp(".")
+	app, err := initApp(".", "./priv.key")
 	if err != nil {
 		panic(err)
 	}

cmd/hidden_lake/composite/service_traffic/cmd/hlc_st/init_app.go

@@ -16,8 +16,8 @@ type sApp struct {
 	fHLT types.ICommand
 }
 
-func initApp(pPath string) (types.ICommand, error) {
-	hlsApp, err := hls_app.InitApp(pPath)
+func initApp(pPath, pKey string) (types.ICommand, error) {
+	hlsApp, err := hls_app.InitApp(pPath, pKey)
 	if err != nil {
 		return nil, err
 	}

cmd/hidden_lake/composite/service_traffic/cmd/hlc_st/main.go

@@ -7,7 +7,7 @@ import (
 )
 
 func main() {
-	app, err := initApp(".")
+	app, err := initApp(".", "./priv.key")
 	if err != nil {
 		panic(err)
 	}

cmd/hidden_lake/composite/service_traffic_messenger/Makefile

@@ -23,4 +23,4 @@ run:
 	./$(BINPATH)/hlc_stm
 clean:
 	rm -f $(BINPATH)/hlc_stm $(BINPATH)/hlc_stm_*
-	rm -rf hls.cfg hlt.cfg hlm.cfg hlm.stg hls.db hlm.db hlt.db
+	rm -rf hls.cfg hlt.cfg hlm.cfg hls.db hlm.db hlt.db

cmd/hidden_lake/composite/service_traffic_messenger/cmd/hlc_stm/init_app.go

@@ -18,8 +18,8 @@ type sApp struct {
 	fHLM types.ICommand
 }
 
-func initApp(pPath string) (types.ICommand, error) {
-	hlsApp, err := hls_app.InitApp(pPath)
+func initApp(pPath, pKey string) (types.ICommand, error) {
+	hlsApp, err := hls_app.InitApp(pPath, pKey)
 	if err != nil {
 		return nil, err
 	}

cmd/hidden_lake/composite/service_traffic_messenger/cmd/hlc_stm/main.go

@@ -7,7 +7,7 @@ import (
 )
 
 func main() {
-	app, err := initApp(".")
+	app, err := initApp(".", "./priv.key")
 	if err != nil {
 		panic(err)
 	}

cmd/hidden_lake/messenger/.gitignore

@@ -1,6 +1,5 @@
 hlm 
 hlm.cfg
-hlm.stg
 hlm.db/
 prog_hls
 hls.cfg

cmd/hidden_lake/messenger/Makefile

@@ -24,7 +24,7 @@ test:
 	for i in {1..$(N)}; do go clean -testcache; echo $$i; go test ./...; done
 clean:
 	rm -f $(BINPATH)/hlm $(BINPATH)/hlm_*
-	rm -rf hlm.cfg hlm.db hlm.stg
+	rm -rf hlm.cfg hlm.db 
 
 docker-default: docker-build docker-run
 docker-build:

cmd/hidden_lake/messenger/README.md

@@ -48,8 +48,8 @@ $ make run # run ./bin/hlm
 ```
 
 Open ports `9591` (HTTP, interface) and `9592` (HTTP, incoming).
-Creates `./hlm.cfg` or `./_mounted/hlm.cfg` (docker), `./hlm.db` or `./_mounted/hlm.db` (docker) files and `./hlm.stg` or `./_mounted/hlm.stg` (docker).
-The file `hlm.db` stores all sent/received messages in encrypted view. The file `hlm.stg` stores all auth information (logins, passwords, private keys) in encrypted view.
+Creates `./hlm.cfg` or `./_mounted/hlm.cfg` (docker) and `./hlm.db` or `./_mounted/hlm.db` (docker) files.
+The file `hlm.db` stores all sent/received messages in encrypted view. 
 
 Default config `hlm.cfg`
 

cmd/hidden_lake/messenger/internal/database/database.go

@@ -3,7 +3,6 @@ package database
 import (
 	"sync"
 
-	"github.com/number571/go-peer/cmd/hidden_lake/messenger/pkg/settings"
 	"github.com/number571/go-peer/pkg/encoding"
 	"github.com/number571/go-peer/pkg/errors"
 	"github.com/number571/go-peer/pkg/storage"
@@ -15,14 +14,8 @@ type sKeyValueDB struct {
 	fDB    *gp_database.IKVDatabase
 }
 
-func NewKeyValueDB(pPath, pPassword string) (IKVDatabase, error) {
-	db, err := gp_database.NewKeyValueDB(
-		storage.NewSettings(&storage.SSettings{
-			FPath:     pPath,
-			FWorkSize: settings.CWorkForKeys,
-			FPassword: pPassword,
-		}),
-	)
+func NewKeyValueDB(pSettings storage.ISettings) (IKVDatabase, error) {
+	db, err := gp_database.NewKeyValueDB(pSettings)
 	if err != nil {
 		return nil, errors.WrapError(err, "new key/value database")
 	}

cmd/hidden_lake/messenger/internal/database/types.go

@@ -5,13 +5,6 @@ import (
 	"github.com/number571/go-peer/pkg/types"
 )
 
-type IWrapperDB interface {
-	types.ICloser
-
-	Get() IKVDatabase
-	Set(IKVDatabase) IWrapperDB
-}
-
 type IKVDatabase interface {
 	types.ICloser
 

cmd/hidden_lake/messenger/internal/handler/about.go

@@ -4,20 +4,20 @@ import (
 	"html/template"
 	"net/http"
 
-	"github.com/number571/go-peer/cmd/hidden_lake/messenger/pkg/app/state"
+	"github.com/number571/go-peer/cmd/hidden_lake/messenger/internal/config"
 	"github.com/number571/go-peer/cmd/hidden_lake/messenger/web"
 	"github.com/number571/go-peer/pkg/logger"
 
 	hlm_settings "github.com/number571/go-peer/cmd/hidden_lake/messenger/pkg/settings"
 	http_logger "github.com/number571/go-peer/internal/logger/http"
 )
 
-func AboutPage(pStateManager state.IStateManager, pLogger logger.ILogger) http.HandlerFunc {
+func AboutPage(pLogger logger.ILogger, pCfg config.IConfig) http.HandlerFunc {
 	return func(pW http.ResponseWriter, pR *http.Request) {
 		logBuilder := http_logger.NewLogBuilder(hlm_settings.CServiceName, pR)
 
 		if pR.URL.Path != "/about" {
-			NotFoundPage(pStateManager, pLogger)(pW, pR)
+			NotFoundPage(pLogger, pCfg)(pW, pR)
 			return
 		}
 
@@ -31,6 +31,6 @@ func AboutPage(pStateManager state.IStateManager, pLogger logger.ILogger) http.H
 		}
 
 		pLogger.PushInfo(logBuilder.WithMessage(http_logger.CLogSuccess))
-		t.Execute(pW, pStateManager.GetTemplate())
+		t.Execute(pW, getTemplate(pCfg))
 	}
 }

cmd/hidden_lake/messenger/internal/handler/favicon.go

@@ -3,19 +3,19 @@ package handler
 import (
 	"net/http"
 
-	"github.com/number571/go-peer/cmd/hidden_lake/messenger/pkg/app/state"
 	http_logger "github.com/number571/go-peer/internal/logger/http"
 	"github.com/number571/go-peer/pkg/logger"
 
+	"github.com/number571/go-peer/cmd/hidden_lake/messenger/internal/config"
 	hlm_settings "github.com/number571/go-peer/cmd/hidden_lake/messenger/pkg/settings"
 )
 
-func FaviconPage(pStateManager state.IStateManager, pLogger logger.ILogger) http.HandlerFunc {
+func FaviconPage(pLogger logger.ILogger, pCfg config.IConfig) http.HandlerFunc {
 	return func(pW http.ResponseWriter, pR *http.Request) {
 		logBuilder := http_logger.NewLogBuilder(hlm_settings.CServiceName, pR)
 
 		if pR.URL.Path != "/favicon.ico" {
-			NotFoundPage(pStateManager, pLogger)(pW, pR)
+			NotFoundPage(pLogger, pCfg)(pW, pR)
 			return
 		}
 

cmd/hidden_lake/messenger/internal/handler/friends.go

@@ -7,7 +7,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/number571/go-peer/cmd/hidden_lake/messenger/pkg/app/state"
+	"github.com/number571/go-peer/cmd/hidden_lake/messenger/internal/config"
 	hlm_settings "github.com/number571/go-peer/cmd/hidden_lake/messenger/pkg/settings"
 	"github.com/number571/go-peer/cmd/hidden_lake/messenger/web"
 	http_logger "github.com/number571/go-peer/internal/logger/http"
@@ -16,27 +16,23 @@ import (
 )
 
 type sFriends struct {
-	*state.STemplateState
+	*sTemplate
 	FFriends []string
 }
 
-func FriendsPage(pStateManager state.IStateManager, pLogger logger.ILogger) http.HandlerFunc {
+func FriendsPage(pLogger logger.ILogger, pCfg config.IConfig) http.HandlerFunc {
 	return func(pW http.ResponseWriter, pR *http.Request) {
 		logBuilder := http_logger.NewLogBuilder(hlm_settings.CServiceName, pR)
 
 		if pR.URL.Path != "/friends" {
-			NotFoundPage(pStateManager, pLogger)(pW, pR)
-			return
-		}
-
-		if !pStateManager.StateIsActive() {
-			pLogger.PushInfo(logBuilder.WithMessage(http_logger.CLogRedirect))
-			http.Redirect(pW, pR, "/sign/in", http.StatusFound)
+			NotFoundPage(pLogger, pCfg)(pW, pR)
 			return
 		}
 
 		pR.ParseForm()
 
+		client := getClient(pCfg)
+
 		switch pR.FormValue("method") {
 		case http.MethodPost:
 			aliasName := strings.TrimSpace(pR.FormValue("alias_name"))
@@ -52,7 +48,7 @@ func FriendsPage(pStateManager state.IStateManager, pLogger logger.ILogger) http
 				fmt.Fprint(pW, "error: public key is nil")
 				return
 			}
-			if err := pStateManager.AddFriend(aliasName, pubKey); err != nil {
+			if err := client.AddFriend(aliasName, pubKey); err != nil {
 				pLogger.PushWarn(logBuilder.WithMessage("add_friend"))
 				fmt.Fprint(pW, "error: add friend")
 				return
@@ -64,26 +60,26 @@ func FriendsPage(pStateManager state.IStateManager, pLogger logger.ILogger) http
 				fmt.Fprint(pW, "error: alias_name is null")
 				return
 			}
-			if err := pStateManager.DelFriend(aliasName); err != nil {
+			if err := client.DelFriend(aliasName); err != nil {
 				pLogger.PushWarn(logBuilder.WithMessage("del_friend"))
 				fmt.Fprint(pW, "error: del friend")
 				return
 			}
 		}
 
-		res, err := pStateManager.GetClient().GetFriends()
+		friends, err := client.GetFriends()
 		if err != nil {
 			pLogger.PushWarn(logBuilder.WithMessage("get_friends"))
 			fmt.Fprint(pW, "error: read friends")
 			return
 		}
 
 		result := new(sFriends)
-		result.STemplateState = pStateManager.GetTemplate()
-		result.FFriends = make([]string, 0, len(res)+1) // +1 CIamAliasName
+		result.sTemplate = getTemplate(pCfg)
+		result.FFriends = make([]string, 0, len(friends)+1) // +1 CIamAliasName
 
-		friendsList := make([]string, 0, len(res))
-		for aliasName := range res {
+		friendsList := make([]string, 0, len(friends))
+		for aliasName := range friends {
 			friendsList = append(friendsList, aliasName)
 		}
 		sort.Strings(friendsList)