-
-
Notifications
You must be signed in to change notification settings - Fork 323
Update support for iRODS #17341
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
korydraughn
wants to merge
17
commits into
iterate-ch:master
Choose a base branch
from
korydraughn:jargon_to_irods4j
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,841
−762
Open
Update support for iRODS #17341
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
ce2f25e
iRODS: Replace Jargon with irods4j
2870ae7
iRODS: Fix bugs, expand options, and clean up implementation
korydraughn 99b1ac6
iRODS: Add Docker Compose project for testing
korydraughn e7bac88
iRODS: Fix tests
korydraughn 03c9c17
squash w/ 2870ae7. rename timestamp class
korydraughn c3f2506
squash w/ 2870ae7. give string literals names
korydraughn fda6abb
squash w/ 2870ae7. use convenience function for boolean
korydraughn 1d455b9
squash w/ 2870ae7. get app name dynamically
korydraughn 4b28090
squash w/ 2870ae7. remove override for logout() method
korydraughn 8bed7e5
squash w/ 2870ae7. wrap call to super.disconnect() in try-catch block
korydraughn 2a5ae40
squash w/ 2870ae7. use enum
korydraughn 27f4dc9
squash w/ 2870ae7. react to status.isExists()
korydraughn b3eb7f8
squash w/ 2870ae7. add test for checksum utils
korydraughn 78664bd
squash w/ 2870ae7. lock exception mapper to IRODSException
korydraughn 7b6176a
squash w/ 2870ae7. use cyberduck threadpool for multipart upload. spl…
korydraughn 12beeda
squash w/ 2870ae7. handle redundant variables. split exception handli…
korydraughn d6d3f9b
squash w/ 2870ae7. split exception handling logic in feature impls
korydraughn File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
38 changes: 0 additions & 38 deletions
38
irods/src/main/java/ch/cyberduck/core/irods/DefaultTransferOptionsConfigurer.java
This file was deleted.
Oops, something went wrong.
90 changes: 0 additions & 90 deletions
90
irods/src/main/java/ch/cyberduck/core/irods/DefaultTransferStatusCallbackListener.java
This file was deleted.
Oops, something went wrong.
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
52 changes: 52 additions & 0 deletions
52
irods/src/main/java/ch/cyberduck/core/irods/IRODSChecksumUtils.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| package ch.cyberduck.core.irods; | ||
|
|
||
| /* | ||
| * Copyright (c) 2002-2025 iterate GmbH. All rights reserved. | ||
| * https://cyberduck.io/ | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| */ | ||
|
|
||
| import ch.cyberduck.core.io.Checksum; | ||
|
|
||
| import org.apache.commons.codec.binary.Base64; | ||
| import org.apache.commons.codec.binary.Hex; | ||
| import org.apache.commons.lang3.StringUtils; | ||
| import org.apache.logging.log4j.LogManager; | ||
| import org.apache.logging.log4j.Logger; | ||
|
|
||
| public final class IRODSChecksumUtils { | ||
|
|
||
| private static final Logger log = LogManager.getLogger(IRODSChecksumUtils.class); | ||
|
|
||
| public static Checksum toChecksum(String irodsChecksum) { | ||
| if(StringUtils.isBlank(irodsChecksum)) { | ||
| return Checksum.NONE; | ||
| } | ||
|
|
||
| int colon = irodsChecksum.indexOf(':'); | ||
| if(-1 == colon) { | ||
| log.debug("no hash algorithm prefix found in iRODS checksum. ignoring checksum."); | ||
| return Checksum.NONE; | ||
| } | ||
|
|
||
| if(colon + 1 >= irodsChecksum.length()) { | ||
| log.debug("iRODS checksum may be corrupted. ignoring checksum."); | ||
| return Checksum.NONE; | ||
| } | ||
|
|
||
| log.debug("checksum from iRODS server is [{}].", irodsChecksum); | ||
| String checksum = irodsChecksum.substring(colon + 1); | ||
| checksum = Hex.encodeHexString(Base64.decodeBase64(checksum)); | ||
| log.debug("base64-decoded, hex-encoded checksum is [{}].", checksum); | ||
| return Checksum.parse(checksum); | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.