forked from TykTechnologies/tyk
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bug was introduced during refactoring, most likely as performance optimization. `isVirtual` check never run if `CacheAllSafeRequests` was true. In addition test re-written to use full HTTP stack, and included case when caching turned on. Should fix TykTechnologies#1356
- Loading branch information
Showing
3 changed files
with
70 additions
and
68 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,89 +1,90 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "encoding/base64" | ||
| "io/ioutil" | ||
| "net/http/httptest" | ||
| "os" | ||
| "path/filepath" | ||
| "net/http" | ||
| "testing" | ||
| ) | ||
|
|
||
| const virtTestDef = `{ | ||
| "api_id": "1", | ||
| "definition": { | ||
| "location": "header", | ||
| "key": "version" | ||
| }, | ||
| "auth": {"auth_header_name": "authorization"}, | ||
| "version_data": { | ||
| "not_versioned": true, | ||
| "versions": { | ||
| "v1": { | ||
| "name": "v1", | ||
| "use_extended_paths": true, | ||
| "extended_paths": { | ||
| "virtual": [{ | ||
| "response_function_name": "testVirtData", | ||
| "function_source_type": "file", | ||
| "function_source_uri": "middleware/testVirtData.js", | ||
| "path": "/test-data", | ||
| "method": "GET" | ||
| }] | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "proxy": { | ||
| "listen_path": "/v1", | ||
| "target_url": "` + testHttpAny + `" | ||
| }, | ||
| "config_data": { | ||
| "foo": "x", | ||
| "bar": {"y": 3} | ||
| } | ||
| }` | ||
| "github.com/TykTechnologies/tyk/apidef" | ||
| "github.com/TykTechnologies/tyk/config" | ||
| ) | ||
|
|
||
| const virtTestJS = ` | ||
| function testVirtData(request, session, config) { | ||
| var resp = { | ||
| Body: request.Body + " added body", | ||
| Body: "foobar", | ||
| Headers: { | ||
| "data-foo": config.config_data.foo, | ||
| "data-bar-y": config.config_data.bar.y.toString() | ||
| }, | ||
| Code: 202 | ||
| } | ||
| return TykJsResponse(resp, session.meta_data) | ||
| return TykJsResponse(resp, session.meta_data) | ||
| } | ||
| ` | ||
|
|
||
| func TestVirtualEndpoint(t *testing.T) { | ||
| mwPath := filepath.Join("middleware", "testVirtData.js") | ||
| if err := ioutil.WriteFile(mwPath, []byte(virtTestJS), 0644); err != nil { | ||
| config.Global.ListenAddress = "127.0.0.1" | ||
|
|
||
| ln, _ := generateListener(0) | ||
| baseURL := "http://" + ln.Addr().String() | ||
| listen(ln, nil, nil) | ||
| defer func() { | ||
| config.Global.ListenAddress = "" | ||
| ln.Close() | ||
| }() | ||
|
|
||
| buildAndLoadAPI(func(spec *APISpec) { | ||
| spec.Proxy.ListenPath = "/" | ||
|
|
||
| virtualMeta := apidef.VirtualMeta{ | ||
| ResponseFunctionName: "testVirtData", | ||
| FunctionSourceType: "blob", | ||
| FunctionSourceURI: base64.StdEncoding.EncodeToString([]byte(virtTestJS)), | ||
| Path: "/virt", | ||
| Method: "GET", | ||
| } | ||
| v := spec.VersionData.Versions["v1"] | ||
| v.UseExtendedPaths = true | ||
| v.ExtendedPaths = apidef.ExtendedPathsSet{ | ||
| Virtual: []apidef.VirtualMeta{virtualMeta}, | ||
| } | ||
| spec.VersionData.Versions["v1"] = v | ||
|
|
||
| spec.ConfigData = map[string]interface{}{ | ||
| "foo": "x", | ||
| "bar": map[string]interface{}{"y": 3}, | ||
| } | ||
|
|
||
| // Address https://github.com/TykTechnologies/tyk/issues/1356 | ||
| // VP should work with cache enabled | ||
| spec.CacheOptions = apidef.CacheOptions{ | ||
| EnableCache: true, | ||
| CacheTimeout: 60, | ||
| CacheAllSafeRequests: true, | ||
| } | ||
| }) | ||
|
|
||
| resp, err := http.Get(baseURL + "/virt") | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| spec := createSpecTest(t, virtTestDef) | ||
| defer os.Remove(mwPath) | ||
|
|
||
| virt := &VirtualEndpoint{BaseMiddleware: BaseMiddleware{ | ||
| spec, nil, | ||
| }} | ||
| virt.Init() | ||
| rec := httptest.NewRecorder() | ||
| r := testReq(t, "GET", "/v1/test-data", "initial body") | ||
| virt.ProcessRequest(rec, r, nil) | ||
| if want := 202; rec.Code != 202 { | ||
| t.Fatalf("wanted code to be %d, got %d", want, rec.Code) | ||
| if want := 202; resp.StatusCode != 202 { | ||
| t.Fatalf("wanted code to be %d, got %d", want, resp.StatusCode) | ||
| } | ||
| wantBody := "initial body added body" | ||
| gotBody := rec.Body.String() | ||
| if wantBody != gotBody { | ||
| t.Fatalf("wanted body to be %q, got %q", wantBody, gotBody) | ||
|
|
||
| wantBody := "foobar" | ||
| gotBody, _ := ioutil.ReadAll(resp.Body) | ||
|
|
||
| if wantBody != string(gotBody) { | ||
| t.Fatalf("wanted body to be %q, got %q", wantBody, string(gotBody)) | ||
| } | ||
| if want, got := "x", rec.HeaderMap.Get("data-foo"); got != want { | ||
| if want, got := "x", resp.Header.Get("data-foo"); got != want { | ||
| t.Fatalf("wanted header to be %q, got %q", want, got) | ||
| } | ||
| if want, got := "3", rec.HeaderMap.Get("data-bar-y"); got != want { | ||
| if want, got := "3", resp.Header.Get("data-bar-y"); got != want { | ||
| t.Fatalf("wanted header to be %q, got %q", want, got) | ||
| } | ||
| } |