Skip to content
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.

Sign up for GitHub

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

First ideas for uvf imple. #16623

Draft
wants to merge 15 commits into
base: master
Choose a base branch
from
+941 −668
Draft

First ideas for uvf imple. #16623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9d5b323
First ideas for uvf imple.
chenkins Dec 6, 2024
719c5ed
Switch to uvf draft snapshot dependency.
ylangisc Jan 6, 2025
8b5a6ce
Migrate API changes.
ylangisc Jan 18, 2025
b689153
Extract filename cryptor and provider.
ylangisc Jan 18, 2025
3e90a8f
Intermediate interface for Cryptomator stuff.
ylangisc Jan 20, 2025
909981f
More extraction.
ylangisc Jan 20, 2025
db6ec89
More extraction.
ylangisc Jan 20, 2025
80d67c4
Review.
ylangisc Feb 6, 2025
f689235
Fix UnsupportedOperationException for fileNameCryptor() without revis…
chenkins Feb 6, 2025
9b4eb00
Bump version to 9.1.3.uvfdraft-SNAPSHOT.
chenkins Feb 8, 2025
cbbe9b2
Temporarily skip SFTPCryptomatorInteroperabilityTest because of depen…
chenkins Feb 11, 2025
aca202b
Switch to byte array for directory ids to avoid lossy data conversion.
ylangisc Feb 24, 2025
5136207
Directory id for root is derived from key material.
ylangisc Feb 25, 2025
45d9232
Fix cryptolib uvfdraft version.
chenkins Feb 25, 2025
f26423b
Fix typo.
ylangisc Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion azure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>ch.cyberduck</groupId>
<artifactId>parent</artifactId>
<version>9.1.3-SNAPSHOT</version>
<version>9.1.3.uvfdraft-SNAPSHOT</version>
</parent>
<artifactId>azure</artifactId>
<properties>
Expand Down
2 changes: 1 addition & 1 deletion backblaze/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>ch.cyberduck</groupId>
<version>9.1.3-SNAPSHOT</version>
<version>9.1.3.uvfdraft-SNAPSHOT</version>
</parent>
<artifactId>backblaze</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion binding/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>ch.cyberduck</groupId>
<artifactId>parent</artifactId>
<version>9.1.3-SNAPSHOT</version>
<version>9.1.3.uvfdraft-SNAPSHOT</version>
</parent>
<artifactId>binding</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion bonjour/dll/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>ch.cyberduck</groupId>
<artifactId>parent</artifactId>
<relativePath>../../pom.xml</relativePath>
<version>9.1.3-SNAPSHOT</version>
<version>9.1.3.uvfdraft-SNAPSHOT</version>
</parent>
<artifactId>Cyberduck.Bonjour</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion bonjour/native/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>ch.cyberduck</groupId>
<artifactId>parent</artifactId>
<relativePath>../../pom.xml</relativePath>
<version>9.1.3-SNAPSHOT</version>
<version>9.1.3.uvfdraft-SNAPSHOT</version>
</parent>
<artifactId>Cyberduck.Bonjour.Native</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion bonjour/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>ch.cyberduck</groupId>
<version>9.1.3-SNAPSHOT</version>
<version>9.1.3.uvfdraft-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion box/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>ch.cyberduck</groupId>
<version>9.1.3-SNAPSHOT</version>
<version>9.1.3.uvfdraft-SNAPSHOT</version>
</parent>
<artifactId>box</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion brick/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>ch.cyberduck</groupId>
<artifactId>parent</artifactId>
<version>9.1.3-SNAPSHOT</version>
<version>9.1.3.uvfdraft-SNAPSHOT</version>
</parent>
<artifactId>brick</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion cli/dll/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<groupId>ch.cyberduck</groupId>
<artifactId>parent</artifactId>
<relativePath>../../pom.xml</relativePath>
<version>9.1.3-SNAPSHOT</version>
<version>9.1.3.uvfdraft-SNAPSHOT</version>
</parent>
<artifactId>Cyberduck.Cli</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion cli/linux/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<groupId>ch.cyberduck</groupId>
<artifactId>parent</artifactId>
<relativePath>../../pom.xml</relativePath>
<version>9.1.3-SNAPSHOT</version>
<version>9.1.3.uvfdraft-SNAPSHOT</version>
</parent>
<artifactId>cli-linux</artifactId>
<description>Cyberduck CLI Linux</description>
Expand Down
2 changes: 1 addition & 1 deletion cli/osx/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<groupId>ch.cyberduck</groupId>
<artifactId>parent</artifactId>
<relativePath>../../pom.xml</relativePath>
<version>9.1.3-SNAPSHOT</version>
<version>9.1.3.uvfdraft-SNAPSHOT</version>
</parent>
<artifactId>cli-osx</artifactId>
<description>Cyberduck CLI Mac</description>
Expand Down
2 changes: 1 addition & 1 deletion cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>ch.cyberduck</groupId>
<artifactId>parent</artifactId>
<version>9.1.3-SNAPSHOT</version>
<version>9.1.3.uvfdraft-SNAPSHOT</version>
</parent>
<artifactId>cli</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion cli/windows/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<groupId>ch.cyberduck</groupId>
<artifactId>parent</artifactId>
<relativePath>../../pom.xml</relativePath>
<version>9.1.3-SNAPSHOT</version>
<version>9.1.3.uvfdraft-SNAPSHOT</version>
</parent>
<artifactId>cli-windows</artifactId>
<description>Cyberduck CLI Windows</description>
Expand Down
2 changes: 1 addition & 1 deletion core/dll/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>ch.cyberduck</groupId>
<artifactId>parent</artifactId>
<relativePath>../../pom.xml</relativePath>
<version>9.1.3-SNAPSHOT</version>
<version>9.1.3.uvfdraft-SNAPSHOT</version>
</parent>
<artifactId>Cyberduck.Core</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/dylib/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>ch.cyberduck</groupId>
<artifactId>parent</artifactId>
<relativePath>../../pom.xml</relativePath>
<version>9.1.3-SNAPSHOT</version>
<version>9.1.3.uvfdraft-SNAPSHOT</version>
</parent>
<artifactId>libcore</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion core/native/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>ch.cyberduck</groupId>
<artifactId>parent</artifactId>
<relativePath>../../pom.xml</relativePath>
<version>9.1.3-SNAPSHOT</version>
<version>9.1.3.uvfdraft-SNAPSHOT</version>
</parent>
<artifactId>Cyberduck.Core.Native</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/native/refresh/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>ch.cyberduck</groupId>
<artifactId>Cyberduck.Core.Native</artifactId>
<relativePath>../pom.xml</relativePath>
<version>9.1.3-SNAPSHOT</version>
<version>9.1.3.uvfdraft-SNAPSHOT</version>
</parent>
<artifactId>Cyberduck.Core.Refresh</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>ch.cyberduck</groupId>
<artifactId>parent</artifactId>
<version>9.1.3-SNAPSHOT</version>
<version>9.1.3.uvfdraft-SNAPSHOT</version>
</parent>
<artifactId>core</artifactId>
<packaging>jar</packaging>
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/ch/cyberduck/core/PathAttributes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public class PathAttributes extends Attributes implements Serializable {
/**
* Unique identifier for cryptomator
*/
private String directoryId;
private byte[] directoryId;

private Map<String, String> custom = Collections.emptyMap();

Expand Down Expand Up @@ -526,11 +526,11 @@ public PathAttributes withLockId(final String lockId) {
return this;
}

public String getDirectoryId() {
public byte[] getDirectoryId() {
return directoryId;
}

public void setDirectoryId(final String directoryId) {
public void setDirectoryId(final byte[] directoryId) {
this.directoryId = directoryId;
}

Expand Down
2 changes: 1 addition & 1 deletion cryptomator/dll/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<groupId>ch.cyberduck</groupId>
<artifactId>parent</artifactId>
<relativePath>../../pom.xml</relativePath>
<version>9.1.3-SNAPSHOT</version>
<version>9.1.3.uvfdraft-SNAPSHOT</version>
</parent>
<artifactId>Cyberduck.Cryptomator</artifactId>
<packaging>pom</packaging>
Expand Down
4 changes: 2 additions & 2 deletions cryptomator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
<parent>
<artifactId>parent</artifactId>
<groupId>ch.cyberduck</groupId>
<version>9.1.3-SNAPSHOT</version>
<version>9.1.3.uvfdraft-SNAPSHOT</version>
</parent>
<artifactId>cryptomator</artifactId>
<packaging>jar</packaging>

<properties>
<cryptolib.version>2.1.2.1</cryptolib.version>
<cryptolib.version>2.3.0.uvfdraft-SNAPSHOT</cryptolib.version>
</properties>

<profiles>
Expand Down
Loading
Loading