Skip to content

Commit

Permalink
Normalize domains in mentix provider authorizer driver (#3121)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mirekys
mirekys authored Dec 19, 2022
1 parent 4465fd7 commit 9bfe2ae
Show file tree
Hide file tree
Showing 15 changed files with 140 additions and 120 deletions.
6 changes: 6 additions & 0 deletions changelog/unreleased/fix-mentix-domain-normalization.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Bugfix: Add missing domain normalization to mentix provider authorizer

The Mentix OCM Provider authorizer lacked provider domain normalization.
This led to incorrect provider domain matching when authorizing OCM providers.

https://github.com/cs3org/reva/pull/3121
14 changes: 7 additions & 7 deletions examples/meshdirectory/providers.demo.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "https://sciencemesh.cernbox.cern.ch/"
"host": "sciencemesh.cernbox.cern.ch"
}
]
},
Expand All @@ -41,7 +41,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "https://sciencemesh.cesnet.cz/"
"host": "sciencemesh.cesnet.cz"
}
]
},
Expand All @@ -64,7 +64,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "https://sciencemesh-test.uni-muenster.de/"
"host": "sciencemesh-test.uni-muenster.de"
}
]
},
Expand All @@ -87,7 +87,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "https://ocm.cubbit.io/"
"host": "ocm.cubbit.io"
}
]
},
Expand All @@ -110,7 +110,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "http://cs3mesh.softwaremind.com:19000/"
"host": "cs3mesh.softwaremind.com:19000"
}
]
},
Expand All @@ -133,7 +133,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "https://app.cs3mesh-iop.k8s.surfsara.nl/"
"host": "app.cs3mesh-iop.k8s.surfsara.nl"
}
]
},
Expand All @@ -156,7 +156,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "https://sciencemesh-test.switch.ch/"
"host": "sciencemesh-test.switch.ch"
}
]
}
Expand Down
16 changes: 8 additions & 8 deletions examples/oc-phoenix/providers.demo.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "http://127.0.0.1:13001/"
"host": "127.0.0.1:13001"
},
{
"endpoint": {
Expand All @@ -31,7 +31,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "http://127.0.0.1:13001/"
"host": "127.0.0.1:13001"
}
]
},
Expand All @@ -54,7 +54,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "http://127.0.0.1:13001/"
"host": "127.0.0.1:13001"
},
{
"endpoint": {
Expand All @@ -67,7 +67,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "http://127.0.0.1:13001/"
"host": "127.0.0.1:13001"
}
]
},
Expand All @@ -90,7 +90,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "http://127.0.0.1:13001/"
"host": "127.0.0.1:13001"
},
{
"endpoint": {
Expand All @@ -103,7 +103,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "http://127.0.0.1:13001/"
"host": "/127.0.0.1:13001"
}
]
},
Expand All @@ -126,7 +126,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "http://127.0.0.1:13001/"
"host": "127.0.0.1:13001"
},
{
"endpoint": {
Expand All @@ -139,7 +139,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "http://127.0.0.1:13001/"
"host": "127.0.0.1:13001"
}
]
}
Expand Down
32 changes: 16 additions & 16 deletions examples/ocm-partners/providers.demo.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "https://sciencemesh.cernbox.cern.ch/iop/"
"host": "sciencemesh.cernbox.cern.ch"
},
{
"endpoint": {
Expand All @@ -31,7 +31,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "https://sciencemesh.cernbox.cern.ch/iop/"
"host": "sciencemesh.cernbox.cern.ch"
}
]
},
Expand All @@ -54,7 +54,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "https://sciencemesh.cesnet.cz/iop/"
"host": "sciencemesh.cesnet.cz"
},
{
"endpoint": {
Expand All @@ -67,7 +67,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "https://sciencemesh.cesnet.cz/iop/"
"host": "sciencemesh.cesnet.cz"
}
]
},
Expand All @@ -90,7 +90,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "https://sciencemesh-test.uni-muenster.de/api/"
"host": "sciencemesh-test.uni-muenster.de"
},
{
"endpoint": {
Expand All @@ -103,7 +103,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "https://sciencemesh-test.uni-muenster.de/api/"
"host": "sciencemesh-test.uni-muenster.de"
}
]
},
Expand All @@ -126,7 +126,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "https://sciencemesh.cubbit.io/"
"host": "sciencemesh.cubbit.io"
},
{
"endpoint": {
Expand All @@ -139,7 +139,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "https://sciencemesh.cubbit.io/"
"host": "sciencemesh.cubbit.io"
}
]
},
Expand All @@ -162,7 +162,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "https://sciencemesh.softwaremind.com/iop/"
"host": "sciencemesh.softwaremind.com"
},
{
"endpoint": {
Expand All @@ -175,7 +175,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "https://sciencemesh.softwaremind.com/iop/"
"host": "sciencemesh.softwaremind.com"
}
]
},
Expand All @@ -198,7 +198,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "https://app.cs3mesh-iop.k8s.surfsara.nl/iop/"
"host": "app.cs3mesh-iop.k8s.surfsara.nl"
},
{
"endpoint": {
Expand All @@ -211,7 +211,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "https://app.cs3mesh-iop.k8s.surfsara.nl/iop/"
"host": "app.cs3mesh-iop.k8s.surfsara.nl"
}
]
},
Expand All @@ -234,7 +234,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "https://sciencemesh-test.switch.ch/api/"
"host": "sciencemesh-test.switch.ch"
},
{
"endpoint": {
Expand All @@ -247,7 +247,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "https://sciencemesh-test.switch.ch/api/"
"host": "sciencemesh-test.switch.ch"
}
]
},
Expand All @@ -270,7 +270,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "https://sciencemesh.sciencedata.dk/iop/"
"host": "sciencemesh.sciencedata.dk"
},
{
"endpoint": {
Expand All @@ -283,7 +283,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "https://sciencemesh.sciencedata.dk/iop"
"host": "sciencemesh.sciencedata.dk"
}

]
Expand Down
16 changes: 8 additions & 8 deletions examples/ocmd/providers.demo.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "http://127.0.0.1:19001/"
"host": "127.0.0.1:19001"
},
{
"endpoint": {
Expand All @@ -31,7 +31,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "http://127.0.0.1:19001/"
"host": "127.0.0.1:19001"
},
{
"endpoint": {
Expand Down Expand Up @@ -67,7 +67,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "http://127.0.0.1:17001/"
"host": "127.0.0.1:17001"
},
{
"endpoint": {
Expand All @@ -80,7 +80,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "http://127.0.0.1:17001/"
"host": "127.0.0.1:17001"
},
{
"endpoint": {
Expand Down Expand Up @@ -116,7 +116,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "http://127.0.0.1:19001/"
"host": "127.0.0.1:19001"
},
{
"endpoint": {
Expand All @@ -129,7 +129,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "http://127.0.0.1:19001/"
"host": "127.0.0.1:19001"
},
{
"endpoint": {
Expand Down Expand Up @@ -165,7 +165,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "http://127.0.0.1:19001/"
"host": "127.0.0.1:19001"
},
{
"endpoint": {
Expand All @@ -178,7 +178,7 @@
"is_monitored": true
},
"api_version": "0.0.1",
"host": "http://127.0.0.1:19001/"
"host": "127.0.0.1:19001"
},
{
"endpoint": {
Expand Down
Loading

0 comments on commit 9bfe2ae

Please sign in to comment.