forked from mozilla/gecko-dev
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bug 414540 - RDFXMLDataSource should reject cross-domain redirects. O…
…riginal patch by Neil Deakin, fixed up with better testing, r+sr=bz
- Loading branch information
Showing
5 changed files
with
159 additions
and
2 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -49,6 +49,8 @@ LIBXUL_LIBRARY = 1 | |
| REQUIRES = xpcom \ | ||
| string \ | ||
| rdfutil \ | ||
| js \ | ||
| caps \ | ||
| necko \ | ||
| content \ | ||
| htmlparser \ | ||
|
|
||
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 @@ | ||
| <?xml version="1.0"?> | ||
|
|
||
| <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | ||
| xmlns:dc="http://purl.org/dc/elements/1.1/"> | ||
|
|
||
| <rdf:Description about="urn:mozilla:sample-data" | ||
| dc:title="Sample" /> | ||
|
|
||
| </rdf:RDF> |
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,90 @@ | ||
| do_import_script("netwerk/test/httpserver/httpd.js"); | ||
|
|
||
| function getRDFService() | ||
| { | ||
| return Components.classes["@mozilla.org/rdf/rdf-service;1"]. | ||
| getService(Components.interfaces.nsIRDFService); | ||
| } | ||
|
|
||
| var server1, server2; | ||
|
|
||
| function run_test() | ||
| { | ||
| var samplefile = do_get_file('rdf/tests/unit/sample.rdf'); | ||
|
|
||
| server1 = new nsHttpServer(); | ||
| server1.registerPathHandler("/sample-xs.rdf", xsRedirect); | ||
| server1.registerPathHandler("/sample-local.rdf", localRedirect); | ||
| server1.registerFile('/sample.rdf', samplefile); | ||
| server1.start(4444); | ||
|
|
||
| server2 = new nsHttpServer(); | ||
| server2.registerFile('/sample.rdf', samplefile); | ||
| server2.start(4445); | ||
|
|
||
| do_test_pending(); | ||
|
|
||
| new rdfLoadObserver('http://localhost:4444/sample.rdf', true); | ||
| new rdfLoadObserver('http://localhost:4445/sample.rdf', true); | ||
| new rdfLoadObserver('http://localhost:4444/sample-xs.rdf', false); | ||
| new rdfLoadObserver('http://localhost:4444/sample-local.rdf', true); | ||
| } | ||
|
|
||
| var gPending = 0; | ||
|
|
||
| function rdfLoadObserver(uri, shouldPass) | ||
| { | ||
| this.shouldPass = shouldPass; | ||
| this.uri = uri; | ||
|
|
||
| ++gPending; | ||
|
|
||
| var rdfService = getRDFService(); | ||
| this.ds = rdfService.GetDataSource(uri). | ||
| QueryInterface(Components.interfaces.nsIRDFXMLSink); | ||
| this.ds.addXMLSinkObserver(this); | ||
| } | ||
|
|
||
| rdfLoadObserver.prototype = | ||
| { | ||
| onBeginLoad : function() { }, | ||
| onInterrupt : function() { }, | ||
| onResume : function() { }, | ||
| onEndLoad : function() { | ||
| print("Testing results of loading " + this.uri); | ||
|
|
||
| var rdfs = getRDFService(); | ||
| var res = rdfs.GetResource("urn:mozilla:sample-data"); | ||
| var arc = rdfs.GetResource("http://purl.org/dc/elements/1.1/title"); | ||
| var answer = this.ds.GetTarget(res, arc, true); | ||
| if (answer !== null) { | ||
| do_check_true(this.shouldPass); | ||
| do_check_true(answer instanceof Components.interfaces.nsIRDFLiteral); | ||
| do_check_eq(answer.Value, "Sample"); | ||
| } | ||
| else { | ||
| do_check_false(this.shouldPass); | ||
| } | ||
|
|
||
| gPending -= 1; | ||
|
|
||
| if (gPending == 0) { | ||
| server1.stop(); | ||
| server2.stop(); | ||
| do_test_finished(); | ||
| } | ||
| }, | ||
| onError : function() { } | ||
| } | ||
|
|
||
| function xsRedirect(metadata, response) | ||
| { | ||
| response.setStatusLine(metadata.httpVersion, 301, "Moved Permanently"); | ||
| response.setHeader("Location", "http://localhost:4445/sample.rdf", false); | ||
| } | ||
|
|
||
| function localRedirect(metadata, response) | ||
| { | ||
| response.setStatusLine(metadata.httpVersion, 301, "Moved Permanently"); | ||
| response.setHeader("Location", "http://localhost:4444/sample.rdf", false); | ||
| } |