diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md index ad3196738..3a7337fe3 100644 --- a/.github/CODE_OF_CONDUCT.md +++ b/.github/CODE_OF_CONDUCT.md @@ -5,9 +5,9 @@ In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body -size, disability, ethnicity, gender identity and expression, level of experience, -nationality, personal appearance, race, religion, or sexual identity and -orientation. +size, disability, ethnicity, sex characteristics, gender identity and expression, +level of experience, education, socio-economic status, nationality, personal +appearance, race, religion, or sexual identity and orientation. ## Our Standards @@ -23,7 +23,7 @@ include: Examples of unacceptable behavior by participants include: * The use of sexualized language or imagery and unwelcome sexual attention or -advances + advances * Trolling, insulting/derogatory comments, and personal or political attacks * Public or private harassment * Publishing others' private information, such as a physical or electronic @@ -45,12 +45,12 @@ threatening, offensive, or harmful. ## Scope -This Code of Conduct applies both within project spaces and in public spaces -when an individual is representing the project or its community. Examples of -representing a project or community include using an official project e-mail -address, posting via an official social media account, or acting as an appointed -representative at an online or offline event. Representation of a project may be -further defined and clarified by project maintainers. +This Code of Conduct applies within all project spaces, and it also applies when +an individual is representing the project or its community in public spaces. +Examples of representing a project or community include using an official +project e-mail address, posting via an official social media account, or acting +as an appointed representative at an online or offline event. Representation of +a project may be further defined and clarified by project maintainers. ## Enforcement @@ -68,7 +68,9 @@ members of the project's leadership. ## Attribution This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, -available at [http://contributor-covenant.org/version/1/4][version] +available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html -[homepage]: http://contributor-covenant.org -[version]: http://contributor-covenant.org/version/1/4/ +[homepage]: https://www.contributor-covenant.org + +For answers to common questions about this code of conduct, see +https://www.contributor-covenant.org/faq diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index bb48037de..4547fb8df 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -5,7 +5,7 @@ - Ensure you're running the latest version of Cryptomator. - Ensure the bug is related to the desktop version of Cryptomator. Bugs concerning the Cryptomator iOS and Android app can be reported on the [Cryptomator for iOS issues list](https://github.com/cryptomator/cryptomator-ios/issues) and [Cryptomator for Android issues list](https://github.com/cryptomator/cryptomator-android/issues) respectively. - Ensure the bug was not [already reported](https://github.com/cryptomator/cryptomator/issues). You can also check out our [FAQ](https://community.cryptomator.org/c/kb/faq). -- If you're unable to find an open issue addressing the problem, [submit a new one](https://github.com/cryptomator/cryptomator/issues/new). +- If you're unable to find an open issue addressing the problem, [submit a new one](https://github.com/cryptomator/cryptomator/issues/new/choose). ## Did you write a patch that fixes a bug? @@ -14,7 +14,7 @@ ## Do you intend to add a new feature or change an existing one? -- Suggest your change by [submitting a new issue](https://github.com/cryptomator/cryptomator/issues/new) and start writing code. +- Suggest your change by [submitting a new issue](https://github.com/cryptomator/cryptomator/issues/new/choose) and start writing code. ## Code of Conduct diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 000000000..0af73f145 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,8 @@ +# These are supported funding model platforms + +github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] +patreon: # Replace with a single Patreon username +open_collective: # Replace with a single Open Collective username +ko_fi: # Replace with a single Ko-fi username +tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel +custom: https://cryptomator.org/sponsors/ diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index 3808d9c0d..000000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,31 +0,0 @@ -## Issue Checklist - -Before creating a new issue make sure that you -- searched existing (and closed) issues: https://github.com/cryptomator/cryptomator/issues -- searched the knowledge base: https://community.cryptomator.org/c/kb -- have read the support guide: https://github.com/cryptomator/cryptomator/blob/develop/SUPPORT.md -- have read the contribution guide: https://github.com/cryptomator/cryptomator/blob/develop/.github/CONTRIBUTING.md -- have read the code of conduct: https://github.com/cryptomator/cryptomator/blob/develop/.github/CODE_OF_CONDUCT.md - -## Basic Info - -I'm using Windows / macOS / Linux / … in version: … - -I'm running Cryptomator in version: … -(You can check the version in the Cryptomator settings.) - -## Description - -… -(Please describe in detail what you did, what you expected, and what really happened.) - -## Attachments (optional) - -If you want to add the log file or screenshots, please add them as attachments. If your log file seems empty and doesn't show any errors, you may enable the debug mode first. Here is how to do that: https://community.cryptomator.org/t/how-do-i-enable-debug-mode/36 - -Then reproduce the problem to ensure all important information is contained in there. You may use test data or redact sensitive information from the log file. - -You can find the log file -- on Windows: %appdata%/Cryptomator/cryptomator.log -- on macOS: ~/Library/Logs/Cryptomator/cryptomator.log -- on Linux: ~/.Cryptomator/cryptomator.log diff --git a/.github/ISSUE_TEMPLATE/1.4.0-beta-testing.md b/.github/ISSUE_TEMPLATE/1.4.0-beta-testing.md deleted file mode 100644 index c78c19e22..000000000 --- a/.github/ISSUE_TEMPLATE/1.4.0-beta-testing.md +++ /dev/null @@ -1,15 +0,0 @@ -## 1.4.0 Beta Issue Checklist -- Existing 1.4.0 Beta Issues: https://github.com/cryptomator/cryptomator/milestone/27 -- Contribution Guide: https://github.com/cryptomator/cryptomator/blob/develop/.github/CONTRIBUTING.md -- Code of Conduct: https://github.com/cryptomator/cryptomator/blob/develop/.github/CODE_OF_CONDUCT.md - -## Software Used During the Test -- Cryptomator 1.4.0 Beta 1 -- Ubuntu 16.04 / macOS 10.11.6 / etc -- Linux Kernel x.y.z -- Gnome x.y.z -- OpenOffice x.y.z -- ... - -## Description -What doesn't work? What did you do? How can the bug be reproduced? diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md new file mode 100644 index 000000000..0504eebce --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug.md @@ -0,0 +1,61 @@ +--- +name: "Bug Report" +about: "Create a report to help us improve" +labels: type:bug +--- + + + +### Description + +[Summarize your problem.] + +### System Setup + +* Operating system and version: [Windows/macOS/Linux + Version] +* Cryptomator version: [Shown in the settings] +* Drive: [Dokany/FUSE/WebDAV] + +### Steps to Reproduce + +1. [First step] +2. [Second step] +3. [and so on…] + +#### Expected Behavior + +[What you expect to happen.] + +#### Actual Behavior + +[What actually happens.] + +#### Reproducibility + +[Always/Intermittent/Only once] + +### Additional Information + +[Any additional information, log files, screenshots, configuration, or data that might be necessary to reproduce the issue.] + + \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md new file mode 100644 index 000000000..869d4d4b9 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature.md @@ -0,0 +1,32 @@ +--- +name: "Feature Request" +about: "Suggest an idea for this project" +labels: type:feature-request +--- + + + +### Summary + +[One paragraph explanation of the feature.] + +### Motivation + +[Why are we doing this? What use cases does it support? What is the expected outcome?] + +### Considered Alternatives + +[A clear and concise description of the alternative solutions you've considered.] + +### Additional Context + +[Add any other context or screenshots about the feature request here.] \ No newline at end of file diff --git a/.github/stale.yml b/.github/stale.yml index 79663c203..c6cbb1928 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -1,7 +1,7 @@ # Number of days of inactivity before an issue becomes stale -daysUntilStale: 60 +daysUntilStale: 90 # Number of days of inactivity before a stale issue is closed -daysUntilClose: 7 +daysUntilClose: 30 # Issues with these labels will never be considered stale exemptLabels: - type:security-issue # never close automatically diff --git a/.idea/compiler.xml b/.idea/compiler.xml index ace983167..da1897030 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -23,14 +23,11 @@ - + - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index bca3878d6..2e793ed5c 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,7 +3,6 @@ - \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 737f9ee2d..d0ae3c3c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,6 +50,15 @@ deploy: user: cryptobot key: $BINTRAY_API_KEY skip_cleanup: true + on: + repo: cryptomator/cryptomator + tags: true +- provider: releases + api_key: $GITHUB_API_KEY + file_glob: true + file: + - "main/buildkit/target/buildkit-*.zip" + skip_cleanup: true on: repo: cryptomator/cryptomator tags: true \ No newline at end of file diff --git a/README.md b/README.md index 151436412..493bfc3f9 100644 --- a/README.md +++ b/README.md @@ -59,6 +59,10 @@ mvn clean install -Prelease This will build all the jars and bundle them together with their OS-specific dependencies under `main/buildkit/target`. This can now be used to build native packages. +### Start Cryptomator + +If you unzip the buildkit for your OS, you will find a launcher script with some basic settings. You might want to adjust these to your needs. To start Cryptomator, simply execute the launcher script from a terminal, e.g. `launcher-linux.sh`, if you're on a Linux system. + ## License This project is dual-licensed under the GPLv3 for FOSS projects as well as a commercial license for independent software vendors and resellers. If you want to modify this application under different conditions, feel free to contact our support team. diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 000000000..7cc13ff3c --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,124 @@ +# Security Policy + +## Reporting a Vulnerability + +For reporting security-related vulnerabilities or exploits that [haven't been reported yet](https://github.com/cryptomator/cryptomator/labels/type%3Asecurity-issue), contact us at: security@cryptomator.org + +
+PGP Key + +``` +-----BEGIN PGP PUBLIC KEY BLOCK----- +Comment: GPGTools - https://gpgtools.org + +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 +=W1Ri +-----END PGP PUBLIC KEY BLOCK----- +``` +
diff --git a/SUPPORT.md b/SUPPORT.md index cdbc8ff88..c7dc14547 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -4,7 +4,15 @@ For development-related topics, GitHub is the right place. For _everything else_, please visit our official [Cryptomator Community](https://community.cryptomator.org) (we are there, too :wink:). Amongst others, you will find: -- Installation manuals -- Usage guides -- Help with problems -- Tips & tricks +- [Knowledge Base](https://community.cryptomator.org/c/kb) + - Installation manuals + - Usage guides + - FAQ +- [Help with problems](https://community.cryptomator.org/c/help) + - Assistance with the setup + - Known issues and workarounds + - Discussions about the apps +- [Development discussions](https://community.cryptomator.org/c/development) + - General questions + - Discussions regarding our design decissions + - Our roadmap diff --git a/main/buildkit/assembly-linux.xml b/main/buildkit/assembly-linux.xml index 9784212b5..a9944f3b6 100644 --- a/main/buildkit/assembly-linux.xml +++ b/main/buildkit/assembly-linux.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd"> tarball false @@ -14,6 +14,21 @@ libs + + target/ + + LICENSE.txt + + + + + target/ + + launcher-linux.sh + + + 0755 + target/libs diff --git a/main/buildkit/assembly-mac.xml b/main/buildkit/assembly-mac.xml index 1b4e94ef9..83574a3a6 100644 --- a/main/buildkit/assembly-mac.xml +++ b/main/buildkit/assembly-mac.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd"> tarball false @@ -14,6 +14,21 @@ libs + + target/ + + LICENSE.txt + + + + + target/ + + launcher-mac.sh + + + 0755 + target/libs diff --git a/main/buildkit/assembly-win.xml b/main/buildkit/assembly-win.xml index 982ff6037..67d9df61f 100644 --- a/main/buildkit/assembly-win.xml +++ b/main/buildkit/assembly-win.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd"> tarball false @@ -14,6 +14,21 @@ libs + + target/ + + LICENSE.txt + + + + + target/ + + launcher-win.bat + + + 0755 + target/libs diff --git a/main/buildkit/pom.xml b/main/buildkit/pom.xml index 619923371..e2bd5bc4f 100644 --- a/main/buildkit/pom.xml +++ b/main/buildkit/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.4.11 + 1.4.12 buildkit pom @@ -20,7 +20,7 @@ - + org.apache.maven.plugins maven-resources-plugin @@ -39,6 +39,10 @@ ${project.basedir}/src/main/resources version.txt + launcher-mac.sh + launcher-linux.sh + launcher-win.bat + LICENSE.txt true @@ -62,6 +66,7 @@ ${project.build.directory}/libs linux,mac,win + dbus-java,secret-service,hkdf,java-utils @@ -76,6 +81,17 @@ linux + + copy-linux-secret-service + prepare-package + + copy-dependencies + + + ${project.build.directory}/linux-libs + dbus-java,secret-service,hkdf,java-utils + + copy-mac-libs prepare-package diff --git a/main/buildkit/src/main/resources/LICENSE.txt b/main/buildkit/src/main/resources/LICENSE.txt new file mode 100644 index 000000000..20d40b6bc --- /dev/null +++ b/main/buildkit/src/main/resources/LICENSE.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. \ No newline at end of file diff --git a/main/buildkit/src/main/resources/launcher-linux.sh b/main/buildkit/src/main/resources/launcher-linux.sh new file mode 100644 index 000000000..2322870e8 --- /dev/null +++ b/main/buildkit/src/main/resources/launcher-linux.sh @@ -0,0 +1,11 @@ +#!/bin/sh +java \ + -cp "libs/*" \ + -Dcryptomator.settingsPath="~/.config/Cryptomator/settings.json" \ + -Dcryptomator.ipcPortPath="~/.config/Cryptomator/ipcPort.bin" \ + -Dcryptomator.logDir="~/.local/share/Cryptomator/logs" \ + -Dcryptomator.mountPointsDir="~/.local/share/Cryptomator/mnt" \ + -Djdk.gtk.version=2 \ + -Xss20m \ + -Xmx512m \ + org.cryptomator.launcher.Cryptomator \ No newline at end of file diff --git a/main/buildkit/src/main/resources/launcher-mac.sh b/main/buildkit/src/main/resources/launcher-mac.sh new file mode 100644 index 000000000..65f8ba10d --- /dev/null +++ b/main/buildkit/src/main/resources/launcher-mac.sh @@ -0,0 +1,10 @@ +#!/bin/sh +java \ + -cp "libs/*" \ + -Dcryptomator.settingsPath="~/Library/Application Support/Cryptomator/settings.json" \ + -Dcryptomator.ipcPortPath="~/Library/Application Support/Cryptomator/ipcPort.bin" \ + -Dcryptomator.logDir="~/Library/Logs/Cryptomator" \ + -Dcryptomator.mountPointsDir="/Volumes" \ + -Xss20m \ + -Xmx512m \ + org.cryptomator.launcher.Cryptomator \ No newline at end of file diff --git a/main/buildkit/src/main/resources/launcher-win.bat b/main/buildkit/src/main/resources/launcher-win.bat new file mode 100644 index 000000000..505981c9e --- /dev/null +++ b/main/buildkit/src/main/resources/launcher-win.bat @@ -0,0 +1,10 @@ +@echo off +java ^ + -cp "libs/*" ^ + -Dcryptomator.settingsPath="~/AppData/Roaming/Cryptomator/settings.json" ^ + -Dcryptomator.ipcPortPath="~/AppData/Roaming/Cryptomator/ipcPort.bin" ^ + -Dcryptomator.logDir="~/AppData/Roaming/Cryptomator" ^ + -Dcryptomator.keychainPath="~/AppData/Roaming/Cryptomator/keychain.json" ^ + -Xss20m ^ + -Xmx512m ^ + org.cryptomator.launcher.Cryptomator \ No newline at end of file diff --git a/main/commons/pom.xml b/main/commons/pom.xml index 94229439c..7ded57845 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.4.11 + 1.4.12 commons Cryptomator Commons diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/SettingsProvider.java b/main/commons/src/main/java/org/cryptomator/common/settings/SettingsProvider.java index 732b66fef..0aae9a541 100644 --- a/main/commons/src/main/java/org/cryptomator/common/settings/SettingsProvider.java +++ b/main/commons/src/main/java/org/cryptomator/common/settings/SettingsProvider.java @@ -10,6 +10,7 @@ package org.cryptomator.common.settings; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.google.gson.JsonParseException; import org.cryptomator.common.Environment; import org.cryptomator.common.LazyInitializer; import org.slf4j.Logger; @@ -29,6 +30,7 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.NoSuchFileException; import java.nio.file.Path; +import java.nio.file.StandardCopyOption; import java.nio.file.StandardOpenOption; import java.util.Optional; import java.util.concurrent.Executors; @@ -109,12 +111,14 @@ public class SettingsProvider implements Provider { LOG.debug("Attempting to save settings to {}", settingsPath); try { Files.createDirectories(settingsPath.getParent()); - try (OutputStream out = Files.newOutputStream(settingsPath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING); // - Writer writer = new OutputStreamWriter(out, StandardCharsets.UTF_8)) { + Path tmpPath = settingsPath.resolveSibling(settingsPath.getFileName().toString() + ".tmp"); + try (OutputStream out = Files.newOutputStream(tmpPath, StandardOpenOption.CREATE_NEW); // + Writer writer = new OutputStreamWriter(out, StandardCharsets.UTF_8)) { gson.toJson(settings, writer); - LOG.info("Settings saved to {}", settingsPath); } - } catch (IOException e) { + Files.move(tmpPath, settingsPath, StandardCopyOption.REPLACE_EXISTING); + LOG.info("Settings saved to {}", settingsPath); + } catch (IOException | JsonParseException e) { LOG.error("Failed to save settings.", e); } } diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java index 41c91efcf..0a0301266 100644 --- a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java +++ b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java @@ -20,6 +20,7 @@ import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.util.Base64; +import java.util.List; import java.util.Objects; import java.util.Optional; import java.util.UUID; @@ -34,9 +35,10 @@ public class VaultSettings { public static final boolean DEFAULT_REAVEAL_AFTER_MOUNT = true; public static final boolean DEFAULT_USES_INDIVIDUAL_MOUNTPATH = false; public static final boolean DEFAULT_USES_READONLY_MODE = false; + public static final String DEFAULT_MOUNT_FLAGS = ""; private final String id; - private final ObjectProperty path = new SimpleObjectProperty<>(); + private final ObjectProperty path = new SimpleObjectProperty(); private final StringProperty mountName = new SimpleStringProperty(); private final StringProperty winDriveLetter = new SimpleStringProperty(); private final BooleanProperty unlockAfterStartup = new SimpleBooleanProperty(DEFAULT_UNLOCK_AFTER_STARTUP); @@ -44,6 +46,7 @@ public class VaultSettings { private final BooleanProperty usesIndividualMountPath = new SimpleBooleanProperty(DEFAULT_USES_INDIVIDUAL_MOUNTPATH); private final StringProperty individualMountPath = new SimpleStringProperty(); private final BooleanProperty usesReadOnlyMode = new SimpleBooleanProperty(DEFAULT_USES_READONLY_MODE); + private final StringProperty mountFlags = new SimpleStringProperty(DEFAULT_MOUNT_FLAGS); public VaultSettings(String id) { this.id = Objects.requireNonNull(id); @@ -52,7 +55,7 @@ public class VaultSettings { } Observable[] observables() { - return new Observable[]{path, mountName, winDriveLetter, unlockAfterStartup, revealAfterMount, usesIndividualMountPath, individualMountPath, usesReadOnlyMode}; + return new Observable[]{path, mountName, winDriveLetter, unlockAfterStartup, revealAfterMount, usesIndividualMountPath, individualMountPath, usesReadOnlyMode, mountFlags}; } private void deriveMountNameFromPath(Path path) { @@ -147,6 +150,10 @@ public class VaultSettings { return usesReadOnlyMode; } + public StringProperty mountFlags() { + return mountFlags; + } + /* Hashcode/Equals */ @Override diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java index 7a3f03b39..e5130cdb0 100644 --- a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java +++ b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java @@ -26,8 +26,9 @@ class VaultSettingsJsonAdapter { out.name("unlockAfterStartup").value(value.unlockAfterStartup().get()); out.name("revealAfterMount").value(value.revealAfterMount().get()); out.name("usesIndividualMountPath").value(value.usesIndividualMountPath().get()); - out.name("individualMountPath").value(value.individualMountPath().get()); //TODO: should this always be written? ( because it could contain metadata, which the user may not want to save!) + out.name("individualMountPath").value(value.individualMountPath().get()); out.name("usesReadOnlyMode").value(value.usesReadOnlyMode().get()); + out.name("mountFlags").value(value.mountFlags().get()); out.endObject(); } @@ -41,6 +42,7 @@ class VaultSettingsJsonAdapter { boolean revealAfterMount = VaultSettings.DEFAULT_REAVEAL_AFTER_MOUNT; boolean usesIndividualMountPath = VaultSettings.DEFAULT_USES_INDIVIDUAL_MOUNTPATH; boolean usesReadOnlyMode = VaultSettings.DEFAULT_USES_READONLY_MODE; + String mountFlags = VaultSettings.DEFAULT_MOUNT_FLAGS; in.beginObject(); while (in.hasNext()) { @@ -73,6 +75,9 @@ class VaultSettingsJsonAdapter { case "usesReadOnlyMode": usesReadOnlyMode = in.nextBoolean(); break; + case "mountFlags": + mountFlags = in.nextString(); + break; default: LOG.warn("Unsupported vault setting found in JSON: " + name); in.skipValue(); @@ -90,6 +95,7 @@ class VaultSettingsJsonAdapter { vaultSettings.usesIndividualMountPath().set(usesIndividualMountPath); vaultSettings.individualMountPath().set(individualMountPath); vaultSettings.usesReadOnlyMode().set(usesReadOnlyMode); + vaultSettings.mountFlags().set(mountFlags); return vaultSettings; } diff --git a/main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java b/main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java index 32f393842..f7698d2ba 100644 --- a/main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java +++ b/main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java @@ -6,12 +6,17 @@ package org.cryptomator.common.settings; import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import org.hamcrest.CoreMatchers; +import org.hamcrest.MatcherAssert; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.StringReader; +import java.io.StringWriter; import java.nio.file.Paths; +import java.util.Arrays; public class VaultSettingsJsonAdapterTest { @@ -19,7 +24,7 @@ public class VaultSettingsJsonAdapterTest { @Test public void testDeserialize() throws IOException { - String json = "{\"id\": \"foo\", \"path\": \"/foo/bar\", \"mountName\": \"test\", \"winDriveLetter\": \"X\", \"shouldBeIgnored\": true, \"individualMountPath\": \"/home/test/crypto\"}"; + String json = "{\"id\": \"foo\", \"path\": \"/foo/bar\", \"mountName\": \"test\", \"winDriveLetter\": \"X\", \"shouldBeIgnored\": true, \"individualMountPath\": \"/home/test/crypto\", \"mountFlags\":\"--foo --bar\"}"; JsonReader jsonReader = new JsonReader(new StringReader(json)); VaultSettings vaultSettings = adapter.read(jsonReader); @@ -28,6 +33,31 @@ public class VaultSettingsJsonAdapterTest { Assertions.assertEquals("test", vaultSettings.mountName().get()); Assertions.assertEquals("X", vaultSettings.winDriveLetter().get()); Assertions.assertEquals("/home/test/crypto", vaultSettings.individualMountPath().get()); + Assertions.assertEquals("--foo --bar", vaultSettings.mountFlags().get()); + + + } + + @Test + public void testSerialize() throws IOException { + VaultSettings vaultSettings = new VaultSettings("test"); + vaultSettings.path().set(Paths.get("/foo/bar")); + vaultSettings.mountName().set("mountyMcMountFace"); + vaultSettings.mountFlags().set("--foo --bar"); + + StringWriter buf = new StringWriter(); + JsonWriter jsonWriter = new JsonWriter(buf); + adapter.write(jsonWriter, vaultSettings); + String result = buf.toString(); + + MatcherAssert.assertThat(result, CoreMatchers.containsString("\"id\":\"test\"")); + if(System.getProperty("os.name").contains("Windows")){ + MatcherAssert.assertThat(result, CoreMatchers.containsString("\"path\":\"\\\\foo\\\\bar\"")); + } else { + MatcherAssert.assertThat(result, CoreMatchers.containsString("\"path\":\"/foo/bar\"")); + } + MatcherAssert.assertThat(result, CoreMatchers.containsString("\"mountName\":\"mountyMcMountFace\"")); + MatcherAssert.assertThat(result, CoreMatchers.containsString("\"mountFlags\":\"--foo --bar\"")); } } diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml index 5a1351b4f..bff1d5fda 100644 --- a/main/keychain/pom.xml +++ b/main/keychain/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.4.11 + 1.4.12 keychain System Keychain Access @@ -39,7 +39,14 @@ com.google.dagger dagger - + + + + de.swiesend + secret-service + 1.0.0-RC.3 + + org.slf4j diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/GnomeKeyringAccess.java b/main/keychain/src/main/java/org/cryptomator/keychain/GnomeKeyringAccess.java new file mode 100644 index 000000000..998fdfab7 --- /dev/null +++ b/main/keychain/src/main/java/org/cryptomator/keychain/GnomeKeyringAccess.java @@ -0,0 +1,9 @@ +package org.cryptomator.keychain; + +public interface GnomeKeyringAccess { + public void storePassword(String key, CharSequence passphrase); + + public char[] loadPassword(String key); + + public void deletePassword(String key); +} diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/GnomeKeyringAccessImpl.java b/main/keychain/src/main/java/org/cryptomator/keychain/GnomeKeyringAccessImpl.java new file mode 100644 index 000000000..34dcdb5fa --- /dev/null +++ b/main/keychain/src/main/java/org/cryptomator/keychain/GnomeKeyringAccessImpl.java @@ -0,0 +1,52 @@ +package org.cryptomator.keychain; + +import org.freedesktop.secret.simple.SimpleCollection; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class GnomeKeyringAccessImpl implements GnomeKeyringAccess { + private static final Logger LOG = LoggerFactory.getLogger(GnomeKeyringAccessImpl.class); + private SimpleCollection keyring; + + public GnomeKeyringAccessImpl() { + try { + keyring = new SimpleCollection(); + } catch (IOException e) { + LOG.error("D-Bus reports a problem.", e); + } + } + + public void storePassword(String key, CharSequence passphrase) { + List list = keyring.getItems(createAttributes(key)); + if (list == null) { + keyring.createItem("Cryptomator", passphrase, createAttributes(key)); + } + } + + public char[] loadPassword(String key) { + List list = keyring.getItems(createAttributes(key)); + if (list != null) { + return keyring.getSecret(list.get(0)); + } else { + return null; + } + } + + public void deletePassword(String key) { + List list = keyring.getItems(createAttributes(key)); + if (list != null) { + keyring.deleteItem(list.get(0)); + } + } + + private Map createAttributes(String key) { + Map attributes = new HashMap(); + attributes.put("Vault", key); + return attributes; + } +} diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java index 5db7bc372..f05a90f1f 100644 --- a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java +++ b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java @@ -31,8 +31,8 @@ public class KeychainModule { @Provides @ElementsIntoSet - Set provideKeychainAccessStrategies(MacSystemKeychainAccess macKeychain, WindowsProtectedKeychainAccess winKeychain) { - return Sets.newHashSet(macKeychain, winKeychain); + Set provideKeychainAccessStrategies(MacSystemKeychainAccess macKeychain, WindowsProtectedKeychainAccess winKeychain, LinuxSecretServiceAccess linKeychain) { + return Sets.newHashSet(macKeychain, winKeychain, linKeychain); } @Provides diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKeychainTester.java b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKeychainTester.java new file mode 100644 index 000000000..67d1300c9 --- /dev/null +++ b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKeychainTester.java @@ -0,0 +1,28 @@ +package org.cryptomator.keychain; + +import org.apache.commons.lang3.SystemUtils; + +import java.util.Optional; + +public class LinuxKeychainTester { + + public static boolean secretServiceIsAvailable() { + try { + Class.forName("org.freedesktop.secret.simple.SimpleCollection"); + return SystemUtils.IS_OS_LINUX; // even if the classes could be loaded, secretService is only available on linux + } catch (ClassNotFoundException e) { + return false; + } + } + + public static Optional getSecretService() { + if (!secretServiceIsAvailable()) return Optional.empty(); + try { + Class clazz = Class.forName("org.cryptomator.keychain.GnomeKeyringAccessImpl"); + GnomeKeyringAccess keyring = (GnomeKeyringAccess) clazz.getDeclaredConstructor().newInstance(); + return Optional.of(keyring); + } catch (Exception e) { + return Optional.empty(); + } + } +} diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceAccess.java b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceAccess.java new file mode 100644 index 000000000..ef8dcb092 --- /dev/null +++ b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceAccess.java @@ -0,0 +1,39 @@ +package org.cryptomator.keychain; + +import com.google.common.base.Preconditions; +import org.apache.commons.lang3.SystemUtils; + +import javax.inject.Inject; +import java.util.Optional; + +public class LinuxSecretServiceAccess implements KeychainAccessStrategy { + private final Optional gnomeLoginKeyring; + + @Inject + public LinuxSecretServiceAccess() { + gnomeLoginKeyring = LinuxKeychainTester.getSecretService(); + } + + @Override + public boolean isSupported() { + return SystemUtils.IS_OS_LINUX && LinuxKeychainTester.getSecretService().isPresent(); + } + + @Override + public void storePassphrase(String key, CharSequence passphrase) { + Preconditions.checkState(gnomeLoginKeyring.isPresent()); + gnomeLoginKeyring.get().storePassword(key, passphrase); + } + + @Override + public char[] loadPassphrase(String key) { + Preconditions.checkState(gnomeLoginKeyring.isPresent()); + return gnomeLoginKeyring.get().loadPassword(key); + } + + @Override + public void deletePassphrase(String key) { + Preconditions.checkState(gnomeLoginKeyring.isPresent()); + gnomeLoginKeyring.get().deletePassword(key); + } +} diff --git a/main/keychain/src/test/java/org/cryptomator/keychain/TestKeychainModule.java b/main/keychain/src/test/java/org/cryptomator/keychain/TestKeychainModule.java index 66addc62a..80c4e6aa3 100644 --- a/main/keychain/src/test/java/org/cryptomator/keychain/TestKeychainModule.java +++ b/main/keychain/src/test/java/org/cryptomator/keychain/TestKeychainModule.java @@ -7,13 +7,11 @@ package org.cryptomator.keychain; import java.util.Set; -import com.google.common.collect.Sets; - public class TestKeychainModule extends KeychainModule { @Override - Set provideKeychainAccessStrategies(MacSystemKeychainAccess macKeychain, WindowsProtectedKeychainAccess winKeychain) { - return Sets.newHashSet(new MapKeychainAccess()); + Set provideKeychainAccessStrategies(MacSystemKeychainAccess macKeychain, WindowsProtectedKeychainAccess winKeychain, LinuxSecretServiceAccess linKeychain) { + return Set.of(new MapKeychainAccess()); } } diff --git a/main/launcher/pom.xml b/main/launcher/pom.xml index d72e76f45..3cac71a3f 100644 --- a/main/launcher/pom.xml +++ b/main/launcher/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.4.11 + 1.4.12 launcher Cryptomator Launcher diff --git a/main/pom.xml b/main/pom.xml index 5c30c2f9a..b1a27f394 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.cryptomator main - 1.4.11 + 1.4.12 pom Cryptomator @@ -25,10 +25,10 @@ 1.2.1 - 1.8.5 + 1.8.6 2.0.0 - 1.1.3 - 1.1.8 + 1.2.0 + 1.1.9 1.0.10 12 diff --git a/main/ui/pom.xml b/main/ui/pom.xml index 10aec08e5..7ef622799 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.4.11 + 1.4.12 ui Cryptomator GUI diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java index 3d90c689f..404bb00e1 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java @@ -11,6 +11,8 @@ package org.cryptomator.ui.controllers; import com.google.common.base.CharMatcher; import com.google.common.base.Strings; import javafx.application.Application; +import javafx.beans.property.BooleanProperty; +import javafx.beans.property.SimpleBooleanProperty; import javafx.beans.value.ChangeListener; import javafx.beans.value.ObservableValue; import javafx.fxml.FXML; @@ -20,18 +22,17 @@ import javafx.scene.control.Button; import javafx.scene.control.ButtonType; import javafx.scene.control.CheckBox; import javafx.scene.control.ChoiceBox; +import javafx.scene.control.ContentDisplay; import javafx.scene.control.Hyperlink; import javafx.scene.control.Label; -import javafx.scene.control.ProgressIndicator; import javafx.scene.control.TextField; import javafx.scene.input.KeyEvent; -import javafx.scene.layout.GridPane; import javafx.scene.layout.HBox; +import javafx.scene.layout.VBox; import javafx.scene.text.Text; import javafx.stage.DirectoryChooser; import javafx.stage.Stage; import javafx.util.StringConverter; -import org.apache.commons.lang3.CharUtils; import org.apache.commons.lang3.SystemUtils; import org.cryptomator.common.settings.Settings; import org.cryptomator.common.settings.VaultSettings; @@ -76,13 +77,14 @@ public class UnlockController implements ViewController { private final Stage mainWindow; private final Localization localization; private final WindowsDriveLetters driveLetters; - private final ChangeListener driveLetterChangeListener = this::winDriveLetterDidChange; + private final ChangeListener driveLetterChangeListener = this::winDriveLetterDidChange; private final Optional keychainAccess; private final Settings settings; private final ExecutorService executor; private Vault vault; private Optional listener = Optional.empty(); private Subscription vaultSubs = Subscription.EMPTY; + private BooleanProperty unlocking = new SimpleBooleanProperty(); @Inject public UnlockController(Application app, @Named("mainWindow") Stage mainWindow, Localization localization, WindowsDriveLetters driveLetters, Optional keychainAccess, Settings settings, ExecutorService executor) { @@ -113,14 +115,20 @@ public class UnlockController implements ViewController { @FXML private TextField mountName; + @FXML + private CheckBox useCustomMountFlags; + + @FXML + private TextField mountFlags; + @FXML private CheckBox revealAfterMount; @FXML - private Label winDriveLetterLabel; + private CheckBox useCustomWinDriveLetter; @FXML - private ChoiceBox winDriveLetter; + private ChoiceBox winDriveLetter; @FXML private CheckBox useCustomMountPoint; @@ -131,20 +139,14 @@ public class UnlockController implements ViewController { @FXML private Label customMountPointLabel; - @FXML - private ProgressIndicator progressIndicator; - - @FXML - private Text progressText; - @FXML private Hyperlink downloadsPageLink; @FXML - private GridPane advancedOptions; + private VBox advancedOptions; @FXML - private GridPane root; + private VBox root; @FXML private CheckBox unlockAfterStartup; @@ -155,25 +157,31 @@ public class UnlockController implements ViewController { @Override public void initialize() { advancedOptions.managedProperty().bind(advancedOptions.visibleProperty()); - unlockButton.disableProperty().bind(passwordField.textProperty().isEmpty()); + advancedOptions.disableProperty().bind(unlocking); + unlockButton.disableProperty().bind(unlocking.or(passwordField.textProperty().isEmpty())); mountName.addEventFilter(KeyEvent.KEY_TYPED, this::filterAlphanumericKeyEvents); mountName.textProperty().addListener(this::mountNameDidChange); + useReadOnlyMode.selectedProperty().addListener(this::useReadOnlyDidChange); + useCustomMountFlags.selectedProperty().addListener(this::useCustomMountFlagsDidChange); + mountFlags.disableProperty().bind(useCustomMountFlags.selectedProperty().not()); + mountFlags.textProperty().addListener(this::mountFlagsDidChange); savePassword.setDisable(!keychainAccess.isPresent()); unlockAfterStartup.disableProperty().bind(savePassword.disabledProperty().or(savePassword.selectedProperty().not())); + downloadsPageLink.visibleProperty().bind(downloadsPageLink.managedProperty()); customMountPoint.visibleProperty().bind(useCustomMountPoint.selectedProperty()); customMountPoint.managedProperty().bind(useCustomMountPoint.selectedProperty()); winDriveLetter.setConverter(new WinDriveLetterLabelConverter()); + winDriveLetter.disableProperty().bind(useCustomWinDriveLetter.selectedProperty().not()); if (!SystemUtils.IS_OS_WINDOWS) { - winDriveLetterLabel.setVisible(false); - winDriveLetterLabel.setManaged(false); + useCustomWinDriveLetter.setVisible(false); + useCustomWinDriveLetter.setManaged(false); winDriveLetter.setVisible(false); winDriveLetter.setManaged(false); } } - @Override public Parent getRoot() { return root; @@ -198,20 +206,12 @@ public class UnlockController implements ViewController { this.vault = vault; advancedOptions.setVisible(false); advancedOptionsButton.setText(localization.getString("unlock.button.advancedOptions.show")); - progressIndicator.setVisible(false); - progressText.setText(null); + unlockButton.setContentDisplay(ContentDisplay.TEXT_ONLY); state.successMessage().map(localization::getString).ifPresent(messageText::setText); - if (SystemUtils.IS_OS_WINDOWS) { - winDriveLetter.valueProperty().removeListener(driveLetterChangeListener); - winDriveLetter.getItems().clear(); - winDriveLetter.getItems().add(null); - winDriveLetter.getItems().addAll(driveLetters.getAvailableDriveLetters()); - winDriveLetter.getItems().sort(new WinDriveLetterComparator()); - winDriveLetter.valueProperty().addListener(driveLetterChangeListener); - chooseSelectedDriveLetter(); - } - downloadsPageLink.setVisible(false); + downloadsPageLink.setManaged(false); mountName.setText(vault.getMountName()); + useCustomMountFlags.setSelected(vault.isHavingCustomMountFlags()); + mountFlags.setText(vault.getMountFlags()); savePassword.setSelected(false); // auto-fill pw from keychain: if (keychainAccess.isPresent()) { @@ -226,11 +226,16 @@ public class UnlockController implements ViewController { VaultSettings vaultSettings = vault.getVaultSettings(); unlockAfterStartup.setSelected(savePassword.isSelected() && vaultSettings.unlockAfterStartup().get()); revealAfterMount.setSelected(vaultSettings.revealAfterMount().get()); + useReadOnlyMode.setSelected(vaultSettings.usesReadOnlyMode().get()); // WEBDAV-dependent controls: if (VolumeImpl.WEBDAV.equals(settings.preferredVolumeImpl().get())) { useCustomMountPoint.setVisible(false); useCustomMountPoint.setManaged(false); + useCustomMountFlags.setVisible(false); + useCustomMountFlags.setManaged(false); + mountFlags.setVisible(false); + mountFlags.setManaged(false); } else { useCustomMountPoint.setVisible(true); useCustomMountPoint.setSelected(vaultSettings.usesIndividualMountPath().get()); @@ -241,26 +246,22 @@ public class UnlockController implements ViewController { } } - // DOKANY-dependent controls: - if (VolumeImpl.DOKANY.equals(settings.preferredVolumeImpl().get())) { - winDriveLetter.visibleProperty().bind(useCustomMountPoint.selectedProperty().not()); - winDriveLetter.managedProperty().bind(useCustomMountPoint.selectedProperty().not()); - winDriveLetterLabel.visibleProperty().bind(useCustomMountPoint.selectedProperty().not()); - winDriveLetterLabel.managedProperty().bind(useCustomMountPoint.selectedProperty().not()); - // readonly not yet supported by dokany - useReadOnlyMode.setSelected(false); - useReadOnlyMode.setVisible(false); - useReadOnlyMode.setManaged(false); - } else { - useReadOnlyMode.setSelected(vaultSettings.usesReadOnlyMode().get()); - } // OS-dependent controls: if (SystemUtils.IS_OS_WINDOWS) { + winDriveLetter.valueProperty().removeListener(driveLetterChangeListener); + winDriveLetter.getItems().clear(); + winDriveLetter.getItems().add(null); + winDriveLetter.getItems().addAll(driveLetters.getAvailableDriveLetters()); + winDriveLetter.getItems().sort(new WinDriveLetterComparator()); + winDriveLetter.valueProperty().addListener(driveLetterChangeListener); + chooseSelectedDriveLetter(); + winDriveLetter.visibleProperty().bind(useCustomMountPoint.selectedProperty().not()); winDriveLetter.managedProperty().bind(useCustomMountPoint.selectedProperty().not()); - winDriveLetterLabel.visibleProperty().bind(useCustomMountPoint.selectedProperty().not()); - winDriveLetterLabel.managedProperty().bind(useCustomMountPoint.selectedProperty().not()); + useCustomWinDriveLetter.setSelected(!vaultSettings.usesIndividualMountPath().get()); + useCustomWinDriveLetter.visibleProperty().bind(useCustomMountPoint.selectedProperty().not()); + useCustomWinDriveLetter.managedProperty().bind(useCustomMountPoint.selectedProperty().not()); } vaultSubs = vaultSubs.and(EasyBind.subscribe(unlockAfterStartup.selectedProperty(), vaultSettings.unlockAfterStartup()::set)); @@ -297,6 +298,7 @@ public class UnlockController implements ViewController { @FXML private void didClickAdvancedOptionsButton() { messageText.setText(null); + downloadsPageLink.setManaged(false); advancedOptions.setVisible(!advancedOptions.isVisible()); if (advancedOptions.isVisible()) { advancedOptionsButton.setText(localization.getString("unlock.button.advancedOptions.hide")); @@ -311,13 +313,37 @@ public class UnlockController implements ViewController { } } - private void mountNameDidChange(@SuppressWarnings("unused") ObservableValue property, @SuppressWarnings("unused")String oldValue, String newValue) { + private void mountNameDidChange(@SuppressWarnings("unused") ObservableValue property, @SuppressWarnings("unused") String oldValue, String newValue) { // newValue is guaranteed to be a-z0-9_, see #filterAlphanumericKeyEvents if (newValue.isEmpty()) { mountName.setText(vault.getMountName()); } else { vault.setMountName(newValue); } + if (!useCustomMountFlags.isSelected()) { + mountFlags.setText(vault.getMountFlags()); // update default flags + } + } + + private void useReadOnlyDidChange(@SuppressWarnings("unused") ObservableValue property, @SuppressWarnings("unused") Boolean oldValue, Boolean newValue) { + vault.getVaultSettings().usesReadOnlyMode().setValue(newValue); + if (!useCustomMountFlags.isSelected()) { + mountFlags.setText(vault.getMountFlags()); // update default flags + } + } + + + private void useCustomMountFlagsDidChange(@SuppressWarnings("unused") ObservableValue property, @SuppressWarnings("unused") Boolean oldValue, Boolean newValue) { + if (!newValue) { + vault.setMountFlags(VaultSettings.DEFAULT_MOUNT_FLAGS); + mountFlags.setText(vault.getMountFlags()); + } + } + + private void mountFlagsDidChange(@SuppressWarnings("unused") ObservableValue property, @SuppressWarnings("unused") String oldValue, String newValue) { + if (useCustomMountFlags.isSelected()) { + vault.setMountFlags(newValue); + } } @FXML @@ -330,26 +356,40 @@ public class UnlockController implements ViewController { } } + @FXML + public void didClickCustomWinDriveLetterCheckbox() { + if (!useCustomWinDriveLetter.isSelected()) { + winDriveLetter.setValue(null); + } + } + + @FXML + public void didClickCustomMountPointCheckbox() { + useCustomWinDriveLetter.setSelected(vault.getWinDriveLetter() != null); + } + /** * Converts 'C' to "C:" to translate between model and GUI. */ - private class WinDriveLetterLabelConverter extends StringConverter { + private class WinDriveLetterLabelConverter extends StringConverter { @Override - public String toString(Character letter) { - if (letter == null) { + public String toString(Path root) { + if (root == null) { return localization.getString("unlock.choicebox.winDriveLetter.auto"); + } else if (root.endsWith("occupied")) { + return root.getRoot().toString().substring(0, 1) + " (" + localization.getString("unlock.choicebox.winDriveLetter.occupied") + ")"; } else { - return letter + ":"; + return root.toString().substring(0, 1); } } @Override - public Character fromString(String string) { + public Path fromString(String string) { if (localization.getString("unlock.choicebox.winDriveLetter.auto").equals(string)) { return null; } else { - return CharUtils.toCharacterObject(string); + return Path.of(string); } } @@ -358,37 +398,41 @@ public class UnlockController implements ViewController { /** * Natural sorting of ASCII letters, but null always on first, as this is "auto-assign". */ - private static class WinDriveLetterComparator implements Comparator { + private static class WinDriveLetterComparator implements Comparator { @Override - public int compare(Character c1, Character c2) { + public int compare(Path c1, Path c2) { if (c1 == null) { return -1; } else if (c2 == null) { return 1; } else { - return c1 - c2; + return c1.compareTo(c2); } } } - private void winDriveLetterDidChange(@SuppressWarnings("unused") ObservableValue property, @SuppressWarnings("unused") Character oldValue, Character newValue) { + private void winDriveLetterDidChange(@SuppressWarnings("unused") ObservableValue property, @SuppressWarnings("unused") Path oldValue, Path newValue) { vault.setWinDriveLetter(newValue); } private void chooseSelectedDriveLetter() { assert SystemUtils.IS_OS_WINDOWS; // if the vault prefers a drive letter, that is currently occupied, this is our last chance to reset this: - if (driveLetters.getOccupiedDriveLetters().contains(vault.getWinDriveLetter())) { - vault.setWinDriveLetter(null); - } - final Character letter = vault.getWinDriveLetter(); - if (letter == null) { + if (vault.getWinDriveLetter() != null) { + final Path pickedRoot = Path.of(vault.getWinDriveLetter() + ":\\"); + if (driveLetters.getOccupiedDriveLetters().contains(pickedRoot)) { + Path alteredPath = pickedRoot.resolve("occupied"); + this.winDriveLetter.getItems().add(alteredPath); + this.winDriveLetter.getSelectionModel().select(alteredPath); + } else { + this.winDriveLetter.getSelectionModel().select(pickedRoot); + } + } else { // first option is known to be 'auto-assign' due to #WinDriveLetterComparator. this.winDriveLetter.getSelectionModel().selectFirst(); - } else { - this.winDriveLetter.getSelectionModel().select(letter); } + } // **************************************** @@ -428,35 +472,34 @@ public class UnlockController implements ViewController { @FXML private void didClickUnlockButton() { - advancedOptions.setDisable(true); - advancedOptions.setVisible(false); + unlocking.set(true); advancedOptionsButton.setText(localization.getString("unlock.button.advancedOptions.show")); - progressIndicator.setVisible(true); + unlockButton.setContentDisplay(ContentDisplay.LEFT); CharSequence password = passwordField.getCharacters(); Tasks.create(() -> { - progressText.setText(localization.getString("unlock.pendingMessage.unlocking")); vault.unlock(password); if (keychainAccess.isPresent() && savePassword.isSelected()) { keychainAccess.get().storePassphrase(vault.getId(), password); } }).onSuccess(() -> { - messageText.setText(""); - downloadsPageLink.setVisible(false); + messageText.setText(null); + downloadsPageLink.setManaged(false); listener.ifPresent(lstnr -> lstnr.didUnlock(vault)); passwordField.swipe(); }).onError(InvalidPassphraseException.class, e -> { messageText.setText(localization.getString("unlock.errorMessage.wrongPassword")); + downloadsPageLink.setManaged(false); passwordField.selectAll(); passwordField.requestFocus(); }).onError(UnsupportedVaultFormatException.class, e -> { if (e.isVaultOlderThanSoftware()) { // whitespace after localized text used as separator between text and hyperlink messageText.setText(localization.getString("unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware") + " "); - downloadsPageLink.setVisible(true); + downloadsPageLink.setManaged(true); } else if (e.isSoftwareOlderThanVault()) { messageText.setText(localization.getString("unlock.errorMessage.unsupportedVersion.softwareOlderThanVault") + " "); - downloadsPageLink.setVisible(true); + downloadsPageLink.setManaged(true); } else if (e.getDetectedVersion() == Integer.MAX_VALUE) { messageText.setText(localization.getString("unlock.errorMessage.unauthenticVersionMac")); } @@ -464,19 +507,21 @@ public class UnlockController implements ViewController { LOG.error("Unlock failed. Mount point not a directory: {}", e.getMessage()); advancedOptions.setVisible(true); messageText.setText(null); + downloadsPageLink.setManaged(false); showUnlockFailedErrorDialog("unlock.failedDialog.content.mountPathNonExisting"); }).onError(DirectoryNotEmptyException.class, e -> { LOG.error("Unlock failed. Mount point not empty: {}", e.getMessage()); advancedOptions.setVisible(true); messageText.setText(null); + downloadsPageLink.setManaged(false); showUnlockFailedErrorDialog("unlock.failedDialog.content.mountPathNotEmpty"); }).onError(Exception.class, e -> { // including RuntimeExceptions LOG.error("Unlock failed for technical reasons.", e); messageText.setText(localization.getString("unlock.errorMessage.unlockFailed")); + downloadsPageLink.setManaged(false); }).andFinally(() -> { - advancedOptions.setDisable(false); - progressIndicator.setVisible(false); - progressText.setText(null); + unlocking.set(false); + unlockButton.setContentDisplay(ContentDisplay.TEXT_ONLY); }).runOnce(executor); } diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/DefaultMountFlags.java b/main/ui/src/main/java/org/cryptomator/ui/model/DefaultMountFlags.java new file mode 100644 index 000000000..50943a34f --- /dev/null +++ b/main/ui/src/main/java/org/cryptomator/ui/model/DefaultMountFlags.java @@ -0,0 +1,13 @@ +package org.cryptomator.ui.model; + +import javax.inject.Qualifier; +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; + +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +@Qualifier +@Documented +@Retention(RUNTIME) +public @interface DefaultMountFlags { +} diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/DokanyVolume.java b/main/ui/src/main/java/org/cryptomator/ui/model/DokanyVolume.java index b9200a981..4efab0f07 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/DokanyVolume.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/DokanyVolume.java @@ -44,11 +44,11 @@ public class DokanyVolume implements Volume { } @Override - public void mount(CryptoFileSystem fs) throws VolumeException, IOException { + public void mount(CryptoFileSystem fs, String mountFlags) throws VolumeException, IOException { Path mountPath = getMountPoint(); String mountName = vaultSettings.mountName().get(); try { - this.mount = mountFactory.mount(fs.getPath("/"), mountPath, mountName, FS_TYPE_NAME); + this.mount = mountFactory.mount(fs.getPath("/"), mountPath, mountName, FS_TYPE_NAME, mountFlags.strip()); } catch (MountFailedException e) { if (vaultSettings.getIndividualMountPath().isPresent()) { LOG.warn("Failed to mount vault into {}. Is this directory currently accessed by another process (e.g. Windows Explorer)?", mountPath); @@ -64,11 +64,11 @@ public class DokanyVolume implements Volume { checkProvidedMountPoint(customMountPoint); return customMountPoint; } else if (!Strings.isNullOrEmpty(vaultSettings.winDriveLetter().get())) { - return Paths.get(vaultSettings.winDriveLetter().get().charAt(0) + ":\\"); + return Path.of(vaultSettings.winDriveLetter().get().charAt(0) + ":\\"); } else { //auto assign drive letter if (!windowsDriveLetters.getAvailableDriveLetters().isEmpty()) { - return Paths.get(windowsDriveLetters.getAvailableDriveLetters().iterator().next() + ":\\"); + return windowsDriveLetters.getAvailableDriveLetters().iterator().next(); } else { throw new VolumeException("No free drive letter available."); } diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/FuseVolume.java b/main/ui/src/main/java/org/cryptomator/ui/model/FuseVolume.java index fcd69493d..b740dfcbd 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/FuseVolume.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/FuseVolume.java @@ -1,5 +1,6 @@ package org.cryptomator.ui.model; +import com.google.common.base.Splitter; import org.apache.commons.lang3.SystemUtils; import org.cryptomator.common.Environment; import org.cryptomator.common.settings.VaultSettings; @@ -9,6 +10,7 @@ import org.cryptomator.frontend.fuse.mount.EnvironmentVariables; import org.cryptomator.frontend.fuse.mount.FuseMountFactory; import org.cryptomator.frontend.fuse.mount.FuseNotSupportedException; import org.cryptomator.frontend.fuse.mount.Mount; +import org.cryptomator.frontend.fuse.mount.Mounter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,7 +44,7 @@ public class FuseVolume implements Volume { } @Override - public void mount(CryptoFileSystem fs) throws IOException, FuseNotSupportedException, VolumeException { + public void mount(CryptoFileSystem fs, String mountFlags) throws IOException, FuseNotSupportedException, VolumeException { Optional optionalCustomMountPoint = vaultSettings.getIndividualMountPath(); if (optionalCustomMountPoint.isPresent()) { Path customMountPoint = Paths.get(optionalCustomMountPoint.get()); @@ -53,7 +55,7 @@ public class FuseVolume implements Volume { this.mountPoint = prepareTemporaryMountPoint(); LOG.debug("Successfully created mount point: {}", mountPoint); } - mount(fs.getPath("/")); + mount(fs.getPath("/"), mountFlags); } private void checkProvidedMountPoint(Path mountPoint) throws IOException { @@ -94,18 +96,23 @@ public class FuseVolume implements Volume { throw new VolumeException("Did not find feasible mount point."); } - private void mount(Path root) throws VolumeException { + private void mount(Path root, String mountFlags) throws VolumeException { try { + Mounter mounter = FuseMountFactory.getMounter(); EnvironmentVariables envVars = EnvironmentVariables.create() // - .withMountName(vaultSettings.mountName().getValue()) // - .withMountPath(mountPoint) // + .withFlags(splitFlags(mountFlags)) + .withMountPoint(mountPoint) // .build(); - this.fuseMnt = FuseMountFactory.getMounter().mount(root, envVars); + this.fuseMnt = mounter.mount(root, envVars); } catch (CommandFailedException e) { throw new VolumeException("Unable to mount Filesystem", e); } } + private String[] splitFlags(String str) { + return Splitter.on(' ').splitToList(str).toArray(String[]::new); + } + @Override public void reveal() throws VolumeException { try { diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/PerVault.java b/main/ui/src/main/java/org/cryptomator/ui/model/PerVault.java new file mode 100644 index 000000000..3172beec0 --- /dev/null +++ b/main/ui/src/main/java/org/cryptomator/ui/model/PerVault.java @@ -0,0 +1,13 @@ +package org.cryptomator.ui.model; + +import javax.inject.Scope; +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Scope +@Documented +@Retention(RetentionPolicy.RUNTIME) +@interface PerVault { + +} diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java b/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java index bd48150fc..42f5d0748 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java @@ -25,7 +25,6 @@ import org.cryptomator.cryptofs.CryptoFileSystemProperties.FileSystemFlags; import org.cryptomator.cryptofs.CryptoFileSystemProvider; import org.cryptomator.cryptolib.api.CryptoException; import org.cryptomator.cryptolib.api.InvalidPassphraseException; -import org.cryptomator.ui.model.VaultModule.PerVault; import org.fxmisc.easybind.EasyBind; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,6 +43,7 @@ import java.util.List; import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Predicate; +import java.util.function.Supplier; @PerVault public class Vault { @@ -54,6 +54,7 @@ public class Vault { private final VaultSettings vaultSettings; private final Provider volumeProvider; + private final Supplier defaultMountFlags; private final AtomicReference cryptoFileSystem = new AtomicReference<>(); private final ObjectProperty state = new SimpleObjectProperty(State.LOCKED); @@ -64,9 +65,10 @@ public class Vault { } @Inject - Vault(VaultSettings vaultSettings, Provider volumeProvider) { + Vault(VaultSettings vaultSettings, Provider volumeProvider, @DefaultMountFlags Supplier defaultMountFlags) { this.vaultSettings = vaultSettings; this.volumeProvider = volumeProvider; + this.defaultMountFlags = defaultMountFlags; } // ****************************************************************************** @@ -110,7 +112,7 @@ public class Vault { } CryptoFileSystem fs = getCryptoFileSystem(passphrase); volume = volumeProvider.get(); - volume.mount(fs); + volume.mount(fs, getMountFlags()); Platform.runLater(() -> { state.set(State.UNLOCKED); }); @@ -241,10 +243,6 @@ public class Vault { } } - public String getMountName() { - return vaultSettings.mountName().get(); - } - public String getCustomMountPath() { return vaultSettings.individualMountPath().getValueSafe(); } @@ -253,6 +251,10 @@ public class Vault { vaultSettings.individualMountPath().set(mountPath); } + public String getMountName() { + return vaultSettings.mountName().get(); + } + public void setMountName(String mountName) throws IllegalArgumentException { if (StringUtils.isBlank(mountName)) { throw new IllegalArgumentException("mount name is empty"); @@ -261,6 +263,23 @@ public class Vault { } } + public boolean isHavingCustomMountFlags() { + return !Strings.isNullOrEmpty(vaultSettings.mountFlags().get()); + } + + public String getMountFlags() { + String mountFlags = vaultSettings.mountFlags().get(); + if (Strings.isNullOrEmpty(mountFlags)) { + return defaultMountFlags.get(); + } else { + return mountFlags; + } + } + + public void setMountFlags(String mountFlags) { + vaultSettings.mountFlags().set(mountFlags); + } + public Character getWinDriveLetter() { if (vaultSettings.winDriveLetter().get() == null) { return null; @@ -269,10 +288,11 @@ public class Vault { } } - public void setWinDriveLetter(Character winDriveLetter) { - if (winDriveLetter == null) { + public void setWinDriveLetter(Path root) { + if (root == null) { vaultSettings.winDriveLetter().set(null); } else { + char winDriveLetter = root.toString().charAt(0); vaultSettings.winDriveLetter().set(String.valueOf(winDriveLetter)); } } diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/VaultComponent.java b/main/ui/src/main/java/org/cryptomator/ui/model/VaultComponent.java index 6fafed661..bca3dab63 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/VaultComponent.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/VaultComponent.java @@ -7,7 +7,6 @@ package org.cryptomator.ui.model; import dagger.BindsInstance; import org.cryptomator.common.settings.VaultSettings; -import org.cryptomator.ui.model.VaultModule.PerVault; import dagger.Subcomponent; diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/VaultModule.java b/main/ui/src/main/java/org/cryptomator/ui/model/VaultModule.java index 100137f6f..fdab20bec 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/VaultModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/VaultModule.java @@ -7,28 +7,24 @@ package org.cryptomator.ui.model; import dagger.Module; import dagger.Provides; +import org.apache.commons.lang3.SystemUtils; import org.cryptomator.common.settings.Settings; +import org.cryptomator.common.settings.VaultSettings; import org.cryptomator.common.settings.VolumeImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.inject.Scope; -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.function.Supplier; @Module public class VaultModule { private static final Logger LOG = LoggerFactory.getLogger(VaultModule.class); - @Scope - @Documented - @Retention(RetentionPolicy.RUNTIME) - @interface PerVault { - - } - @Provides public Volume provideVolume(Settings settings, WebDavVolume webDavVolume, FuseVolume fuseVolume, DokanyVolume dokanyVolume) { VolumeImpl preferredImpl = settings.preferredVolumeImpl().get(); @@ -45,4 +41,93 @@ public class VaultModule { } } + @Provides + @PerVault + @DefaultMountFlags + public Supplier provideDefaultMountFlags(Settings settings, VaultSettings vaultSettings) { + return () -> { + VolumeImpl preferredImpl = settings.preferredVolumeImpl().get(); + switch (preferredImpl) { + case FUSE: + if (SystemUtils.IS_OS_MAC_OSX) { + return getMacFuseDefaultMountFlags(settings, vaultSettings); + } else if (SystemUtils.IS_OS_LINUX) { + return getLinuxFuseDefaultMountFlags(settings, vaultSettings); + } + case DOKANY: + return getDokanyDefaultMountFlags(settings, vaultSettings); + default: + return "--flags-supported-on-FUSE-or-DOKANY-only"; + } + }; + } + + // see: https://github.com/osxfuse/osxfuse/wiki/Mount-options + private String getMacFuseDefaultMountFlags(Settings settings, VaultSettings vaultSettings) { + assert SystemUtils.IS_OS_MAC_OSX; + + StringBuilder flags = new StringBuilder(); + if (vaultSettings.usesReadOnlyMode().get()) { + flags.append(" -ordonly"); + } + flags.append(" -ovolname=").append(vaultSettings.mountName().get()); + flags.append(" -oatomic_o_trunc"); + flags.append(" -oauto_xattr"); + flags.append(" -oauto_cache"); + flags.append(" -omodules=iconv,from_code=UTF-8,to_code=UTF-8-MAC"); // show files names in Unicode NFD encoding + flags.append(" -onoappledouble"); // vastly impacts performance for some reason... + flags.append(" -odefault_permissions"); // let the kernel assume permissions based on file attributes etc + + try { + Path userHome = Paths.get(System.getProperty("user.home")); + int uid = (int) Files.getAttribute(userHome, "unix:uid"); + int gid = (int) Files.getAttribute(userHome, "unix:gid"); + flags.append(" -ouid=").append(uid); + flags.append(" -ogid=").append(gid); + } catch (IOException e) { + LOG.error("Could not read uid/gid from USER_HOME", e); + } + + return flags.toString().strip(); + } + + // see https://manpages.debian.org/testing/fuse/mount.fuse.8.en.html + private String getLinuxFuseDefaultMountFlags(Settings settings, VaultSettings vaultSettings) { + assert SystemUtils.IS_OS_LINUX; + + StringBuilder flags = new StringBuilder(); + if (vaultSettings.usesReadOnlyMode().get()) { + flags.append(" -oro"); + } + flags.append(" -oauto_unmount"); + + try { + Path userHome = Paths.get(System.getProperty("user.home")); + int uid = (int) Files.getAttribute(userHome, "unix:uid"); + int gid = (int) Files.getAttribute(userHome, "unix:gid"); + flags.append(" -ouid=").append(uid); + flags.append(" -ogid=").append(gid); + } catch (IOException e) { + LOG.error("Could not read uid/gid from USER_HOME", e); + } + + return flags.toString().strip(); + } + + // see https://github.com/cryptomator/dokany-nio-adapter/blob/develop/src/main/java/org/cryptomator/frontend/dokany/MountUtil.java#L30-L34 + private String getDokanyDefaultMountFlags(Settings settings, VaultSettings vaultSettings) { + assert SystemUtils.IS_OS_WINDOWS; + + StringBuilder flags = new StringBuilder(); + flags.append(" --options CURRENT_SESSION"); + if (vaultSettings.usesReadOnlyMode().get()) { + flags.append(",WRITE_PROTECTION"); + } + flags.append(" --thread-count 5"); + flags.append(" --timeout 10000"); + flags.append(" --allocation-unit-size 4096"); + flags.append(" --sector-size 4096"); + return flags.toString().strip(); + } + } diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/Volume.java b/main/ui/src/main/java/org/cryptomator/ui/model/Volume.java index 73f8d666b..dc1aae0cd 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/Volume.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/Volume.java @@ -22,7 +22,7 @@ public interface Volume { * @param fs * @throws IOException */ - void mount(CryptoFileSystem fs) throws IOException, VolumeException; + void mount(CryptoFileSystem fs, String mountFlags) throws IOException, VolumeException; void reveal() throws VolumeException; diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/WebDavVolume.java b/main/ui/src/main/java/org/cryptomator/ui/model/WebDavVolume.java index 2161e388d..118e3a368 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/WebDavVolume.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/WebDavVolume.java @@ -11,7 +11,6 @@ import org.cryptomator.frontend.webdav.servlet.WebDavServletController; import javax.inject.Inject; import javax.inject.Provider; - import java.net.InetAddress; import java.net.UnknownHostException; @@ -35,7 +34,7 @@ public class WebDavVolume implements Volume { } @Override - public void mount(CryptoFileSystem fs) throws VolumeException { + public void mount(CryptoFileSystem fs, String mountFlags) throws VolumeException { if (server == null) { server = serverProvider.get(); } diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/WindowsDriveLetters.java b/main/ui/src/main/java/org/cryptomator/ui/model/WindowsDriveLetters.java index 05efef31d..6b8bdef9b 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/WindowsDriveLetters.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/WindowsDriveLetters.java @@ -5,9 +5,10 @@ *******************************************************************************/ package org.cryptomator.ui.model; -import org.apache.commons.lang3.CharUtils; import org.apache.commons.lang3.SystemUtils; import org.cryptomator.common.FxApplicationScoped; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.inject.Inject; import java.nio.file.FileSystems; @@ -21,11 +22,12 @@ import java.util.stream.StreamSupport; @FxApplicationScoped public final class WindowsDriveLetters { - private static final Set D_TO_Z; + private static final Logger LOG = LoggerFactory.getLogger(WindowsDriveLetters.class); + private static final Set D_TO_Z; static { try (IntStream stream = IntStream.rangeClosed('D', 'Z')) { - D_TO_Z = stream.mapToObj(i -> (char) i).collect(Collectors.toSet()); + D_TO_Z = stream.mapToObj(i -> Path.of(((char) i)+":\\")).collect(Collectors.toSet()); } } @@ -33,17 +35,19 @@ public final class WindowsDriveLetters { public WindowsDriveLetters() { } - public Set getOccupiedDriveLetters() { + public Set getOccupiedDriveLetters() { if (!SystemUtils.IS_OS_WINDOWS) { - throw new UnsupportedOperationException("This method is only defined for Windows file systems"); + LOG.warn("Attempted to get occupied drive letters on non-Windows machine."); + return Set.of(); + } else { + Iterable rootDirs = FileSystems.getDefault().getRootDirectories(); + return StreamSupport.stream(rootDirs.spliterator(), false).collect(Collectors.toSet()); } - Iterable rootDirs = FileSystems.getDefault().getRootDirectories(); - return StreamSupport.stream(rootDirs.spliterator(), false).map(Path::toString).map(CharUtils::toChar).map(Character::toUpperCase).collect(Collectors.toSet()); } - public Set getAvailableDriveLetters() { - Set occupiedDriveLetters = getOccupiedDriveLetters(); - Predicate isOccupiedDriveLetter = occupiedDriveLetters::contains; + public Set getAvailableDriveLetters() { + Set occupiedDriveLetters = getOccupiedDriveLetters(); + Predicate isOccupiedDriveLetter = occupiedDriveLetters::contains; return D_TO_Z.stream().filter(isOccupiedDriveLetter.negate()).collect(Collectors.toSet()); } diff --git a/main/ui/src/main/resources/fxml/unlock.fxml b/main/ui/src/main/resources/fxml/unlock.fxml index 585b60b50..28108966f 100644 --- a/main/ui/src/main/resources/fxml/unlock.fxml +++ b/main/ui/src/main/resources/fxml/unlock.fxml @@ -17,102 +17,87 @@ - + + - + + - + - - - - + + + - - -