DOI / Update DOI widget in editor #8468
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 |
|---|---|---|
|
|
@@ -31,8 +31,9 @@ | |
| */ | ||
| module.service("gnDoiService", [ | ||
| "$http", | ||
| "$q", | ||
| "gnConfig", | ||
| function ($http, $q, gnConfig) { | ||
| /** | ||
| * Returns a promise to validate a metadata to be published on a DOI server. | ||
| * | ||
|
|
@@ -65,7 +66,29 @@ | |
| * @returns {*} | ||
| */ | ||
| function getDoiServersForMetadata(metadataId) { | ||
| return $http.get("../api/doiservers/metadata/" + metadataId, { cache: true }); | ||
| } | ||
|
|
||
| /** | ||
| * Return the DOI server with a prefix matching the DOI url. | ||
| */ | ||
| function getDoiServerForMetadataAndDoi(metadataId, doiUrl) { | ||
| var deferred = $q.defer(); | ||
| getDoiServersForMetadata(metadataId).then( | ||
| function (response) { | ||
| for (var i = 0; i < response.data.length; i++) { | ||
| if (doiUrl.match("doi.org/" + response.data[i].prefix)) { | ||
| deferred.resolve(response.data[i]); | ||
| return; | ||
| } | ||
| } | ||
| deferred.reject(null); | ||
| }, | ||
| function () { | ||
| deferred.reject(null); | ||
| } | ||
| ); | ||
| return deferred.promise; | ||
| } | ||
|
|
||
| function isDoiApplicableForMetadata(md) { | ||
|
|
@@ -85,24 +108,55 @@ | |
| * the metadata is published. | ||
| * | ||
| */ | ||
| function canPublishDoiForResource(md, doiUrl) { | ||
| if (doiUrl == null || doiUrl.indexOf("doi.org/") === -1) { | ||
| return false; | ||
| } | ||
|
|
||
| var doiKey = gnConfig["system.publication.doi.doikey"]; | ||
| var isMdWorkflowEnableForMetadata = | ||
| gnConfig["metadata.workflow.enable"] && md.draft === "y"; | ||
| return ( | ||
| isDoiApplicableForMetadata(md) && | ||
| doiUrl.match("doi.org/" + doiKey) !== null && | ||
| !isMdWorkflowEnableForMetadata | ||
| ); | ||
| } | ||
|
|
||
| function checkDoiManagementForResource(md, resource) { | ||
| if (resource.locUrl == null || resource.locUrl.indexOf("doi.org/") === -1) { | ||
|
Check failure Code scanning / CodeQL Incomplete URL substring sanitization High |
||
| return; | ||
| } | ||
| var doiKey = null; | ||
| getDoiServersForMetadata(md.id).then(function (response) { | ||
| var isMdWorkflowEnableForMetadata = | ||
| gnConfig["metadata.workflow.enable"] && md.draft === "y"; | ||
| for (var i = 0; i < response.data.length; i++) { | ||
| if (resource.locUrl.match("doi.org/" + response.data[i].prefix)) { | ||
| doiKey = response.data[i].prefix; | ||
| break; | ||
| } | ||
| } | ||
| if (doiKey !== null) { | ||
| if ( | ||
| isDoiApplicableForMetadata(md) && | ||
| resource.locUrl.match("doi.org/" + doiKey) !== null && | ||
|
There was a problem hiding this comment. This check seems a bit redundant with the check done in https://github.com/geonetwork/core-geonetwork/pull/8468/files#diff-031877af43ecd9313d60230ea5001dac1160701606a4fea6c33b0cd15d476beaR135, no? |
||
| !isMdWorkflowEnableForMetadata | ||
| ) { | ||
| resource.canManageDoi = true; | ||
| } | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| return { | ||
| check: check, | ||
| create: create, | ||
| isDoiApplicableForMetadata: isDoiApplicableForMetadata, | ||
| canPublishDoiForResource: canPublishDoiForResource, | ||
| getDoiServersForMetadata: getDoiServersForMetadata, | ||
| checkDoiManagementForResource: checkDoiManagementForResource, | ||
| getDoiServerForMetadataAndDoi: getDoiServerForMetadataAndDoi | ||
| }; | ||
| } | ||
| ]); | ||
|
|
||
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Check failure
Code scanning / CodeQL
Incomplete URL substring sanitization High
Copilot Autofix AI 3 months ago
To fix the problem, we need to ensure that the URL is parsed and the host is explicitly checked against a whitelist of allowed hosts. This will prevent attackers from embedding "doi.org/" in unexpected parts of the URL. We will use the
URLconstructor available in modern JavaScript to parse the URL and then check the host.doiUrlusing theURLconstructor.