OrgGo
/
Mainflux.mainflux
mirror of https://github.com/mainflux/mainflux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

init commmit (#1385) 

Signed-off-by: Ivan Milosevic <iva@blokovi.com>
This commit is contained in:
Ivan Milošević 2021-03-10 11:52:33 +01:00 committed by GitHub
parent 259950b009
commit a1e18a770a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/things/main.go
View File

@ -61,7 +61,7 @@ const (
defESPass = ""
defESDB = "0"
defHTTPPort = "8182"
defAuthHTTPPort = "8180"
defAuthHTTPPort = "8989"
defAuthGRPCPort = "8181"
defServerCert = ""
defServerKey = ""

1
docker/nginx/entrypoint.sh
View File

@ -12,6 +12,7 @@ fi
envsubst '
${MF_USERS_HTTP_PORT}
${MF_THINGS_HTTP_PORT}
${MF_THINGS_AUTH_HTTP_PORT}
${MF_HTTP_ADAPTER_PORT}
${MF_NGINX_MQTT_PORT}
${MF_NGINX_MQTTS_PORT}

6
docker/nginx/nginx-key.conf
View File

@ -76,6 +76,12 @@ http {
proxy_pass http://things:${MF_THINGS_HTTP_PORT};
}
location ~ ^/(identify){
include snippets/proxy-headers.conf;
add_header Access-Control-Expose-Headers Location;
proxy_pass http://things:${MF_THINGS_AUTH_HTTP_PORT};
}
location ~ ^/(groups|members|keys) {
include snippets/proxy-headers.conf;
add_header Access-Control-Expose-Headers Location;

6
docker/nginx/nginx-x509.conf
View File

@ -83,6 +83,12 @@ http {
proxy_pass http://things:${MF_THINGS_HTTP_PORT};
}
location ~ ^/(identify){
include snippets/proxy-headers.conf;
add_header Access-Control-Expose-Headers Location;
proxy_pass http://things:${MF_THINGS_AUTH_HTTP_PORT};
}
location ~ ^/(groups|members|keys) {
include snippets/proxy-headers.conf;
add_header Access-Control-Expose-Headers Location;

2
things/README.md
View File

@ -37,7 +37,7 @@ default values.
| MF_THINGS_ES_PASS | Event store password | |
| MF_THINGS_ES_DB | Event store instance name | 0 |
| MF_THINGS_HTTP_PORT | Things service HTTP port | 8182 |
| MF_THINGS_AUTH_HTTP_PORT | Things service Auth HTTP port | 8180 |
| MF_THINGS_AUTH_HTTP_PORT | Things service Auth HTTP port | 8989 |
| MF_THINGS_AUTH_GRPC_PORT | Things service Auth gRPC port | 8181 |
| MF_THINGS_SERVER_CERT | Path to server certificate in pem format | |
| MF_THINGS_SERVER_KEY | Path to server key in pem format | |

4
things/api/auth/http/endpoint_test.go
View File

@ -210,7 +210,7 @@ func TestCanAccessByKey(t *testing.T) {
req := testRequest{
client: ts.Client(),
method: http.MethodPost,
url: fmt.Sprintf("%s/channels/%s/access-by-key", ts.URL, tc.chanID),
url: fmt.Sprintf("%s/identify/channels/%s/access-by-key", ts.URL, tc.chanID),
contentType: tc.contentType,
body: strings.NewReader(tc.req),
}
@ -288,7 +288,7 @@ func TestCanAccessByID(t *testing.T) {
req := testRequest{
client: ts.Client(),
method: http.MethodPost,
url: fmt.Sprintf("%s/channels/%s/access-by-id", ts.URL, tc.chanID),
url: fmt.Sprintf("%s/identify/channels/%s/access-by-id", ts.URL, tc.chanID),
contentType: tc.contentType,
body: strings.NewReader(tc.req),
}

4
things/api/auth/http/transport.go
View File

@ -39,14 +39,14 @@ func MakeHandler(tracer opentracing.Tracer, svc things.Service) http.Handler {
opts...,
))
r.Post("/channels/:chanId/access-by-key", kithttp.NewServer(
r.Post("/identify/channels/:chanId/access-by-key", kithttp.NewServer(
kitot.TraceServer(tracer, "can_access_by_key")(canAccessByKeyEndpoint(svc)),
decodeCanAccessByKey,
encodeResponse,
opts...,
))
r.Post("/channels/:chanId/access-by-id", kithttp.NewServer(
r.Post("/identify/channels/:chanId/access-by-id", kithttp.NewServer(
kitot.TraceServer(tracer, "can_access_by_id")(canAccessByIDEndpoint(svc)),
decodeCanAccessByID,
encodeResponse,

4
things/openapi.yml
View File

@ -446,7 +446,7 @@ paths:
description: Channel or thing does not exist.
'500':
$ref: "#/components/responses/ServiceError"
/channels/{chanId}/access-by-key:
/identify/channels/{chanId}/access-by-key:
post:
summary: Checks if thing has access to a channel.
description: |
@ -469,7 +469,7 @@ paths:
description: Missing or invalid content type.
'500':
$ref: "#/components/responses/ServiceError"
/channels/{chanId}/access-by-id:
/identify/channels/{chanId}/access-by-id:
post:
summary: Checks if thing has access to a channel.
description: |