Skip to content

Commit 1c044ea

Browse files
infeoinfeo
committed
Merge branch 'release/0.6.1'
2 parents cbcdff1 + aff58af commit 1c044ea

File tree

12 files changed

+312
-5
lines changed

12 files changed

+312
-5
lines changed

‎.github/CODE_OF_CONDUCT.md

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as
6+
contributors and maintainers pledge to making participation in our project and
7+
our community a harassment-free experience for everyone, regardless of age, body
8+
size, disability, ethnicity, sex characteristics, gender identity and expression,
9+
level of experience, education, socio-economic status, nationality, personal
10+
appearance, race, religion, or sexual identity and orientation.
11+
12+
## Our Standards
13+
14+
Examples of behavior that contributes to creating a positive environment
15+
include:
16+
17+
* Using welcoming and inclusive language
18+
* Being respectful of differing viewpoints and experiences
19+
* Gracefully accepting constructive criticism
20+
* Focusing on what is best for the community
21+
* Showing empathy towards other community members
22+
23+
Examples of unacceptable behavior by participants include:
24+
25+
* The use of sexual language or imagery and unwelcome sexual attention or
26+
advances
27+
* Trolling, insulting/derogatory comments, and personal or political attacks
28+
* Public or private harassment
29+
* Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
* Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
33+
34+
## Our Responsibilities
35+
36+
Project maintainers are responsible for clarifying the standards of acceptable
37+
behavior and are expected to take appropriate and fair corrective action in
38+
response to any instances of unacceptable behavior.
39+
40+
Project maintainers have the right and responsibility to remove, edit, or
41+
reject comments, commits, code, wiki edits, issues, and other contributions
42+
that are not aligned to this Code of Conduct, or to ban temporarily or
43+
permanently any contributor for other behaviors that they deem inappropriate,
44+
threatening, offensive, or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies within all project spaces, and it also applies when
49+
an individual is representing the project or its community in public spaces.
50+
Examples of representing a project or community include using an official
51+
project e-mail address, posting via an official social media account, or acting
52+
as an appointed representative at an online or offline event. Representation of
53+
a project may be further defined and clarified by project maintainers.
54+
55+
## Enforcement
56+
57+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58+
reported by contacting the project team at support@cryptomator.org. All
59+
complaints will be reviewed and investigated and will result in a response that
60+
is deemed necessary and appropriate to the circumstances. The project team is
61+
obligated to maintain confidentiality with regard to the reporter of an incident.
62+
Further details of specific enforcement policies may be posted separately.
63+
64+
Project maintainers who do not follow or enforce the Code of Conduct in good
65+
faith may face temporary or permanent repercussions as determined by other
66+
members of the project's leadership.
67+
68+
## Attribution
69+
70+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71+
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
72+
73+
[homepage]: https://www.contributor-covenant.org
74+
75+
For answers to common questions about this code of conduct, see
76+
https://www.contributor-covenant.org/faq

