Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Goja JSVM for Gateway #1961

Closed
wants to merge 10 commits into from
Closed

Goja JSVM for Gateway #1961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
93e8c1b
refactor gateway code to accept otto or goja as jsvm
joshblakeley Nov 2, 2018
c0f014e
add goja functions - needs testing
joshblakeley Nov 2, 2018
177574c
add goja test
joshblakeley Nov 2, 2018
ac90774
plugin tests changed to accept new types
joshblakeley Nov 2, 2018
5af5127
js plugin tests for both drivers/ changes to logic for loading mw and…
joshblakeley Nov 5, 2018
bf6e87d
add jsvm to lint schema and update otto vendor
joshblakeley Nov 6, 2018
5813c23
rebase onto master and bring up to date
joshblakeley May 7, 2019
1ba82aa
change config value to bool and reflect in package and tests
joshblakeley May 7, 2019
45a35a9
change url parsing to escape params correctly
joshblakeley May 14, 2019
8895c26
config linter addition
joshblakeley May 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions api_definition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ type APISpec struct {
OrgSessionManager SessionHandler
EventPaths map[apidef.TykEvent][]config.TykEventHandler
Health HealthChecker
JSVM JSVM
JSVM TykJSVM
ResponseChain []TykResponseHandler
RoundRobin RoundRobin
URLRewriteEnabled bool
Expand Down Expand Up @@ -251,6 +251,7 @@ func (a APIDefinitionLoader) MakeSpec(def *apidef.APIDefinition, logger *logrus.

// Create and init the virtual Machine
if config.Global().EnableJSVM {
spec.JSVM = InitJSVM()
spec.JSVM.Init(spec, logger)
}

Expand Down Expand Up @@ -792,7 +793,7 @@ func (a APIDefinitionLoader) compileVirtualPathspathSpec(paths []apidef.VirtualM
// Extend with method actions
newSpec.VirtualPathSpec = stringSpec

preLoadVirtualMetaCode(&newSpec.VirtualPathSpec, &apiSpec.JSVM)
preLoadVirtualMetaCode(&newSpec.VirtualPathSpec, apiSpec.JSVM)

urlSpec = append(urlSpec, newSpec)
}
Expand Down
16 changes: 8 additions & 8 deletions api_loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ func processSpec(spec *APISpec, apisByListen map[string]int,

mwPaths, mwAuthCheckFunc, mwPreFuncs, mwPostFuncs, mwPostAuthCheckFuncs, mwDriver = loadCustomMiddleware(spec)

if config.Global().EnableJSVM && mwDriver == apidef.OttoDriver {
if config.Global().EnableJSVM && (mwDriver == apidef.OttoDriver || mwDriver == apidef.GojaDriver) {
spec.JSVM.LoadJSPaths(mwPaths, prefix)
}

Expand Down Expand Up @@ -277,7 +277,7 @@ func processSpec(spec *APISpec, apisByListen map[string]int,
handleCORS(&chainArray, spec)

for _, obj := range mwPreFuncs {
if mwDriver != apidef.OttoDriver {
if mwDriver != apidef.OttoDriver && mwDriver != apidef.GojaDriver {

coprocessLog.Debug("Registering coprocess middleware, hook name: ", obj.Name, "hook type: Pre", ", driver: ", mwDriver)
mwAppendEnabled(&chainArray, &CoProcessMiddleware{baseMid, coprocess.HookType_Pre, obj.Name, mwDriver})
Expand Down Expand Up @@ -307,7 +307,7 @@ func processSpec(spec *APISpec, apisByListen map[string]int,
mwAppendEnabled(&chainArray, &TransformMethod{BaseMiddleware: baseMid})

for _, obj := range mwPostFuncs {
if mwDriver != apidef.OttoDriver {
if mwDriver != apidef.OttoDriver && mwDriver != apidef.GojaDriver {

coprocessLog.Debug("Registering coprocess middleware, hook name: ", obj.Name, "hook type: Post", ", driver: ", mwDriver)
mwAppendEnabled(&chainArray, &CoProcessMiddleware{baseMid, coprocess.HookType_Post, obj.Name, mwDriver})
Expand All @@ -327,7 +327,7 @@ func processSpec(spec *APISpec, apisByListen map[string]int,

// Add pre-process MW
for _, obj := range mwPreFuncs {
if mwDriver != apidef.OttoDriver {
if mwDriver != apidef.OttoDriver && mwDriver != apidef.GojaDriver {

coprocessLog.Debug("Registering coprocess middleware, hook name: ", obj.Name, "hook type: Pre", ", driver: ", mwDriver)
mwAppendEnabled(&chainArray, &CoProcessMiddleware{baseMid, coprocess.HookType_Pre, obj.Name, mwDriver})
Expand Down Expand Up @@ -367,8 +367,8 @@ func processSpec(spec *APISpec, apisByListen map[string]int,
logger.Info("Checking security policy: OpenID")
}

coprocessAuth := EnableCoProcess && mwDriver != apidef.OttoDriver && spec.EnableCoProcessAuth
ottoAuth := !coprocessAuth && mwDriver == apidef.OttoDriver && spec.EnableCoProcessAuth
coprocessAuth := EnableCoProcess && mwDriver != apidef.OttoDriver && mwDriver != apidef.GojaDriver && spec.EnableCoProcessAuth
jsvmAuth := !coprocessAuth && (mwDriver == apidef.OttoDriver || mwDriver == apidef.GojaDriver) && spec.EnableCoProcessAuth

if coprocessAuth {
// TODO: check if mwAuthCheckFunc is available/valid
Expand All @@ -378,7 +378,7 @@ func processSpec(spec *APISpec, apisByListen map[string]int,
mwAppendEnabled(&authArray, &CoProcessMiddleware{baseMid, coprocess.HookType_CustomKeyCheck, mwAuthCheckFunc.Name, mwDriver})
}

if ottoAuth {
if jsvmAuth {

logger.Info("----> Checking security policy: JS Plugin")

Expand Down Expand Up @@ -414,7 +414,7 @@ func processSpec(spec *APISpec, apisByListen map[string]int,
mwAppendEnabled(&chainArray, &VirtualEndpoint{BaseMiddleware: baseMid})

for _, obj := range mwPostFuncs {
if mwDriver != apidef.OttoDriver {
if mwDriver != apidef.OttoDriver && mwDriver != apidef.GojaDriver {

coprocessLog.Debug("Registering coprocess middleware, hook name: ", obj.Name, "hook type: Post", ", driver: ", mwDriver)
mwAppendEnabled(&chainArray, &CoProcessMiddleware{baseMid, coprocess.HookType_Post, obj.Name, mwDriver})
Expand Down
1 change: 1 addition & 0 deletions apidef/api_definitions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ const (
RequestJSON RequestInputType = "json"

OttoDriver MiddlewareDriver = "otto"
GojaDriver MiddlewareDriver = "goja"
PythonDriver MiddlewareDriver = "python"
LuaDriver MiddlewareDriver = "lua"
GrpcDriver MiddlewareDriver = "grpc"
Expand Down
3 changes: 3 additions & 0 deletions cli/linter/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,9 @@
"enable_jsvm": {
"type": "boolean"
},
"enable_v2_jsvm": {
"type": "boolean"
},
"jsvm_timeout": {
"type": "integer"
},
Expand Down
1 change: 1 addition & 0 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ type Config struct {
ControlAPIPort int `json:"control_api_port"`
EnableCustomDomains bool `json:"enable_custom_domains"`
EnableJSVM bool `json:"enable_jsvm"`
EnableV2JSVM bool `json:"enable_v2_jsvm"`
JSVMTimeout int `json:"jsvm_timeout"`
CoProcessOptions CoProcessConfig `json:"coprocess_options"`
HideGeneratorHeader bool `json:"hide_generator_header"`
Expand Down
2 changes: 1 addition & 1 deletion coprocess_bundle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func (b *Bundle) AddToSpec() {
b.Spec.CustomMiddleware = b.Manifest.CustomMiddleware

// Call HandleMiddlewareCache only when using rich plugins:
if GlobalDispatcher != nil && b.Spec.CustomMiddleware.Driver != apidef.OttoDriver {
if GlobalDispatcher != nil && (b.Spec.CustomMiddleware.Driver != apidef.OttoDriver && b.Spec.CustomMiddleware.Driver != apidef.GojaDriver) {
GlobalDispatcher.HandleMiddlewareCache(&b.Manifest, b.Path)
}
}
Expand Down
3 changes: 1 addition & 2 deletions coprocess_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ import (
"net/url"
"testing"

"github.com/Sirupsen/logrus"
"github.com/golang/protobuf/proto"
"github.com/justinas/alice"

"github.com/Sirupsen/logrus"

"github.com/TykTechnologies/tyk/apidef"
"github.com/TykTechnologies/tyk/coprocess"
)
Expand Down
2 changes: 1 addition & 1 deletion jsvm_event_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,5 @@ func (l *JSVMEventHandler) HandleEvent(em config.EventMessage) {
}

// Execute the method name with the JSON object
GlobalEventsJSVM.VM.Run(l.methodName + `.DoProcessEvent(` + string(msgAsJSON) + `,` + l.SpecJSON + `);`)
GlobalEventsJSVM.Run(l.methodName + `.DoProcessEvent(` + string(msgAsJSON) + `,` + l.SpecJSON + `);`)
}
Loading