-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Updated GraphiQL 3.0.1 => 3.0.6 (#2837)
* Updated GraphiQL 3.0.1 => 3.0.6 * Added unit tests to cover integrity of playgrounds * Updated vulnerable dependency * Close response body
- Loading branch information
Showing
9 changed files
with
131 additions
and
14 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
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 |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| package playground | ||
|
|
||
| import ( | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestAltairHandler_Integrity(t *testing.T) { | ||
| testResourceIntegrity(t, AltairHandler) | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| package playground | ||
|
|
||
| import ( | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestApolloSandboxHandler_Integrity(t *testing.T) { | ||
| testResourceIntegrity(t, ApolloSandboxHandler) | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| package playground | ||
|
|
||
| import ( | ||
| "crypto/sha256" | ||
| "encoding/base64" | ||
| "io" | ||
| "net/http" | ||
| "net/http/httptest" | ||
| "strings" | ||
| "testing" | ||
|
|
||
| "github.com/PuerkitoBio/goquery" | ||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| func testResourceIntegrity(t *testing.T, handler func(title, endpoint string) http.HandlerFunc) { | ||
| recorder := httptest.NewRecorder() | ||
| request := httptest.NewRequest(http.MethodGet, "http://localhost:8080/", nil) | ||
| handler("example.org API", "/query").ServeHTTP(recorder, request) | ||
|
|
||
| res := recorder.Result() | ||
| defer assert.NoError(t, res.Body.Close()) | ||
|
|
||
| assert.Equal(t, http.StatusOK, res.StatusCode) | ||
| assert.True(t, strings.HasPrefix(res.Header.Get("Content-Type"), "text/html")) | ||
|
|
||
| doc, err := goquery.NewDocumentFromReader(res.Body) | ||
| assert.NoError(t, err) | ||
| assert.NotNil(t, doc) | ||
|
|
||
| var baseUrl string | ||
| if base := doc.Find("base"); len(base.Nodes) != 0 { | ||
| if value, exists := base.Attr("href"); exists { | ||
| baseUrl = value | ||
| } | ||
| } | ||
|
|
||
| assertNodesIntegrity(t, baseUrl, doc, "script", "src", "integrity") | ||
| assertNodesIntegrity(t, baseUrl, doc, "link", "href", "integrity") | ||
| } | ||
|
|
||
| func assertNodesIntegrity(t *testing.T, baseUrl string, doc *goquery.Document, selector string, urlAttrKey, integrityAttrKey string) { | ||
| selection := doc.Find(selector) | ||
| for _, node := range selection.Nodes { | ||
| var url string | ||
| var integrity string | ||
| for _, attribute := range node.Attr { | ||
| if attribute.Key == urlAttrKey { | ||
| url = attribute.Val | ||
| } else if attribute.Key == integrityAttrKey { | ||
| integrity = attribute.Val | ||
| } | ||
| } | ||
|
|
||
| if len(integrity) != 0 { | ||
| assert.NotEmpty(t, url) | ||
| } | ||
|
|
||
| if len(url) != 0 && len(integrity) != 0 { | ||
| resp, err := http.Get(baseUrl + url) | ||
| assert.NoError(t, err) | ||
| hasher := sha256.New() | ||
| _, err = io.Copy(hasher, resp.Body) | ||
| assert.NoError(t, err) | ||
| assert.NoError(t, resp.Body.Close()) | ||
| actual := "sha256-" + base64.StdEncoding.EncodeToString(hasher.Sum(nil)) | ||
| assert.Equal(t, integrity, actual) | ||
| } | ||
| } | ||
| } |
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