‎.github/CONTRIBUTING.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Contributing to Cryptomator CLI
2+
3+
## Did you find a bug?
4+
5+
- Ensure you're running the latest version of Cryptomator CLI.
6+
- Ensure the bug is related to the CLI version of Cryptomator. Bugs concerning the Cryptomator desktop, iOS and Android app can be reported on the [Cryptomator issues list](https://github.com/cryptomator/cryptomator/issues), [Cryptomator for iOS issues list](https://github.com/cryptomator/ios/issues) and [Cryptomator for Android issues list](https://github.com/cryptomator/android/issues) respectively.
7+
- Ensure the bug was not [already reported](https://github.com/cryptomator/cli/issues). You can also check out our [FAQ](https://community.cryptomator.org/c/kb/faq).
8+
- If you're unable to find an open issue addressing the problem, [submit a new one](https://github.com/cryptomator/cli/issues/new/choose).
9+
10+
## Did you write a patch that fixes a bug?
11+
12+
- Open a new pull request with the patch.
13+
- Ensure the PR description clearly describes the problem and solution. Include the relevant issue number if applicable.
14+
15+
## Do you intend to add a new feature or change an existing one?
16+
17+
- Suggest your change by [submitting a new issue](https://github.com/cryptomator/cli/issues/new/choose) and start writing code.
18+
19+
## Code of Conduct
20+
21+
Help us keep Cryptomator open and inclusive. Please read and follow our [Code of Conduct](https://github.com/cryptomator/cli/blob/develop/.github/CODE_OF_CONDUCT.md).
22+
23+
## Above all, thank you for your contributions
24+
25+
Thank you for taking the time to contribute to the project! :+1:
26+
27+
Cryptomator Team

‎.github/FUNDING.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# These are supported funding model platforms
2+
3+
github: [cryptomator] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
4+
patreon: # Replace with a single Patreon username
5+
open_collective: # Replace with a single Open Collective username
6+
ko_fi: # Replace with a single Ko-fi username
7+
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
8+
custom: https://cryptomator.org/sponsors/

‎.github/ISSUE_TEMPLATE/bug.yml

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
name: Bug Report
2+
description: Create a report to help us improve
3+
labels: ["type:bug"]
4+
body:
5+
- type: checkboxes
6+
id: terms
7+
attributes:
8+
label: Please agree to the following
9+
options:
10+
- label: I have searched [existing issues](https://github.com/cryptomator/cli/issues?q=) for duplicates
11+
required: true
12+
- label: I agree to follow this project's [Code of Conduct](https://github.com/cryptomator/cli/blob/develop/.github/CODE_OF_CONDUCT.md)
13+
required: true
14+
- type: input
15+
id: summary
16+
attributes:
17+
label: Summary
18+
placeholder: Please summarize your problem.
19+
validations:
20+
required: true
21+
- type: textarea
22+
id: software-versions
23+
attributes:
24+
label: What software is involved?
25+
description: |
26+
Examples:
27+
- Operating System: Windows 10
28+
- Cryptomator CLI: 1.5.16
29+
- OneDrive: 23.226
30+
- LibreOffice: 7.1.4
31+
value: |
32+
- Operating System:
33+
- Cryptomator CLI:
34+
- …
35+
validations:
36+
required: true
37+
- type: dropdown
38+
id: volume-type
39+
attributes:
40+
label: Volume Type
41+
description: What volume type is selected under Settings → Virtual Drive?
42+
options:
43+
- WinFsp
44+
- WinFsp (Local Drive)
45+
- FUSE-T
46+
- macFUSE
47+
- FUSE
48+
- WebDAV (Windows Explorer)
49+
- WebDAV (AppleScript)
50+
- WebDAV (gio)
51+
- WebDAV (HTTP Address)
52+
- Dokany (1.5)
53+
validations:
54+
required: false
55+
- type: textarea
56+
id: reproduction-steps
57+
attributes:
58+
label: Steps to Reproduce
59+
value: |
60+
1. [First Step]
61+
2. [Second Step]
62+
3. …
63+
validations:
64+
required: true
65+
- type: textarea
66+
id: expected-behaviour
67+
attributes:
68+
label: Expected Behavior
69+
placeholder: What you expect to happen.
70+
validations:
71+
required: true
72+
- type: textarea
73+
id: actual-behaviour
74+
attributes:
75+
label: Actual Behavior
76+
placeholder: What actually happens.
77+
validations:
78+
required: true
79+
- type: dropdown
80+
id: reproducibility
81+
attributes:
82+
label: Reproducibility
83+
description: How often does the described behaviour occur?
84+
options:
85+
- Always
86+
- Intermittent
87+
- Only once
88+
validations:
89+
required: true
90+
- type: textarea
91+
id: logs
92+
attributes:
93+
label: Relevant Log Output
94+
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
95+
render: shell
96+
- type: textarea
97+
id: further-info
98+
attributes:
99+
label: Anything else?
100+
description: Links? References? Screenshots? Configurations? Any data that might be necessary to reproduce the issue?

‎.github/ISSUE_TEMPLATE/config.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Help & Support
4+
url: https://community.cryptomator.org/
5+
about: You will find answers in our community forum
6+
- name: User Manual
7+
url: https://docs.cryptomator.org/
8+
about: Read the Cryptomator documentation here

‎.github/ISSUE_TEMPLATE/feature.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Feature Request
2+
description: Suggest an idea for this project
3+
labels: ["type:feature-request"]
4+
body:
5+
- type: checkboxes
6+
id: terms
7+
attributes:
8+
label: Please agree to the following
9+
options:
10+
- label: I have searched [existing issues](https://github.com/cryptomator/cli/issues?q=) for duplicates
11+
required: true
12+
- label: I agree to follow this project's [Code of Conduct](https://github.com/cryptomator/cli/blob/develop/.github/CODE_OF_CONDUCT.md)
13+
required: true
14+
- type: input
15+
id: summary
16+
attributes:
17+
label: Summary
18+
placeholder: Please summarize your feature request.
19+
validations:
20+
required: true
21+
- type: textarea
22+
id: motivation
23+
attributes:
24+
label: Motivation
25+
description: Who requires this feature? What problem does the user face? How would this feature solve the problem?
26+
validations:
27+
required: true
28+
- type: textarea
29+
id: alternatives
30+
attributes:
31+
label: Considered Alternatives
32+
description: What current alternatives or workarounds have you considered? Is there a different way to solve the same problem?
33+
- type: textarea
34+
id: context
35+
attributes:
36+
label: Anything else?
37+
description: Any context, suggestions, screenshots, or concepts you want to share?

‎.github/SECURITY.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Security Policy
2+
3+
## Reporting a Vulnerability
4+
5+
We take security seriously at Cryptomator. We appreciate your efforts to responsibly disclose your findings, and will make every effort to acknowledge your contributions.
6+
7+
To report a security vulnerability, please use the [GitHub Security Advisory feature](https://github.com/cryptomator/cli/security/advisories). This feature allows you to privately discuss, fix, and publish information about security vulnerabilities.
8+
9+
If you prefer to report the vulnerability via email, please send an email to security@cryptomator.org.
10+
11+
PGP key fingerprint: `3647 9903 B23A E0A5 9359  9A3E 23B5 DBEF 94D4 D81D` ([public key](https://gist.github.com/cryptobot/864300b6b44ae2d2a15abedfe14bd040))
12+
13+
## Expectations
14+
15+
When reporting a vulnerability, please provide us with a detailed report that includes:
16+
17+
- A description of the vulnerability
18+
- Steps to reproduce the vulnerability
19+
- Possible impact of the vulnerability
20+
- Any additional information that may be helpful
21+
22+
We ask that you do not publicly disclose the vulnerability until we have had a chance to address it.
23+
24+
## Thank You
25+
26+
We appreciate your help in keeping Cryptomator secure. Thank you for your contributions to the security of our project.

‎.github/SUPPORT.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Support for Cryptomator
2+
3+
For development-related topics, GitHub is the right place.
4+
5+
For _everything else_, please visit our official [Cryptomator Community](https://community.cryptomator.org) (we are there, too :wink:). Amongst others, you will find:
6+
7+
- [Knowledge Base](https://community.cryptomator.org/c/kb)
8+
- Installation manuals
9+
- Usage guides
10+
- FAQ
11+
- [Help with problems](https://community.cryptomator.org/c/help)
12+
- Assistance with the setup
13+
- Known issues and workarounds
14+
- Discussions about the apps
15+
- [Development discussions](https://community.cryptomator.org/c/development)
16+
- General questions
17+
- Discussions regarding our design decisions
18+
- Our roadmap

‎.github/workflows/build-linux.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,10 @@ jobs:
9696
path: ./target/cryptomator-cli
9797
if-no-files-found: error
9898
- name: Zip binary for release
99-
run: zip -r ./${{ matrix.artifact-name}} ./target/cryptomator-cli
99+
run: |
100+
zip -r ./${{ matrix.artifact-name}} ./cryptomator-cli
101+
mv ./${{ matrix.artifact-name }} ..
102+
working-directory: target
100103
- name: Create detached GPG signature with key 615D449FE6E6A235
101104
run: |
102105
echo "${GPG_PRIVATE_KEY}" | gpg --batch --quiet --import

‎pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.cryptomator</groupId>
55
<artifactId>cli</artifactId>
6-
<version>0.6.0</version>
6+
<version>0.6.1</version>
77
<name>Cryptomator CLI</name>
88
<description>Command line program to access encrypted files via WebDAV.</description>
99
<url>https://github.com/cryptomator/cli</url>
@@ -23,7 +23,7 @@
2323
<cryptofs.version>2.7.1</cryptofs.version>
2424
<webdav-nio.version>2.0.7</webdav-nio.version>
2525
<fuse-nio.version>5.0.2</fuse-nio.version>
26-
<logback.version>1.5.12</logback.version>
26+
<logback.version>1.5.13</logback.version>
2727
<slf4j.version>2.0.16</slf4j.version>
2828

2929
<!-- build dependencies -->

‎src/main/java/org/cryptomator/cli/CryptomatorCli.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
mixinStandardHelpOptions = true,
1313
version = "${org.cryptomator.cli.version}",
1414
description = "Unlocks a cryptomator vault and mounts it into the system.",
15-
subcommands = { Unlock.class, ListMounters.class})
15+
subcommands = { Unlock.class, ListMounters.class, CommandLine.HelpCommand.class})
1616
public class CryptomatorCli {
1717

1818
private static final Logger LOG = LoggerFactory.getLogger(CryptomatorCli.class);

‎src/main/java/org/cryptomator/cli/MountSetup.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,11 @@ private Map<MountCapability, Boolean> listSpecifiedMountOptions() {
110110
}
111111

112112
Mount mount(FileSystem fs) throws MountFailedException {
113-
if (!mountService.hasCapability(MOUNT_TO_SYSTEM_CHOSEN_PATH) && mountPoint.isEmpty()) {
113+
boolean requiresMountPoint = Set.of(MOUNT_TO_EXISTING_DIR, //
114+
MOUNT_WITHIN_EXISTING_PARENT, //
115+
MOUNT_AS_DRIVE_LETTER)
116+
.stream().anyMatch(mountService::hasCapability);
117+
if( requiresMountPoint && mountPoint.isEmpty()){
114118
throw new RuntimeException("Unsupported configuration: Mounter %s requires a mount point. Use --mountPoint /path/to/mount/point to specify it.".formatted(mountService.getClass().getName()));
115119
}
116120

0 commit comments

Comments
 (0)