Skip to content

Commit e20e0ad

Browse files
YourTechBudYourTechBud
authored
added auth on functions and func rule in auth (#249)
1 parent 43b766e commit e20e0ad

25 files changed

+327
-216
lines changed

‎config/config.go

+11-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package config
22

3+
import "github.com/spaceuptech/space-cloud/utils"
4+
35
// Config holds the entire configuration
46
type Config struct {
57
Projects map[string]*Project `json:"projects" yaml:"projects"` // The key here is the project id
@@ -56,6 +58,8 @@ type Rule struct {
5658
DB string `json:"db" yaml:"db"`
5759
Col string `json:"col" yaml:"col"`
5860
Find map[string]interface{} `json:"find" yaml:"find"`
61+
Service string `json:"service" yaml:"service"`
62+
Func string `json:"func" yaml:"func"`
5963
}
6064

6165
// Auth holds the mapping of the sign in method
@@ -70,10 +74,15 @@ type AuthStub struct {
7074

7175
// Functions holds the config for the Functions module
7276
type Functions struct {
73-
Enabled bool `json:"enabled" yaml:"enabled"`
74-
Nats string `json:"nats" yaml:"nats"`
77+
Enabled bool `json:"enabled" yaml:"enabled"`
78+
Broker utils.Broker `json:"broker" yaml:"broker"`
79+
Conn string `json:"conn" yaml:"conn"`
80+
Rules FuncRules `json:"rules" yaml:"rules"`
7581
}
7682

83+
// FuncRules is the rules for the functions module
84+
type FuncRules map[string]map[string]*Rule // service -> function -> rule
85+
7786
// Realtime holds the config for the realtime module
7887
type Realtime struct {
7988
Enabled bool `json:"enabled" yaml:"enabled"`

‎config/template.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@ modules:
2525
enabled: false
2626
functions:
2727
enabled: false
28-
nats: nats://localhost:4222
28+
broker: nats
29+
conn: nats://localhost:4222
30+
rules:
31+
service1:
32+
function1:
33+
rule: allow
2934
realtime:
3035
enabled: false
3136
kafka: localhost

‎examples/basic-todo-app/config.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
---
2+
id: basic-todo-app
23
secret: some-secret
34
modules:
45
crud:

‎examples/basic-todo-app/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
<script>
3434
// Initialise the API
35-
var api = new Space.API("todo-app", "http://localhost:8080");
35+
var api = new Space.API("basic-todo-app", "http://localhost:8080");
3636
var db = api.Mongo();
3737
var userId = "";
3838
// Login function

‎examples/realtime-todo-app/config.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ modules:
2727
enabled: true
2828
functions:
2929
enabled: false
30-
nats: nats://localhost:4222
30+
broker: nats
31+
conn: nats://localhost:4222
3132
realtime:
3233
enabled: true
3334
kafka: localhost

‎go.mod

+10-5
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ require (
99
github.com/go-stack/stack v1.8.0 // indirect
1010
github.com/golang/protobuf v1.3.1
1111
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect
12-
github.com/google/go-cmp v0.2.0 // indirect
12+
github.com/google/go-cmp v0.3.0 // indirect
1313
github.com/gorilla/mux v1.7.0
1414
github.com/gorilla/websocket v1.4.0
1515
github.com/jmoiron/sqlx v1.2.0
1616
github.com/kr/pretty v0.1.0 // indirect
17+
github.com/kr/pty v1.1.4 // indirect
1718
github.com/lib/pq v1.0.0
1819
github.com/mitchellh/mapstructure v1.1.2
1920
github.com/nats-io/gnatsd v1.4.1 // indirect
@@ -29,10 +30,14 @@ require (
2930
github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c // indirect
3031
github.com/xdg/stringprep v1.0.0 // indirect
3132
go.mongodb.org/mongo-driver v1.0.0-rc1
32-
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2
33-
golang.org/x/net v0.0.0-20190328230028-74de082e2cca // indirect
34-
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19 // indirect
35-
google.golang.org/grpc v1.19.1
33+
golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5
34+
golang.org/x/net v0.0.0-20190522155817-f3200d17e092 // indirect
35+
golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect
36+
golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed // indirect
37+
golang.org/x/text v0.3.2 // indirect
38+
google.golang.org/appengine v1.6.0 // indirect
39+
google.golang.org/genproto v0.0.0-20190530194941-fb225487d101 // indirect
40+
google.golang.org/grpc v1.21.0
3641
gopkg.in/AlecAivazis/survey.v1 v1.8.2
3742
gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 // indirect
3843
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect

‎go.sum

+26-8
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pO
2929
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
3030
github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
3131
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
32+
github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
33+
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
3234
github.com/gorilla/mux v1.7.0 h1:tOSd0UKHQd6urX6ApfOn4XdBMY6Sh1MfxV3kmaazO+U=
3335
github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
3436
github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
@@ -45,6 +47,8 @@ github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
4547
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
4648
github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=
4749
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
50+
github.com/kr/pty v1.1.4 h1:5Myjjh3JY/NaAi4IsUbHADytDyl1VE1Y9PXDlL+P/VQ=
51+
github.com/kr/pty v1.1.4/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
4852
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
4953
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
5054
github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
@@ -93,38 +97,52 @@ golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnf
9397
golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
9498
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
9599
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
100+
golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5 h1:8dUaAV7K4uHsF56JQWkprecIQKdPHtR9jCHF5nB8uzc=
101+
golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
96102
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
97103
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
98104
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
105+
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
99106
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
100107
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
101108
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
102-
golang.org/x/net v0.0.0-20190328230028-74de082e2cca h1:hyA6yiAgbUwuWqtscNvWAI7U1CtlaD1KilQ6iudt1aI=
103-
golang.org/x/net v0.0.0-20190328230028-74de082e2cca/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
109+
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
110+
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
111+
golang.org/x/net v0.0.0-20190522155817-f3200d17e092 h1:4QSRKanuywn15aTZvI/mIDEgPQpswuFndXpOj3rKEco=
112+
golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
104113
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs=
105114
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
106115
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
107116
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
108-
golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6 h1:bjcUS9ztw9kFmmIxJInhon/0Is3p+EHBKNgquIzo1OI=
109-
golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
117+
golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
118+
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
110119
golang.org/x/sys v0.0.0-20180606202747-9527bec2660b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
111120
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
112121
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
113122
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
123+
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
124+
golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed h1:uPxWBzB3+mlnjy9W58qY1j/cjyFjutgw/Vhan2zLy/A=
125+
golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
114126
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
115127
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
128+
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
129+
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
130+
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
116131
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
117132
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
133+
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
118134
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
119135
google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=
120136
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
137+
google.golang.org/appengine v1.6.0 h1:Tfd7cKwKbFRsI8RMAD3oqqw7JPFRrvFlOsfbgVkjOOw=
138+
google.golang.org/appengine v1.6.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
121139
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc=
122140
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
123-
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19 h1:Lj2SnHtxkRGJDqnGaSjo+CCdIieEnwVazbOXILwQemk=
124-
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
141+
google.golang.org/genproto v0.0.0-20190530194941-fb225487d101 h1:wuGevabY6r+ivPNagjUXGGxF+GqgMd+dBhjsxW4q9u4=
142+
google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s=
125143
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
126-
google.golang.org/grpc v1.19.1 h1:TrBcJ1yqAl1G++wO39nD/qtgpsW9/1+QGrluyMGEYgM=
127-
google.golang.org/grpc v1.19.1/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
144+
google.golang.org/grpc v1.21.0 h1:G+97AoqBnmZIT91cLG/EkCoK9NSelj64P8bOHHNmGn0=
145+
google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
128146
gopkg.in/AlecAivazis/survey.v1 v1.8.2 h1:168gU32e10Xm6NzttCL75XlCQF+nNh0VWuRU80u1GIw=
129147
gopkg.in/AlecAivazis/survey.v1 v1.8.2/go.mod h1:iBNOmqKz/NUbZx3bA+4hAGLRC7fSK7tgtVDT4tB22XA=
130148
gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 h1:FVCohIoYO7IJoDDVpV2pdq7SgrMH6wHnuTyrdrxJNoY=

‎grpc_server.go

+12-11
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package main
33
import (
44
"context"
55
"encoding/json"
6-
"time"
76
"net/http"
7+
"time"
88

99
"github.com/mitchellh/mapstructure"
1010
"github.com/spaceuptech/space-cloud/model"
@@ -685,17 +685,18 @@ func (s *server) Call(ctx context.Context, in *pb.FunctionsRequest) (*pb.Respons
685685
return &out, nil
686686
}
687687

688-
resultBytes, err := s.functions.Operation(s.auth, in.Token, in.Service, in.Function, params, int(in.Timeout))
688+
auth, err := s.auth.IsFuncCallAuthorised(in.Project, in.Service, in.Function, in.Token, params)
689689
if err != nil {
690-
out := pb.Response{}
691-
out.Status = 500
692-
out.Error = err.Error()
693-
return &out, nil
690+
return &pb.Response{Status: 403, Error: err.Error()}, nil
694691
}
695-
out := pb.Response{}
696-
out.Result = resultBytes
697-
out.Status = 200
698-
return &out, nil
692+
693+
result, err := s.functions.Call(in.Service, in.Function, auth, params, int(in.Timeout))
694+
if err != nil {
695+
return &pb.Response{Status: 500, Error: err.Error()}, nil
696+
}
697+
698+
data, _ := json.Marshal(result)
699+
return &pb.Response{Result: data, Status: 200}, nil
699700
}
700701

701702
func (s *server) Service(stream pb.SpaceCloud_ServiceServer) error {
@@ -830,4 +831,4 @@ func (s *server) SignUp(ctx context.Context, in *pb.SignUpRequest) (*pb.Response
830831
}
831832
out.Result = res
832833
return &out, nil
833-
}
834+
}

‎http.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,7 @@ func (s *server) handleRead() http.HandlerFunc {
134134

135135
// Create an args object
136136
args := map[string]interface{}{
137-
"args": map[string]interface{}{"find": req.Find, "op": req.Operation, "auth": authObj},
138-
"project": meta.project, // Don't forget to do this for every request
137+
"args": map[string]interface{}{"find": req.Find, "op": req.Operation, "auth": authObj},
139138
}
140139

141140
// Check if user is authorized to make this request

‎modules/auth/auth.go

+12-13
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88

99
"github.com/spaceuptech/space-cloud/config"
1010
"github.com/spaceuptech/space-cloud/modules/crud"
11+
"github.com/spaceuptech/space-cloud/modules/functions"
1112
"github.com/spaceuptech/space-cloud/utils"
1213
)
1314

@@ -17,17 +18,19 @@ type Module struct {
1718
rules config.Crud
1819
secret string
1920
crud *crud.Module
21+
functions *functions.Module
2022
fileRules map[string]*config.FileRule
23+
funcRules config.FuncRules
2124
project string
2225
}
2326

2427
// Init creates a new instance of the auth object
25-
func Init(crud *crud.Module) *Module {
26-
return &Module{rules: make(config.Crud), crud: crud}
28+
func Init(crud *crud.Module, functions *functions.Module) *Module {
29+
return &Module{rules: make(config.Crud), crud: crud, functions: functions}
2730
}
2831

2932
// SetConfig set the rules and secret key required by the auth block
30-
func (m *Module) SetConfig(project string, secret string, rules config.Crud, fileStore *config.FileStore) {
33+
func (m *Module) SetConfig(project string, secret string, rules config.Crud, fileStore *config.FileStore, functions *config.Functions) {
3134
m.Lock()
3235
defer m.Unlock()
3336

@@ -37,6 +40,10 @@ func (m *Module) SetConfig(project string, secret string, rules config.Crud, fil
3740
if fileStore != nil && fileStore.Enabled {
3841
m.fileRules = fileStore.Rules
3942
}
43+
44+
if functions != nil && functions.Enabled {
45+
m.funcRules = functions.Rules
46+
}
4047
}
4148

4249
// SetSecret sets the secret key to be used for JWT authentication
@@ -80,14 +87,6 @@ func (m *Module) CreateToken(obj map[string]interface{}) (string, error) {
8087
return tokenString, nil
8188
}
8289

83-
// GetAuthObj returns the auth object from a token string
84-
func (m *Module) GetAuthObj(token string) (map[string]interface{}, error) {
85-
m.RLock()
86-
defer m.RUnlock()
87-
88-
return m.parseToken(token)
89-
}
90-
9190
func (m *Module) parseToken(token string) (map[string]interface{}, error) {
9291
// Parse the JWT token
9392
tokenObj, err := jwt.Parse(token, func(token *jwt.Token) (interface{}, error) {
@@ -145,5 +144,5 @@ func (m *Module) IsAuthorized(project, dbType, col string, query utils.Operation
145144
return err
146145
}
147146

148-
return m.matchRule(rule, args)
149-
}
147+
return m.matchRule(project, rule, args)
148+
}

‎modules/auth/auth_test.go

+6-36
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"testing"
77

88
"github.com/spaceuptech/space-cloud/modules/crud"
9+
"github.com/spaceuptech/space-cloud/modules/functions"
910

1011
"github.com/spaceuptech/space-cloud/config"
1112
"github.com/spaceuptech/space-cloud/utils"
@@ -24,7 +25,7 @@ func TestGetRule(t *testing.T) {
2425
{testName: "Error : Nothing is Provided"},
2526
}
2627
successTestCases := 0
27-
authModule := Init(&crud.Module{})
28+
authModule := Init(&crud.Module{}, &functions.Module{})
2829
for i, test := range authGetRule {
2930
t.Run(test.testName, func(t *testing.T) {
3031
(*authModule).rules = test.authModuleRules
@@ -56,7 +57,7 @@ func TestCreateToken(t *testing.T) {
5657
// {testName: "Error Test : nothing is provided "},
5758
}
5859
successTestCases := 0
59-
authModule := Init(&crud.Module{})
60+
authModule := Init(&crud.Module{}, &functions.Module{})
6061
for i, test := range authCreateToken {
6162
t.Run(test.testName, func(t *testing.T) {
6263
authModule.SetSecret(test.secretKey)
@@ -71,37 +72,6 @@ func TestCreateToken(t *testing.T) {
7172
}
7273
}
7374

74-
func TestGetAuthObj(t *testing.T) {
75-
var authGetAuthObj = []struct {
76-
testName, secretKey, token string
77-
wantThis map[string]interface{}
78-
}{
79-
{testName: "Successful Test", secretKey: "mySecretkey", wantThis: map[string]interface{}{"token1": "token1value", "token2": "token2value"}, token: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0b2tlbjEiOiJ0b2tlbjF2YWx1ZSIsInRva2VuMiI6InRva2VuMnZhbHVlIn0.h3jo37fYvnf55A63N-uCyLj9tueFwlGxEGCsf7gCjDc"},
80-
// error test
81-
{testName: "Error Test secret key is not provide", wantThis: map[string]interface{}{"token1": "token1value", "token2": "token2value"}, token: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0b2tlbjEiOiJ0b2tlbjF2YWx1ZSIsInRva2VuMiI6InRva2VuMnZhbHVlIn0.h3jo37fYvnf55A63N-uCyLj9tueFwlGxEGCsf7gCjDc"},
82-
{testName: "Successful Test", secretKey: "mySecretkey", wantThis: map[string]interface{}{"token1": "token1value", "token2": "token2value"}, token: "abcdefghijkleyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0b2tlbjEiOiJ0b2tlbjF2YWx1ZSIsInRva2VuMiI6InRva2VuMnZhbHVlIn0.h3jo37fYvnf55A63N-uCyLj9tueFwlGxEGCsf7gCjDc"},
83-
}
84-
successTestCases := 0
85-
authModule := Init(&crud.Module{})
86-
for i, test := range authGetAuthObj {
87-
t.Run(test.testName, func(t *testing.T) {
88-
authModule.SetSecret(test.secretKey)
89-
getAuthObect, err := authModule.GetAuthObj(test.token)
90-
if i <= successTestCases {
91-
if (!reflect.DeepEqual(getAuthObect, test.wantThis)) || err != nil {
92-
t.Error("Success Test ", "Got This ", getAuthObect, "Wanted This ", test.wantThis, "Error ", err)
93-
}
94-
} else {
95-
96-
if (reflect.DeepEqual(getAuthObect, test.wantThis)) || err == nil {
97-
t.Error("Error Test", "Got This ", getAuthObect, "Wanted This ", test.wantThis, "Error ", err)
98-
}
99-
}
100-
101-
})
102-
}
103-
}
104-
10575
func TestIsAuthorized(t *testing.T) {
10676
var authIsAuthorized = []struct {
10777
testName, dbType, col string
@@ -166,7 +136,7 @@ func TestIsAuthorized(t *testing.T) {
166136
{testName: "Error Test and == bool eval is not provided", err: ErrIncorrectRuleFieldType, dbType: "my-sql", col: "collectionName", project: "project", query: "rule1", authModuleRules: config.Crud{"my-sql": &config.CrudStub{Collections: map[string]*config.TableRule{"collectionName": &config.TableRule{Rules: map[string]*config.Rule{"rule1": &config.Rule{Rule: "and", Clauses: []*config.Rule{{Rule: "Rule", Eval: "", Type: "bool", F1: true, F2: true, DB: "DB", Col: "Col", Find: map[string]interface{}{"findstring1": "inteface1", "findstring2": "interface2"}}}}}}}}}},
167137
}
168138
successTestCases := 31
169-
authModule := Init(&crud.Module{})
139+
authModule := Init(&crud.Module{}, &functions.Module{})
170140
for i, test := range authIsAuthorized {
171141
t.Run(test.testName, func(t *testing.T) {
172142
authModule.rules = test.authModuleRules
@@ -199,10 +169,10 @@ func TestIsAuthenticated(t *testing.T) {
199169
// error test
200170
}
201171
successTestCases := 1
202-
authModule := Init(&crud.Module{})
172+
authModule := Init(&crud.Module{}, &functions.Module{})
203173
for i, test := range authIsAuthenticated {
204174
t.Run(test.testName, func(t *testing.T) {
205-
authModule.SetConfig("project", test.secretKey, test.authModuleRules, nil)
175+
authModule.SetConfig("project", test.secretKey, test.authModuleRules, nil, nil)
206176
getAuthObect, err := authModule.IsAuthenticated(test.token, test.dbType, test.col, test.query)
207177
if i <= successTestCases {
208178
if (!reflect.DeepEqual(getAuthObect, test.wantThis)) || err != nil {

0 commit comments

Comments
 (0)