From cb6c42291d71446e02cae21e35322cc1d109c914 Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Fri, 24 Sep 2021 12:31:05 +0200
Subject: [PATCH] added database to authorizer
---
.../src/asapo_authorizer/database/database.go | 35 +++++
.../database/mock_database.go | 31 ++++
.../src/asapo_authorizer/database/mongodb.go | 122 +++++++++++++++
authorizer/src/asapo_authorizer/go.mod | 1 +
authorizer/src/asapo_authorizer/go.sum | 111 +++++++++++++-
.../src/asapo_authorizer/server/db_request.go | 29 ++++
.../server/db_request_test.go | 74 +++++++++
.../src/asapo_authorizer/server/server.go | 46 ++++++
.../server/server_nottested.go | 20 +++
.../asapo_authorizer/server/server_test.go | 140 ++++++++++++++++++
broker/src/asapo_broker/server/server.go | 16 +-
broker/src/asapo_broker/server/server_test.go | 5 +-
common/cpp/src/logger/spd_logger.cpp | 44 ++++--
.../cpp/src/system_io/system_io_linux_mac.cpp | 2 +-
.../src/asapo_common/discovery/discovery.go | 25 ++++
.../scripts/authorizer.json.tpl | 4 +-
.../common_scripts/start_services.bat | 2 +-
.../common_scripts/start_services.sh | 3 +-
.../settings/authorizer_settings.json.tpl.lin | 4 +-
.../settings/authorizer_settings.json.tpl.win | 4 +-
20 files changed, 679 insertions(+), 39 deletions(-)
create mode 100644 authorizer/src/asapo_authorizer/database/database.go
create mode 100644 authorizer/src/asapo_authorizer/database/mock_database.go
create mode 100644 authorizer/src/asapo_authorizer/database/mongodb.go
create mode 100644 authorizer/src/asapo_authorizer/server/db_request.go
create mode 100644 authorizer/src/asapo_authorizer/server/db_request_test.go
create mode 100644 authorizer/src/asapo_authorizer/server/server_test.go
create mode 100644 common/go/src/asapo_common/discovery/discovery.go
diff --git a/authorizer/src/asapo_authorizer/database/database.go b/authorizer/src/asapo_authorizer/database/database.go
new file mode 100644
index 000000000..ed7ebd7db
--- /dev/null
+++ b/authorizer/src/asapo_authorizer/database/database.go
@@ -0,0 +1,35 @@
+package database
+
+import "asapo_common/utils"
+
+type Request struct {
+ DbName string
+ Collection string
+ Op string
+ ExtraParam string
+}
+
+type Agent interface {
+ ProcessRequest(request Request) ([]byte, error)
+ Ping() error
+ Connect(string) error
+ Close()
+}
+
+type DBError struct {
+ Code int
+ Message string
+}
+
+func (err *DBError) Error() string {
+ return err.Message
+}
+
+func GetStatusCodeFromError(err error) int {
+ err_db, ok := err.(*DBError)
+ if ok {
+ return err_db.Code
+ } else {
+ return utils.StatusServiceUnavailable
+ }
+}
diff --git a/authorizer/src/asapo_authorizer/database/mock_database.go b/authorizer/src/asapo_authorizer/database/mock_database.go
new file mode 100644
index 000000000..150972dfb
--- /dev/null
+++ b/authorizer/src/asapo_authorizer/database/mock_database.go
@@ -0,0 +1,31 @@
+// +build !release
+
+package database
+
+import (
+ "github.com/stretchr/testify/mock"
+)
+
+type MockedDatabase struct {
+ mock.Mock
+}
+
+func (db *MockedDatabase) Connect(address string) error {
+ args := db.Called(address)
+ return args.Error(0)
+}
+
+func (db *MockedDatabase) Close() {
+ db.Called()
+}
+
+func (db *MockedDatabase) Ping() error {
+ args := db.Called()
+ return args.Error(0)
+}
+
+
+func (db *MockedDatabase) ProcessRequest(request Request) (answer []byte, err error) {
+ args := db.Called(request)
+ return args.Get(0).([]byte), args.Error(1)
+}
diff --git a/authorizer/src/asapo_authorizer/database/mongodb.go b/authorizer/src/asapo_authorizer/database/mongodb.go
new file mode 100644
index 000000000..96abc4e9f
--- /dev/null
+++ b/authorizer/src/asapo_authorizer/database/mongodb.go
@@ -0,0 +1,122 @@
+//+build !test
+
+package database
+
+import (
+ "asapo_common/utils"
+ "context"
+ "errors"
+ "go.mongodb.org/mongo-driver/mongo"
+ "go.mongodb.org/mongo-driver/mongo/options"
+ "strings"
+ "sync"
+ "time"
+)
+
+const no_session_msg = "database client not created"
+const already_connected_msg = "already connected"
+
+var dbSessionLock sync.Mutex
+var dbClientLock sync.RWMutex
+
+type Mongodb struct {
+ client *mongo.Client
+ timeout time.Duration
+ lastReadFromInprocess map[string]int64
+}
+
+func (db *Mongodb) Ping() (err error) {
+ if db.client == nil {
+ return &DBError{utils.StatusServiceUnavailable, no_session_msg}
+ }
+ ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+ defer cancel()
+ return db.client.Ping(ctx, nil)
+}
+
+func (db *Mongodb) Connect(address string) (err error) {
+ dbClientLock.Lock()
+ defer dbClientLock.Unlock()
+
+ if db.client != nil {
+ return &DBError{utils.StatusServiceUnavailable, already_connected_msg}
+ }
+ db.client, err = mongo.NewClient(options.Client().SetConnectTimeout(20 * time.Second).ApplyURI("mongodb://" + address))
+ if err != nil {
+ return err
+ }
+ ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
+ defer cancel()
+ err = db.client.Connect(ctx)
+ if err != nil {
+ db.client = nil
+ return err
+ }
+
+ if db.lastReadFromInprocess == nil {
+ db.lastReadFromInprocess = make(map[string]int64, 100)
+ }
+
+ return db.Ping()
+}
+
+func (db *Mongodb) Close() {
+ dbClientLock.Lock()
+ defer dbClientLock.Unlock()
+ if db.client != nil {
+ ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
+ defer cancel()
+ db.client.Disconnect(ctx)
+ db.client = nil
+ }
+}
+
+func (db *Mongodb) insertRecord(dbname string, collection_name string, s interface{}) error {
+ if db.client == nil {
+ return &DBError{utils.StatusServiceUnavailable, no_session_msg}
+ }
+
+ c := db.client.Database(dbname).Collection(collection_name)
+
+ _, err := c.InsertOne(context.TODO(), s)
+ return err
+}
+
+func duplicateError(err error) bool {
+ command_error, ok := err.(mongo.CommandError)
+ if !ok {
+ write_exception_error, ok1 := err.(mongo.WriteException)
+ if !ok1 {
+ return false
+ }
+ return strings.Contains(write_exception_error.Error(), "duplicate key")
+ }
+ return command_error.Name == "DuplicateKey"
+}
+
+
+func (db *Mongodb) checkDatabaseOperationPrerequisites(request Request) error {
+ if db.client == nil {
+ return &DBError{utils.StatusServiceUnavailable, no_session_msg}
+ }
+
+ if len(request.DbName) == 0 || len(request.Collection) == 0 {
+ return &DBError{utils.StatusWrongInput, "database ans collection must be set"}
+ }
+
+ return nil
+}
+
+func (db *Mongodb) ProcessRequest(request Request) (answer []byte, err error) {
+ dbClientLock.RLock()
+ defer dbClientLock.RUnlock()
+
+ if err := db.checkDatabaseOperationPrerequisites(request); err != nil {
+ return nil, err
+ }
+
+ switch request.Op {
+ }
+
+ return nil, errors.New("Wrong db operation: " + request.Op)
+}
diff --git a/authorizer/src/asapo_authorizer/go.mod b/authorizer/src/asapo_authorizer/go.mod
index 67af7e095..81f46fd12 100644
--- a/authorizer/src/asapo_authorizer/go.mod
+++ b/authorizer/src/asapo_authorizer/go.mod
@@ -9,5 +9,6 @@ require (
github.com/go-ldap/ldap v3.0.3+incompatible
github.com/rs/xid v1.2.1
github.com/stretchr/testify v1.7.0
+ go.mongodb.org/mongo-driver v1.7.2
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
)
diff --git a/authorizer/src/asapo_authorizer/go.sum b/authorizer/src/asapo_authorizer/go.sum
index 4e1c32df6..f9db70a3f 100644
--- a/authorizer/src/asapo_authorizer/go.sum
+++ b/authorizer/src/asapo_authorizer/go.sum
@@ -1,3 +1,4 @@
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -5,26 +6,132 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumC
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/go-ldap/ldap v3.0.3+incompatible h1:HTeSZO8hWMS1Rgb2Ziku6b8a7qRIZZMHjsvuZyatzwk=
github.com/go-ldap/ldap v3.0.3+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc=
+github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0=
+github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY=
+github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg=
+github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
+github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
+github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs=
+github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
+github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
+github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk=
+github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28=
+github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo=
+github.com/gobuffalo/genny v0.1.1/go.mod h1:5TExbEyY48pfunL4QSXxlDOmdsD44RRq4mVZ0Ex28Xk=
+github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw=
+github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360=
+github.com/gobuffalo/gogen v0.1.0/go.mod h1:8NTelM5qd8RZ15VjQTFkAW6qOMx5wBbW4dSCS3BY8gg=
+github.com/gobuffalo/gogen v0.1.1/go.mod h1:y8iBtmHmGc4qa3urIyo1shvOD8JftTtfcKi+71xfDNE=
+github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8=
+github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
+github.com/gobuffalo/mapi v1.0.2/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
+github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
+github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
+github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ=
+github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0=
+github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
+github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
+github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
+github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
+github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
+github.com/klauspost/compress v1.9.5 h1:U+CaK85mrNNb4k8BNOfgJtJ/gr6kswUCFj6miSzVC6M=
+github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/magefile/mage v1.10.0 h1:3HiXzCUY12kh9bIuyXShaVe529fJfyqoVM42o/uom2g=
github.com/magefile/mage v1.10.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
+github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
+github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
+github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
+github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/rs/xid v1.2.1 h1:mhH9Nq+C1fY2l1XIpgxIiUOfNpRBYH1kKcr+qfKgjRc=
github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
+github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/sirupsen/logrus v1.8.0 h1:nfhvjKcUMhBMVqbKHJlk5RPrrfYr/NMo3692g0dwfWU=
github.com/sirupsen/logrus v1.8.0/go.mod h1:4GuYW9TZmE769R5STWrRakJc4UqQ3+QQ95fyz7ENv1A=
-github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
+github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
+github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
+github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
+github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
+github.com/xdg-go/scram v1.0.2 h1:akYIkZ28e6A96dkWNJQu3nmCzH3YfwMPQExUYDaRv7w=
+github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs=
+github.com/xdg-go/stringprep v1.0.2 h1:6iq84/ryjjeRmMJwxutI51F2GIPlP5BfTvXHeYjyhBc=
+github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
+github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA=
+github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
+go.mongodb.org/mongo-driver v1.7.2 h1:pFttQyIiJUHEn50YfZgC9ECjITMT44oiN36uArf/OFg=
+go.mongodb.org/mongo-driver v1.7.2/go.mod h1:Q4oFMbo1+MSNqICAdYMlC/zSTrwCogR4R8NzkI+yfU8=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
+golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 h1:xMPOj6Pz6UipU1wXLkrtqpHbR0AVFnyPEQq/wRWz9lM=
+golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ=
+golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM=
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/authorizer/src/asapo_authorizer/server/db_request.go b/authorizer/src/asapo_authorizer/server/db_request.go
new file mode 100644
index 000000000..135aca5a2
--- /dev/null
+++ b/authorizer/src/asapo_authorizer/server/db_request.go
@@ -0,0 +1,29 @@
+package server
+
+import (
+ "asapo_authorizer/database"
+ log "asapo_common/logger"
+ "asapo_common/utils"
+)
+
+func reconnectIfNeeded(db_error error) {
+ code := database.GetStatusCodeFromError(db_error)
+ if code != utils.StatusServiceUnavailable {
+ return
+ }
+
+ if err := ReconnectDb(); err != nil {
+ log.Error("cannot reconnect to database at : " + settings.GetDatabaseServer() + " " + err.Error())
+ } else {
+ log.Debug("reconnected to database" + settings.GetDatabaseServer())
+ }
+}
+
+func ProcessRequestInDb(request database.Request) ([]byte,error) {
+ answer, err := db.ProcessRequest(request)
+ if err != nil {
+ go reconnectIfNeeded(err)
+ return nil,err
+ }
+ return answer,nil
+}
diff --git a/authorizer/src/asapo_authorizer/server/db_request_test.go b/authorizer/src/asapo_authorizer/server/db_request_test.go
new file mode 100644
index 000000000..2f42f4627
--- /dev/null
+++ b/authorizer/src/asapo_authorizer/server/db_request_test.go
@@ -0,0 +1,74 @@
+package server
+
+import (
+ "asapo_authorizer/database"
+ "asapo_common/logger"
+ "asapo_common/utils"
+ "github.com/stretchr/testify/mock"
+ "github.com/stretchr/testify/suite"
+ "testing"
+ "time"
+)
+
+
+const expectedSource = "datasource"
+const expectedStream = "stream"
+
+
+func ExpectReconnect(mock_db *database.MockedDatabase) {
+ mock_db.On("Close").Return()
+ mock_db.On("Connect", mock.AnythingOfType("string")).Return(nil)
+}
+
+type ProcessRequestTestSuite struct {
+ suite.Suite
+ mock_db *database.MockedDatabase
+}
+
+func (suite *ProcessRequestTestSuite) SetupTest() {
+ suite.mock_db = new(database.MockedDatabase)
+ db = suite.mock_db
+ logger.SetMockLog()
+}
+
+func (suite *ProcessRequestTestSuite) TearDownTest() {
+ assertExpectations(suite.T(), suite.mock_db)
+ logger.UnsetMockLog()
+ db = nil
+}
+
+func TestProcessRequestTestSuite(t *testing.T) {
+ suite.Run(t, new(ProcessRequestTestSuite))
+}
+
+
+func (suite *ProcessRequestTestSuite) TestProcessRequestWithConnectionError() {
+ req := database.Request{}
+
+ suite.mock_db.On("ProcessRequest", req).Return([]byte(""),
+ &database.DBError{utils.StatusServiceUnavailable, ""})
+
+ ExpectReconnect(suite.mock_db)
+ logger.MockLog.On("Debug", mock.MatchedBy(containsMatcher("reconnected")))
+
+ _,err := ProcessRequestInDb(req)
+ time.Sleep(time.Second)
+ suite.Error(err, "need reconnect")
+}
+
+
+func (suite *ProcessRequestTestSuite) TestProcessRequestAddTokenToDb() {
+ req := database.Request{
+ DbName: "test",
+ Collection: "test",
+ Op: "test",
+ ExtraParam: "test",
+ }
+
+ suite.mock_db.On("ProcessRequest", req).Return([]byte("Hello"), nil)
+
+
+ _,err := ProcessRequestInDb(req)
+ suite.Equal(err, nil, "ok")
+
+}
diff --git a/authorizer/src/asapo_authorizer/server/server.go b/authorizer/src/asapo_authorizer/server/server.go
index 59d43987d..8fec39728 100644
--- a/authorizer/src/asapo_authorizer/server/server.go
+++ b/authorizer/src/asapo_authorizer/server/server.go
@@ -2,7 +2,11 @@ package server
import (
"asapo_authorizer/authorization"
+ "asapo_authorizer/database"
"asapo_authorizer/ldap_client"
+ "asapo_common/discovery"
+ log "asapo_common/logger"
+ "errors"
)
type beamtimeMeta struct {
@@ -36,9 +40,51 @@ type serverSettings struct {
BaseDn string
FilterTemplate string
}
+ DiscoveryServer string
+ DatabaseServer string
+ discoveredDbAddress string
+}
+
+func (s *serverSettings) GetDatabaseServer() string {
+ if s.DatabaseServer == "auto" {
+ return s.discoveredDbAddress
+ } else {
+ return s.DatabaseServer
+ }
}
var settings serverSettings
var ldapClient ldap_client.LdapClient
var Auth *authorization.Auth
+var discoveryService discovery.DiscoveryAPI
+var db database.Agent
+
+func ReconnectDb() (err error) {
+ if db == nil {
+ return errors.New("database not initialized")
+ }
+ db.Close()
+ return InitDB(db)
+}
+func InitDB(dbAgent database.Agent) (err error) {
+ db = dbAgent
+ if settings.DatabaseServer == "auto" {
+ settings.discoveredDbAddress, err = discoveryService.GetMongoDbAddress()
+ if err != nil {
+ return err
+ }
+ if settings.discoveredDbAddress == "" {
+ return errors.New("no database servers found")
+ }
+ log.Debug("Got mongodb server: " + settings.discoveredDbAddress)
+ }
+
+ return db.Connect(settings.GetDatabaseServer())
+}
+
+func CleanupDB() {
+ if db != nil {
+ db.Close()
+ }
+}
diff --git a/authorizer/src/asapo_authorizer/server/server_nottested.go b/authorizer/src/asapo_authorizer/server/server_nottested.go
index 2f428370f..e87f62fff 100644
--- a/authorizer/src/asapo_authorizer/server/server_nottested.go
+++ b/authorizer/src/asapo_authorizer/server/server_nottested.go
@@ -4,7 +4,9 @@ package server
import (
"asapo_authorizer/authorization"
+ "asapo_authorizer/database"
"asapo_authorizer/ldap_client"
+ "asapo_common/discovery"
log "asapo_common/logger"
"asapo_common/utils"
"asapo_common/version"
@@ -13,10 +15,20 @@ import (
"strconv"
)
+
func Start() {
mux := utils.NewRouter(listRoutes)
ldapClient = new(ldap_client.OpenLdapClient)
+ discoveryService = discovery.CreateDiscoveryService(&http.Client{},"http://" + settings.DiscoveryServer)
+
log.Info("Starting ASAPO Authorizer, version " + version.GetVersion())
+
+ err := InitDB(new(database.Mongodb))
+ if err != nil {
+ log.Error(err.Error())
+ }
+ defer CleanupDB()
+
log.Info("Listening on port: " + strconv.Itoa(settings.Port))
log.Fatal(http.ListenAndServe(":"+strconv.Itoa(settings.Port), http.HandlerFunc(mux.ServeHTTP)))
}
@@ -50,6 +62,14 @@ func ReadConfig(fname string) (log.Level, error) {
return log.FatalLevel, errors.New("Admin secret file not set")
}
+ if settings.DatabaseServer == "" {
+ return log.FatalLevel, errors.New("Database server not set")
+ }
+
+ if settings.DatabaseServer == "auto" && settings.DiscoveryServer=="" {
+ return log.FatalLevel, errors.New("Discovery server not set")
+ }
+
var err error
Auth, err = createAuth()
if err != nil {
diff --git a/authorizer/src/asapo_authorizer/server/server_test.go b/authorizer/src/asapo_authorizer/server/server_test.go
new file mode 100644
index 000000000..46f045ddf
--- /dev/null
+++ b/authorizer/src/asapo_authorizer/server/server_test.go
@@ -0,0 +1,140 @@
+package server
+
+import (
+ "asapo_authorizer/database"
+ "asapo_common/discovery"
+ "asapo_common/logger"
+ "errors"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/mock"
+ "net/http"
+ "net/http/httptest"
+ "testing"
+)
+
+func setup() *database.MockedDatabase {
+ mock_db := new(database.MockedDatabase)
+ mock_db.On("Connect", mock.AnythingOfType("string")).Return(nil)
+
+ return mock_db
+}
+
+func setup_and_init(t *testing.T) *database.MockedDatabase {
+ mock_db := new(database.MockedDatabase)
+ mock_db.On("Connect", mock.AnythingOfType("string")).Return(nil)
+
+ InitDB(mock_db)
+ assertExpectations(t, mock_db)
+ return mock_db
+}
+
+func assertExpectations(t *testing.T, mock_db *database.MockedDatabase) {
+ mock_db.AssertExpectations(t)
+ mock_db.ExpectedCalls = nil
+ logger.MockLog.AssertExpectations(t)
+ logger.MockLog.ExpectedCalls = nil
+}
+
+var initDBTests = []struct {
+ address string
+ answer error
+ message string
+}{
+ {"bad address", errors.New(""), "error on get bad address"},
+ {"good address", nil, "no error on good address"},
+}
+
+func TestInitDBWithWrongAddress(t *testing.T) {
+ mock_db := setup()
+
+ mock_db.ExpectedCalls = nil
+
+ settings.DatabaseServer = "0.0.0.0:0000"
+
+ for _, test := range initDBTests {
+ mock_db.On("Connect", "0.0.0.0:0000").Return(test.answer)
+
+ err := InitDB(mock_db)
+
+ assert.Equal(t, test.answer, err, test.message)
+ assertExpectations(t, mock_db)
+ }
+ db = nil
+}
+
+func TestInitDBWithAutoAddress(t *testing.T) {
+ mongo_address := "0.0.0.0:0000"
+ mock_db := setup()
+
+ mock_db.ExpectedCalls = nil
+
+ settings.DatabaseServer = "auto"
+ mock_server := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
+ assert.Equal(t, req.URL.String(), "/asapo-mongodb", "request string")
+ rw.Write([]byte(mongo_address))
+ }))
+ defer mock_server.Close()
+
+ discoveryService = discovery.CreateDiscoveryService(mock_server.Client(), mock_server.URL)
+
+ mock_db.On("Connect", "0.0.0.0:0000").Return(nil)
+
+ err := InitDB(mock_db)
+
+ assert.Equal(t, nil, err, "auto connect ok")
+ assertExpectations(t, mock_db)
+ db = nil
+}
+
+func TestReconnectDB(t *testing.T) {
+ mongo_address := "0.0.0.0:0000"
+ mock_server := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
+ assert.Equal(t, req.URL.String(), "/asapo-mongodb", "request string")
+ rw.Write([]byte(mongo_address))
+ }))
+ discoveryService = discovery.CreateDiscoveryService(mock_server.Client(), mock_server.URL)
+
+ defer mock_server.Close()
+
+ settings.DatabaseServer = "auto"
+ mock_db := setup_and_init(t)
+ mock_db.ExpectedCalls = nil
+
+ mongo_address = "1.0.0.0:0000"
+
+ mock_db.On("Close").Return()
+
+ mock_db.On("Connect", "1.0.0.0:0000").Return(nil)
+
+ err := ReconnectDb()
+ assert.Equal(t, nil, err, "auto connect ok")
+ assertExpectations(t, mock_db)
+
+ db = nil
+}
+
+func TestErrorWhenReconnectNotConnectedDB(t *testing.T) {
+ err := ReconnectDb()
+ assert.NotNil(t, err, "error reconnect")
+ db = nil
+}
+
+
+func TestCleanupDBWithoutInit(t *testing.T) {
+ mock_db := setup()
+
+ mock_db.AssertNotCalled(t, "Close")
+
+ CleanupDB()
+}
+
+func TestCleanupDBInit(t *testing.T) {
+ settings.DatabaseServer = "0.0.0.0"
+ mock_db := setup_and_init(t)
+
+ mock_db.On("Close").Return()
+
+ CleanupDB()
+
+ assertExpectations(t, mock_db)
+}
diff --git a/broker/src/asapo_broker/server/server.go b/broker/src/asapo_broker/server/server.go
index 1537fa086..2d194f1d4 100644
--- a/broker/src/asapo_broker/server/server.go
+++ b/broker/src/asapo_broker/server/server.go
@@ -2,9 +2,9 @@ package server
import (
"asapo_broker/database"
+ "asapo_common/discovery"
log "asapo_common/logger"
"errors"
- "io/ioutil"
"net/http"
)
@@ -58,17 +58,7 @@ type discoveryAPI struct {
baseURL string
}
-var discoveryService discoveryAPI
-
-func (api *discoveryAPI) GetMongoDbAddress() (string, error) {
- resp, err := api.Client.Get(api.baseURL + "/asapo-mongodb")
- if err != nil {
- return "", err
- }
- defer resp.Body.Close()
- body, err := ioutil.ReadAll(resp.Body)
- return string(body), err
-}
+var discoveryService discovery.DiscoveryAPI
func ReconnectDb() (err error) {
if db == nil {
@@ -97,7 +87,7 @@ func InitDB(dbAgent database.Agent) (err error) {
}
func CreateDiscoveryService() {
- discoveryService = discoveryAPI{&http.Client{}, "http://" + settings.DiscoveryServer}
+ discoveryService = discovery.CreateDiscoveryService(&http.Client{},"http://" + settings.DiscoveryServer)
}
func CleanupDB() {
diff --git a/broker/src/asapo_broker/server/server_test.go b/broker/src/asapo_broker/server/server_test.go
index 3a7243782..fc593fd02 100644
--- a/broker/src/asapo_broker/server/server_test.go
+++ b/broker/src/asapo_broker/server/server_test.go
@@ -2,6 +2,7 @@ package server
import (
"asapo_broker/database"
+ "asapo_common/discovery"
"asapo_common/logger"
"errors"
"github.com/stretchr/testify/assert"
@@ -77,7 +78,7 @@ func TestInitDBWithAutoAddress(t *testing.T) {
}))
defer mock_server.Close()
- discoveryService = discoveryAPI{mock_server.Client(), mock_server.URL}
+ discoveryService = discovery.CreateDiscoveryService(mock_server.Client(), mock_server.URL)
mock_db.On("Connect", "0.0.0.0:0000").Return(nil)
mock_db.On("SetSettings", mock.Anything).Return()
@@ -95,7 +96,7 @@ func TestReconnectDB(t *testing.T) {
assert.Equal(t, req.URL.String(), "/asapo-mongodb", "request string")
rw.Write([]byte(mongo_address))
}))
- discoveryService = discoveryAPI{mock_server.Client(), mock_server.URL}
+ discoveryService = discovery.CreateDiscoveryService(mock_server.Client(), mock_server.URL)
defer mock_server.Close()
diff --git a/common/cpp/src/logger/spd_logger.cpp b/common/cpp/src/logger/spd_logger.cpp
index 01a7606ea..4cc5c49b0 100644
--- a/common/cpp/src/logger/spd_logger.cpp
+++ b/common/cpp/src/logger/spd_logger.cpp
@@ -30,24 +30,38 @@ void SpdLogger::SetLogLevel(LogLevel level) {
}
}
-std::string escape_json(const std::string &s) {
+std::string escape_json(const std::string& s) {
std::ostringstream o;
for (auto c = s.cbegin(); c != s.cend(); c++) {
switch (*c) {
- case '"': o << "\\\""; break;
- case '\\': o << "\\\\"; break;
- case '\b': o << "\\b"; break;
- case '\f': o << "\\f"; break;
- case '\n': o << "\\n"; break;
- case '\r': o << "\\r"; break;
- case '\t': o << "\\t"; break;
- default:
- if ('\x00' <= *c && *c <= '\x1f') {
- o << "\\u"
- << std::hex << std::setw(4) << std::setfill('0') << (int)*c;
- } else {
- o << *c;
- }
+ case '"':
+ o << "\\\"";
+ break;
+ case '\\':
+ o << "\\\\";
+ break;
+ case '\b':
+ o << "\\b";
+ break;
+ case '\f':
+ o << "\\f";
+ break;
+ case '\n':
+ o << "\\n";
+ break;
+ case '\r':
+ o << "\\r";
+ break;
+ case '\t':
+ o << "\\t";
+ break;
+ default:
+ if ('\x00' <= *c && *c <= '\x1f') {
+ o << "\\u"
+ << std::hex << std::setw(4) << std::setfill('0') << (int)*c;
+ } else {
+ o << *c;
+ }
}
}
return o.str();
diff --git a/common/cpp/src/system_io/system_io_linux_mac.cpp b/common/cpp/src/system_io/system_io_linux_mac.cpp
index f5fc7368b..9d36dca7b 100644
--- a/common/cpp/src/system_io/system_io_linux_mac.cpp
+++ b/common/cpp/src/system_io/system_io_linux_mac.cpp
@@ -51,7 +51,7 @@ Error GetLastErrorFromErrno() {
case ENOSPC:
return IOErrorTemplates::kNoSpaceLeft.Generate();
case ENOTCONN:
- return IOErrorTemplates::kNotConnected.Generate();
+ return IOErrorTemplates::kNotConnected.Generate();
case ECONNREFUSED:
return IOErrorTemplates::kConnectionRefused.Generate();
case EADDRINUSE:
diff --git a/common/go/src/asapo_common/discovery/discovery.go b/common/go/src/asapo_common/discovery/discovery.go
new file mode 100644
index 000000000..078dae72a
--- /dev/null
+++ b/common/go/src/asapo_common/discovery/discovery.go
@@ -0,0 +1,25 @@
+package discovery
+
+import (
+ "io/ioutil"
+ "net/http"
+)
+
+type DiscoveryAPI struct {
+ client *http.Client
+ baseURL string
+}
+
+func (api *DiscoveryAPI) GetMongoDbAddress() (string, error) {
+ resp, err := api.client.Get(api.baseURL + "/asapo-mongodb")
+ if err != nil {
+ return "", err
+ }
+ defer resp.Body.Close()
+ body, err := ioutil.ReadAll(resp.Body)
+ return string(body), err
+}
+
+func CreateDiscoveryService(client *http.Client,uri string) DiscoveryAPI{
+ return DiscoveryAPI{&http.Client{}, uri}
+}
\ No newline at end of file
diff --git a/deploy/asapo_services/scripts/authorizer.json.tpl b/deploy/asapo_services/scripts/authorizer.json.tpl
index 3aecc0df6..d5c24a2bb 100644
--- a/deploy/asapo_services/scripts/authorizer.json.tpl
+++ b/deploy/asapo_services/scripts/authorizer.json.tpl
@@ -14,5 +14,7 @@
"Uri" : "{{ env "NOMAD_META_ldap_uri" }}",
"BaseDn" : "ou=rgy,o=desy,c=de",
"FilterTemplate" : "(cn=a3__BEAMLINE__-hosts)"
- }
+ },
+ "DatabaseServer":"auto",
+ "DiscoveryServer": "localhost:8400/asapo-discovery"
}
diff --git a/tests/automatic/common_scripts/start_services.bat b/tests/automatic/common_scripts/start_services.bat
index 87f16087a..ae99389a1 100644
--- a/tests/automatic/common_scripts/start_services.bat
+++ b/tests/automatic/common_scripts/start_services.bat
@@ -1,6 +1,5 @@
c:\opt\consul\nomad run nginx.nmd
c:\opt\consul\nomad run discovery.nmd
-c:\opt\consul\nomad run authorizer.nmd
ping 192.0.2.1 -n 1 -w 3000 > nul
@@ -14,6 +13,7 @@ if %i% EQU 20 (
ping 192.0.2.1 -n 1 -w 1000 >nul
curl --silent --fail 127.0.0.1:8400/asapo-discovery/asapo-mongodb --stderr - | findstr 127.0.0.1 || goto :repeat
if %i% EQU 1 (
+ c:\opt\consul\nomad run authorizer.nmd
c:\opt\consul\nomad run receiver_tcp.nmd
c:\opt\consul\nomad run broker.nmd
c:\opt\consul\nomad run file_transfer.nmd
diff --git a/tests/automatic/common_scripts/start_services.sh b/tests/automatic/common_scripts/start_services.sh
index 5c3f70a71..944f3ed0b 100755
--- a/tests/automatic/common_scripts/start_services.sh
+++ b/tests/automatic/common_scripts/start_services.sh
@@ -1,4 +1,3 @@
-nomad run authorizer.nmd
nomad run discovery.nmd
nomad run nginx.nmd
@@ -11,7 +10,7 @@ do
break
done
-
+nomad run authorizer.nmd
nomad run file_transfer.nmd
nomad run receiver_tcp.nmd
nomad run broker.nmd
diff --git a/tests/automatic/settings/authorizer_settings.json.tpl.lin b/tests/automatic/settings/authorizer_settings.json.tpl.lin
index 0980b029a..1de8b3d3b 100644
--- a/tests/automatic/settings/authorizer_settings.json.tpl.lin
+++ b/tests/automatic/settings/authorizer_settings.json.tpl.lin
@@ -15,5 +15,7 @@
"Uri" : "ldap://localhost:389",
"BaseDn" : "ou=rgy,o=desy,c=de",
"FilterTemplate" : "(cn=a3__BEAMLINE__-hosts)"
- }
+ },
+ "DatabaseServer":"auto",
+ "DiscoveryServer": "localhost:8400/asapo-discovery"
}
diff --git a/tests/automatic/settings/authorizer_settings.json.tpl.win b/tests/automatic/settings/authorizer_settings.json.tpl.win
index a34aeee04..cbf7535bc 100644
--- a/tests/automatic/settings/authorizer_settings.json.tpl.win
+++ b/tests/automatic/settings/authorizer_settings.json.tpl.win
@@ -15,5 +15,7 @@
"Uri" : "ldap://localhost:389",
"BaseDn" : "ou=rgy,o=desy,c=de",
"FilterTemplate" : "(cn=a3__BEAMLINE__-hosts)"
- }
+ },
+ "DatabaseServer":"auto",
+ "DiscoveryServer": "localhost:8400/asapo-discovery"
}
--
GitLab