diff --git a/dvzaservice/main.go b/dvzaservice/main.go index 8fa9194..cc79e20 100644 --- a/dvzaservice/main.go +++ b/dvzaservice/main.go @@ -13,7 +13,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" "src.whiteboxsystems.nl/DECOZO/okapi" - "whiteboxsystems.nl/okapidemo/certgen" + "src.whiteboxsystems.nl/DECOZO/okapidemo/certgen" ) var rpcAddr = "0.0.0.0:9999" diff --git a/dvzaservice/model/db.go b/dvzaservice/model/db.go index f3a51a3..c4d5dbe 100644 --- a/dvzaservice/model/db.go +++ b/dvzaservice/model/db.go @@ -5,7 +5,7 @@ import ( "gorm.io/gorm" "gorm.io/gorm/logger" "src.whiteboxsystems.nl/DECOZO/okapi" - "whiteboxsystems.nl/okapidemo/sharedmodel" + "src.whiteboxsystems.nl/DECOZO/okapidemo/sharedmodel" ) func GetDB(location string) (*gorm.DB, error) { diff --git a/dvzaservice/openapisrv.go b/dvzaservice/openapisrv.go index 830f00d..ada1327 100644 --- a/dvzaservice/openapisrv.go +++ b/dvzaservice/openapisrv.go @@ -14,9 +14,9 @@ import ( "google.golang.org/protobuf/types/known/structpb" "gorm.io/gorm" "src.whiteboxsystems.nl/DECOZO/okapi" - "whiteboxsystems.nl/okapidemo/certgen" - "whiteboxsystems.nl/okapidemo/dvzaservice/model" - "whiteboxsystems.nl/okapidemo/sharedmodel" + "src.whiteboxsystems.nl/DECOZO/okapidemo/certgen" + "src.whiteboxsystems.nl/DECOZO/okapidemo/dvzaservice/model" + "src.whiteboxsystems.nl/DECOZO/okapidemo/sharedmodel" ) var errNotAuthorized = fmt.Errorf("Not Authorized") diff --git a/dvzaservice/srv.go b/dvzaservice/srv.go index 6ba9770..965a7c5 100644 --- a/dvzaservice/srv.go +++ b/dvzaservice/srv.go @@ -10,8 +10,8 @@ import ( "github.com/gin-gonic/gin" "gorm.io/gorm" - "whiteboxsystems.nl/okapidemo/dvzaservice/model" - "whiteboxsystems.nl/okapidemo/sharedmodel" + "src.whiteboxsystems.nl/DECOZO/okapidemo/dvzaservice/model" + "src.whiteboxsystems.nl/DECOZO/okapidemo/sharedmodel" ) type UIService struct { diff --git a/go.mod b/go.mod index 044be99..b6166cb 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module whiteboxsystems.nl/openkvpoc +module src.whiteboxsystems.nl/DECOZO/okapidemo go 1.18 @@ -12,6 +12,7 @@ require ( ) require ( + github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0-20210816181553-5444fa50b93d // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/go-playground/locales v0.14.0 // indirect github.com/go-playground/universal-translator v0.18.0 // indirect @@ -22,16 +23,24 @@ require ( github.com/jinzhu/now v1.1.5 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/leodido/go-urn v1.2.1 // indirect + github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect + github.com/lestrrat-go/blackmagic v1.0.0 // indirect + github.com/lestrrat-go/httpcc v1.0.1 // indirect + github.com/lestrrat-go/iter v1.0.1 // indirect + github.com/lestrrat-go/jwx v1.2.25 // indirect + github.com/lestrrat-go/option v1.0.0 // indirect github.com/mattn/go-isatty v0.0.14 // indirect github.com/mattn/go-sqlite3 v1.14.12 // indirect github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.0.1 // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/ugorji/go/codec v1.2.7 // indirect - golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect - golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect + golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f // indirect + golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069 // indirect golang.org/x/text v0.3.6 // indirect google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect + src.whiteboxsystems.nl/DECOZO/okapi v0.0.4 // indirect ) diff --git a/go.sum b/go.sum index 7edaad6..9675104 100644 --- a/go.sum +++ b/go.sum @@ -15,6 +15,9 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 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= +github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0-20210816181553-5444fa50b93d h1:1iy2qD6JEhHKKhUOA9IWs7mjco7lnw2qx8FsRI2wirE= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.0-20210816181553-5444fa50b93d/go.mod h1:tmAIfUFEirG/Y8jhZ9M+h36obRZAk/1fcSpXwAVlfqE= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -82,6 +85,18 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= +github.com/lestrrat-go/backoff/v2 v2.0.8 h1:oNb5E5isby2kiro9AgdHLv5N5tint1AnDVVf2E2un5A= +github.com/lestrrat-go/backoff/v2 v2.0.8/go.mod h1:rHP/q/r9aT27n24JQLa7JhSQZCKBBOiM/uP402WwN8Y= +github.com/lestrrat-go/blackmagic v1.0.0 h1:XzdxDbuQTz0RZZEmdU7cnQxUtFUzgCSPq8RCz4BxIi4= +github.com/lestrrat-go/blackmagic v1.0.0/go.mod h1:TNgH//0vYSs8VXDCfkZLgIrVTTXQELZffUV0tz3MtdQ= +github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE= +github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E= +github.com/lestrrat-go/iter v1.0.1 h1:q8faalr2dY6o8bV45uwrxq12bRa1ezKrB6oM9FUgN4A= +github.com/lestrrat-go/iter v1.0.1/go.mod h1:zIdgO1mRKhn8l9vrZJZz9TUMMFbQbLeTsbqPDrJ/OJc= +github.com/lestrrat-go/jwx v1.2.25 h1:tAx93jN2SdPvFn08fHNAhqFJazn5mBBOB8Zli0g0otA= +github.com/lestrrat-go/jwx v1.2.25/go.mod h1:zoNuZymNl5lgdcu6P7K6ie2QRll5HVfF4xwxBBK1NxY= +github.com/lestrrat-go/option v1.0.0 h1:WqAWL8kh8VcSoD6xjSH34/1m8yxluXQbDeKNfvFeEO4= +github.com/lestrrat-go/option v1.0.0/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-sqlite3 v1.14.12 h1:TJ1bhYJPV44phC+IMu1u2K/i5RriLTPe+yc68XDJ1Z0= @@ -93,6 +108,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/pelletier/go-toml/v2 v2.0.1 h1:8e3L2cCQzLFi2CR4g7vGFuFxX7Jl1kKX8gW+iV0GUKU= github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= +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/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -115,6 +132,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f h1:OeJjE6G4dgCY4PIXvIRQbE8+RX+uXZyGhUy/ksMGJoc= +golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -129,6 +148,8 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -142,6 +163,7 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069 h1:siQdpVirKtzPhKl3lZWozZraCFObP8S1v6PRp0bLrtU= @@ -207,3 +229,5 @@ gorm.io/gorm v1.23.8 h1:h8sGJ+biDgBA1AD1Ha9gFCx7h8npU7AsLdlkX0n2TpE= gorm.io/gorm v1.23.8/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +src.whiteboxsystems.nl/DECOZO/okapi v0.0.4 h1:Hn/zWj14zknYYQr2rxkpwgZxpE+lH/qqeBp2RL9A/xY= +src.whiteboxsystems.nl/DECOZO/okapi v0.0.4/go.mod h1:zzd5uxSJdsWDyIu2LOpyBLme9Nvo6GaXsbd1CL7BmDU= diff --git a/his/model/db.go b/his/model/db.go index 943c918..2cdb62f 100644 --- a/his/model/db.go +++ b/his/model/db.go @@ -4,7 +4,7 @@ import ( "gorm.io/driver/sqlite" "gorm.io/gorm" "gorm.io/gorm/logger" - "whiteboxsystems.nl/okapidemo/sharedmodel" + "src.whiteboxsystems.nl/DECOZO/okapidemo/sharedmodel" ) func GetDB(location string) (*gorm.DB, error) { diff --git a/his/model/models.go b/his/model/models.go index 3e9eefb..afc0045 100644 --- a/his/model/models.go +++ b/his/model/models.go @@ -5,7 +5,7 @@ import ( "gorm.io/gorm" "src.whiteboxsystems.nl/DECOZO/okapi" - "whiteboxsystems.nl/okapidemo/sharedmodel" + "src.whiteboxsystems.nl/DECOZO/okapidemo/sharedmodel" ) type ConnectionState string diff --git a/his/openapiclient.go b/his/openapiclient.go index a20c8f9..2ca7df7 100644 --- a/his/openapiclient.go +++ b/his/openapiclient.go @@ -12,9 +12,9 @@ import ( "google.golang.org/protobuf/types/known/structpb" "gorm.io/gorm" "src.whiteboxsystems.nl/DECOZO/okapi" - "whiteboxsystems.nl/okapidemo/certgen" - "whiteboxsystems.nl/okapidemo/his/model" - "whiteboxsystems.nl/okapidemo/sharedmodel" + "src.whiteboxsystems.nl/DECOZO/okapidemo/certgen" + "src.whiteboxsystems.nl/DECOZO/okapidemo/his/model" + "src.whiteboxsystems.nl/DECOZO/okapidemo/sharedmodel" ) func toStruct(m map[string]interface{}) *structpb.Struct { diff --git a/his/srv.go b/his/srv.go index f14fb23..bc8c712 100644 --- a/his/srv.go +++ b/his/srv.go @@ -19,9 +19,9 @@ import ( "google.golang.org/grpc/credentials" "gorm.io/gorm" "src.whiteboxsystems.nl/DECOZO/okapi" - "whiteboxsystems.nl/okapidemo/certgen" - "whiteboxsystems.nl/okapidemo/his/model" - "whiteboxsystems.nl/okapidemo/sharedmodel" + "src.whiteboxsystems.nl/DECOZO/okapidemo/certgen" + "src.whiteboxsystems.nl/DECOZO/okapidemo/his/model" + "src.whiteboxsystems.nl/DECOZO/okapidemo/sharedmodel" ) func loadCert() *tls.Certificate { diff --git a/sharedmodel/auth.go b/sharedmodel/auth.go index 24f1ad7..f30028e 100644 --- a/sharedmodel/auth.go +++ b/sharedmodel/auth.go @@ -7,7 +7,7 @@ import ( "google.golang.org/protobuf/types/known/structpb" "gorm.io/gorm" "src.whiteboxsystems.nl/DECOZO/okapi" - "whiteboxsystems.nl/okapidemo/certgen" + "src.whiteboxsystems.nl/DECOZO/okapidemo/certgen" ) const AuthMethodDecozoMTLS = "http://decozo.org/proto/auth/mtls" diff --git a/sharedmodel/registration.go b/sharedmodel/registration.go index 8352442..16ca306 100644 --- a/sharedmodel/registration.go +++ b/sharedmodel/registration.go @@ -6,7 +6,7 @@ import ( "gorm.io/gorm" "src.whiteboxsystems.nl/DECOZO/okapi" - "whiteboxsystems.nl/okapidemo/certgen" + "src.whiteboxsystems.nl/DECOZO/okapidemo/certgen" ) type RegistrationStatus string diff --git a/whiteboxservice/main.go b/whiteboxservice/main.go index a2fb9b8..d80a302 100644 --- a/whiteboxservice/main.go +++ b/whiteboxservice/main.go @@ -13,7 +13,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" "src.whiteboxsystems.nl/DECOZO/okapi" - "whiteboxsystems.nl/okapidemo/certgen" + "src.whiteboxsystems.nl/DECOZO/okapidemo/certgen" ) var srvaddr = "0.0.0.0:8888" diff --git a/whiteboxservice/model/db.go b/whiteboxservice/model/db.go index ad3c926..ead79f0 100644 --- a/whiteboxservice/model/db.go +++ b/whiteboxservice/model/db.go @@ -5,7 +5,7 @@ import ( "gorm.io/gorm" "gorm.io/gorm/logger" "src.whiteboxsystems.nl/DECOZO/okapi" - "whiteboxsystems.nl/okapidemo/sharedmodel" + "src.whiteboxsystems.nl/DECOZO/okapidemo/sharedmodel" ) func GetDB(location string) (*gorm.DB, error) { diff --git a/whiteboxservice/openapisrv.go b/whiteboxservice/openapisrv.go index d5a451a..0890631 100644 --- a/whiteboxservice/openapisrv.go +++ b/whiteboxservice/openapisrv.go @@ -15,9 +15,9 @@ import ( "google.golang.org/protobuf/types/known/structpb" "gorm.io/gorm" "src.whiteboxsystems.nl/DECOZO/okapi" - "whiteboxsystems.nl/okapidemo/certgen" - "whiteboxsystems.nl/okapidemo/sharedmodel" - "whiteboxsystems.nl/okapidemo/whiteboxservice/model" + "src.whiteboxsystems.nl/DECOZO/okapidemo/certgen" + "src.whiteboxsystems.nl/DECOZO/okapidemo/sharedmodel" + "src.whiteboxsystems.nl/DECOZO/okapidemo/whiteboxservice/model" ) var errNotAuthorized = fmt.Errorf("Not Authorized") diff --git a/whiteboxservice/srv.go b/whiteboxservice/srv.go index 91875fd..ae3a88f 100644 --- a/whiteboxservice/srv.go +++ b/whiteboxservice/srv.go @@ -13,8 +13,8 @@ import ( "github.com/gin-gonic/gin" "gorm.io/gorm" - "whiteboxsystems.nl/okapidemo/sharedmodel" - "whiteboxsystems.nl/okapidemo/whiteboxservice/model" + "src.whiteboxsystems.nl/DECOZO/okapidemo/sharedmodel" + "src.whiteboxsystems.nl/DECOZO/okapidemo/whiteboxservice/model" ) type UIService struct {