Repository navigation
Upgrade to Dspace 8.5 - #11
Merged
Merged
Conversation
(cherry picked from commit f28641d)
(cherry picked from commit e346526)
fix is in the dspace/modules/additions folder. (cherry picked from commit c40868b)
(cherry picked from commit 18427d0)
[Port dspace-7_x] Handle creation of thumbnails for multi-image TIFF files
[Port dspace-7_x] Controlled vocabulary for accented characters
(cherry picked from commit 85e76a9) stripped out the new 'requestitem access token' feature, kept some small improvements (interface method scope, DAO findByItem query)
- Add testFindByBitstreamId: verifies the new findByBitstreamId method returns matching requests, returns empty for bitstreams without requests, and returns empty for nonexistent UUIDs. - Enhance testDeleteBitstreamRemovesRequestItem: also verify via findByBitstreamId both before and after deletion. (cherry picked from commit 1116570)
…ce-7_x [Port dspace-7_x] requestItemService.findbyBitstream for more efficient bitstream deletion
(cherry picked from commit 11c06f2)
(cherry picked from commit e6dec51)
(cherry picked from commit 11af178)
(cherry picked from commit 2091b2a)
(cherry picked from commit 894ffbf)
(cherry picked from commit 8c0f5bf)
(cherry picked from commit e7d1e26)
(cherry picked from commit 9c57f39)
(cherry picked from commit 50737b1)
(cherry picked from commit b49536b)
When dspace.cfg is updated while Tomcat is running, the oai.identifier.prefix fallback from dspace-oai's DSpaceConfigurationService gets cleared out.
If the cached Identify request gets invalidated after this, it will be regenerated with ${oai.identifier.prefix} in place
We re-initialize this fallback when re-creating the Identify content to account for this.
This is the only place where setProperty is used outside of tests.
(cherry picked from commit 263513b)
[Port dspace-7_x] Fix missing OAI identifier interpolation on config change
…-submission-with-non-public-items-and-item-filters Fix submission with non public items and AccessCondition filters (cherry picked from commit c70841f)
[Port dspace-7_x] Cache entities contribute main
[Port dspace-7_x] Fix submission with non public items and AccessCondition filters
Bumps org.apache.commons:commons-configuration2 from 2.14.0 to 2.15.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-configuration2 dependency-version: 2.15.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> (cherry picked from commit 649fe87)
[Port dspace-7_x] build(deps): bump org.apache.commons:commons-configuration2 from 2.14.0 to 2.15.0
* Safer Velocity configuration * New "message.templates.allowed-config" config * Remove "UnmodifiableConfiguration" in favour of a simple Map of whitelisted Config keys/values * Centralise Velocity config in core Utils * Small javadoc changes (cherry picked from commit b2d6141)
(cherry picked from commit 6b66531)
(cherry picked from commit 5803819)
[Port dspace-8_x] Retire obsolete configuration files during "ant update"
(cherry picked from commit 4411b5d)
(cherry picked from commit 77048df)
(cherry picked from commit 4ac21f1)
(cherry picked from commit 9f7e12d)
(cherry picked from commit 3a731e5)
(cherry picked from commit 417960f)
(cherry picked from commit 943b065)
[Port dspace-8_x] ItemExport Service I/O improvements
…/dspace-8_x/github-actions-31df092e2e Bump actions/setup-java from 5 to 6 in the github-actions group
…/dspace-8_x/toshimaru/auto-author-assign-3.1.0 Bump toshimaru/auto-author-assign from 3.0.3 to 3.1.0
…_x/test-tools-693ab08c5a Bump the test-tools group across 1 directory with 2 updates
…_x/build-tools-60d856fdf2 Bump the build-tools group with 2 updates
…_x/fasterxml-38e0e0bbae Bump the fasterxml group across 1 directory with 3 updates
…_x/apache-commons-30fd625326 Bump the apache-commons group across 1 directory with 2 updates
Four regular expressions in dspace-api run over user-supplied values and
backtrack super-linearly, because an unbounded quantifier is followed by
something that same quantifier can itself match. Rejecting a value that
cannot match therefore costs disproportionately more CPU than the value's
size suggests. CodeQL reports all four as java/polynomial-redos.
SolrServiceImpl: the two value.matches("\[.*TO.*\]") checks that decide
whether a filter value is passed to Solr unescaped become isRangeQuery,
a startsWith/endsWith/contains test accepting exactly the same values,
including the case-sensitive TO and the rejection of values containing a
line terminator, which "." never matched.
FacetYearRange: \[(.*? TO .*?)\] becomes \[( *-?\d+ +TO +-?\d+ *)\]. Both
bounds are parsed with Integer.parseInt two lines below, so only integer
bounds were ever usable.
HandleServiceImpl: ^https?://.+/handle/(.*)$ becomes a scan for the last
/handle/ segment. The greedy .+ already selected the last segment, and
lastIndexOf selects the same one in linear time. Identifiers containing a
line terminator are still rejected, which is both what "." did and what
removes the backtracking: it was a trailing line terminator that forced
.+ to retry every /handle/ segment in turn.
DoiCheck: \d+X?(\d+)\d+ becomes the equivalent but unambiguous
(?:\d{3,}|\d+X\d{2,}), and the unescaped dots in \d+.\d+.\w+ become
literal dots, which is what the version segment of a legacy SICI DOI such
as 3.0.CO;2 always meant. The capture group was never read.
Adds regression tests covering both the accepted values and, with a test
timeout, a value that cannot match. Each such value comfortably exceeds
its bound on the old patterns and completes in under a millisecond now.
Fixes DSpace#13089
Claude-Session: https://claude.ai/code/session_015QCEXoi3yujaCvYXSjLk4M
(cherry picked from commit 72ad858)
[Port dspace-8_x] Make four ReDoS-prone regular expressions linear
(cherry picked from commit 49eca56)
(cherry picked from commit 5164879)
to avoid enumeration of sequential integers (cherry picked from commit bcdca28)
to avoid enumeration of sequential integers (cherry picked from commit f852a3f)
(cherry picked from commit 0bb0785)
(cherry picked from commit 71d59e3)
…ce-8_x [Port dspace-8_x] Harden Process endpoint and service
(cherry picked from commit 6760f70)
[Port dspace-8_x] Fix: Better 'current user' hibernate entity handling in processes
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Merge the dspace8.5 tag into our top level branch.