diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 734c0f7..6d631eb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -75,31 +75,49 @@ jobs: python3-pip python3-pytest xvfb imagemagick desktop-file-utils - name: Build the package run: python3 deb/build_deb.py - - name: Install it with apt - run: sudo apt-get install -y ./build/passman_*_all.deb - - name: Check what was installed + - name: Install the last passman package (from before the rename) + env: + GH_TOKEN: ${{ github.token }} run: | + gh release download v0.9.0 -R "$GITHUB_REPOSITORY" -p 'passman_*_all.deb' -D old + sudo apt-get install -y ./old/passman_0.9.0_all.deb dpkg -s passman - dpkg -L passman - test -f /usr/lib/passman/installed - test -x /usr/bin/passman - desktop-file-validate /usr/share/applications/passman.desktop - ls /usr/lib/passman/sourceFiles/__pycache__ # compiled by postinst + mkdir -p ~/.local/share/passman/vault + echo kept > ~/.local/share/passman/vault/alice.vault.enc + - name: Install it with apt - an upgrade that replaces passman + run: sudo apt-get install -y ./build/secretspace_*_all.deb + - name: The passman package is gone, its user's vaults are not + run: | + if dpkg-query -W -f='${Status}' passman 2>/dev/null | grep -q "install ok installed"; then + echo "passman is still installed"; exit 1; fi + test ! -e /usr/lib/passman + test ! -e /usr/bin/passman + grep -qx kept ~/.local/share/passman/vault/alice.vault.enc + /usr/bin/python3 -I -c "import sys; sys.path.insert(0, '/usr/lib/secretspace/sourceFiles'); sys.path.insert(0, '/usr/lib/secretspace/lib'); import vault, os; h = vault.get_home_dir(); print(h); assert h == os.path.expanduser('~/.local/share/passman'), h" + rm -r ~/.local/share/passman # the steps below check a fresh install + - name: Check what was installed + run: | + dpkg -s secretspace + dpkg -L secretspace + test -f /usr/lib/secretspace/installed + test -x /usr/bin/secretspace + desktop-file-validate /usr/share/applications/secretspace.desktop + ls /usr/lib/secretspace/sourceFiles/__pycache__ # compiled by postinst - name: The tests, on the system's Python, Tk, cryptography and Pillow - run: PYTHONPATH=/usr/lib/passman/lib xvfb-run -a /usr/bin/python3 -m pytest -q + run: PYTHONPATH=/usr/lib/secretspace/lib xvfb-run -a /usr/bin/python3 -m pytest -q - name: Run the installed app run: xvfb-run -a -s "-screen 0 1280x800x24" /usr/bin/python3 -I tools/smoke_gui.py smoke-out --installed - name: Start it the way the menu does run: | set +e - timeout 15 xvfb-run -a passman + timeout 15 xvfb-run -a secretspace code=$? - [ "$code" -eq 124 ] || { echo "passman exited after less than 15 s (code $code)"; exit 1; } + [ "$code" -eq 124 ] || { echo "secretspace exited after less than 15 s (code $code)"; exit 1; } - name: Remove it run: | - sudo apt-get remove -y passman - if [ -e /usr/lib/passman ]; then find /usr/lib/passman; exit 1; fi - test ! -e /usr/bin/passman + sudo apt-get remove -y secretspace + if [ -e /usr/lib/secretspace ]; then find /usr/lib/secretspace; exit 1; fi + test ! -e /usr/bin/secretspace - name: Keep the screenshots if: always() uses: actions/upload-artifact@v4 @@ -110,5 +128,5 @@ jobs: if: matrix.os == 'ubuntu-24.04' uses: actions/upload-artifact@v4 with: - name: passman-deb + name: secretspace-deb path: build/*.deb diff --git a/LICENSE b/LICENSE index 30d4b35..f288702 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,674 @@ -MIT License - -Copyright (c) 2026 usermaneGermane - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. + 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 +. diff --git a/README.md b/README.md index 1928c6d..4428652 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,33 @@ -# PassMan for Linux +# SecretSpace for Linux A local desktop password manager. Your vault is a single AES-256-GCM -encrypted file. There is no account and no service behind it: it works +encrypted file. There is no online account and no service behind it: it works entirely offline, and if you want two PCs in step you run the sync server yourself, on your own hardware. -**Version 0.9.0 — early.** It installs from a `.deb` on Ubuntu 22.04 or +**Formerly PassMan.** The project was renamed to SecretSpace in November +2026, because another password manager already uses the name PassMan. +Releases up to 0.9.0 are the `passman` package (command +`passman`, data in `~/.local/share/passman`). Installing the `secretspace` +package replaces it in one step (`Conflicts`/`Replaces: passman`), and your +vaults stay in `~/.local/share/passman`, which SecretSpace keeps using — +nothing is moved or renamed. The vault files are the same. + +**Version 0.10.0 — early.** It installs from a `.deb` on Ubuntu 22.04 or newer, or runs from source. It has so far been tested in CI only, on a virtual display, not yet on a real desktop. -![PassMan](sourceFiles/PassMan-logo.png) +![SecretSpace](sourceFiles/SecretSpace-logo.png) | Repository | What it holds | |---|---| -| [PassMan-Client-Windows](https://github.com/usermaneGermane/PassMan-Client-Windows) | the app for Windows | -| **PassMan-Client-Linux** (this one) | the app for Linux | -| [PassMan-Server-Windows](https://github.com/usermaneGermane/PassMan-Server-Windows) | the sync server for Windows, with an installer | -| [PassMan-Server-Linux](https://github.com/usermaneGermane/PassMan-Server-Linux) | the sync server for Linux, run by systemd | +| [SecretSpace-Client-Windows](https://github.com/usermaneGermane/SecretSpace-Client-Windows) | the app for Windows | +| **SecretSpace-Client-Linux** (this one) | the app for Linux | +| [SecretSpace-Server-Windows](https://github.com/usermaneGermane/SecretSpace-Server-Windows) | the sync server for Windows, with an installer | +| [SecretSpace-Server-Linux](https://github.com/usermaneGermane/SecretSpace-Server-Linux) | the sync server for Linux, run by systemd | **Same vaults as on Windows.** The vault file, the sync protocol and the -features match PassMan for Windows 2.11.0, including its black-and-green +features match SecretSpace for Windows 2.11.0, including its black-and-green window and dialogs, 2FA codes and sync on unlock (see the version table under *What is different from Windows*). A vault moves between a Windows PC and a Linux PC unchanged, and both sync @@ -27,36 +35,36 @@ with either server. ## Installing it -The package is `passman__all.deb`. Download it from -[Releases](https://github.com/usermaneGermane/PassMan-Client-Linux/releases) +The package is `secretspace__all.deb`. Download it from +[Releases](https://github.com/usermaneGermane/SecretSpace-Client-Linux/releases) (checksums in `SHA256SUMS.txt`), take the newest build from the -`passman-deb` artifact of the latest CI run on `main` -(`gh run download -R usermaneGermane/PassMan-Client-Linux -n passman-deb`), +`secretspace-deb` artifact of the latest CI run on `main` +(`gh run download -R usermaneGermane/SecretSpace-Client-Linux -n secretspace-deb`), or build it yourself on Ubuntu or Debian: ```bash sudo apt install git python3-pip -git clone https://github.com/usermaneGermane/PassMan-Client-Linux.git -cd PassMan-Client-Linux -python3 deb/build_deb.py # writes build/passman__all.deb +git clone https://github.com/usermaneGermane/SecretSpace-Client-Linux.git +cd SecretSpace-Client-Linux +python3 deb/build_deb.py # writes build/secretspace__all.deb ``` Then install it — apt pulls in Tk, cryptography, Argon2 (`python3-argon2`, in the *universe* section, on by default on Ubuntu desktops) and Pillow from Ubuntu: ```bash -sudo apt install ./build/passman_*_all.deb +sudo apt install ./build/secretspace_*_all.deb ``` -PassMan is then in the application menu, and `passman` starts it from a -terminal. `sudo apt remove passman` removes the program and leaves your +SecretSpace is then in the application menu, and `secretspace` starts it from a +terminal. `sudo apt remove secretspace` removes the program and leaves your vaults alone. | Installed file | What it is | | --- | --- | -| `/usr/bin/passman` | starts the app | -| `/usr/lib/passman/` | the program and the libraries it bundles (customtkinter, darkdetect, packaging — pinned by hash in `deb/vendor.txt`) | -| `/usr/share/applications/passman.desktop` | the menu entry | +| `/usr/bin/secretspace` | starts the app | +| `/usr/lib/secretspace/` | the program and the libraries it bundles (customtkinter, darkdetect, packaging — pinned by hash in `deb/vendor.txt`) | +| `/usr/share/applications/secretspace.desktop` | the menu entry | ## Running from source @@ -65,8 +73,8 @@ same way): ```bash sudo apt install python3-tk python3-venv git -git clone https://github.com/usermaneGermane/PassMan-Client-Linux.git ~/PassMan-Client-Linux -cd ~/PassMan-Client-Linux +git clone https://github.com/usermaneGermane/SecretSpace-Client-Linux.git ~/SecretSpace-Client-Linux +cd ~/SecretSpace-Client-Linux python3 -m venv .venv .venv/bin/pip install -r requirements.txt .venv/bin/python sourceFiles/gui.py @@ -78,12 +86,13 @@ After that, starting it is the last line, from that folder. Run from a checkout, as above, the files are in the checkout itself, next to `sourceFiles/` — the same rule as a portable copy on Windows. The -package keeps them in **`~/.local/share/passman`** -(or `$XDG_DATA_HOME/passman`) instead, so that upgrading or removing it never -touches them. `PASSMAN_DATA_DIR` points the app at any other vault folder. +package keeps them in **`~/.local/share/secretspace`** +(or `$XDG_DATA_HOME/secretspace`) instead, so that upgrading or removing it never +touches them — or in `~/.local/share/passman`, if that folder was there +first, from the `passman` package before the rename. `PASSMAN_DATA_DIR` points the app at any other vault folder. **Lab and production.** The package is the production copy. A checkout is a -handy lab copy beside it: it never touches `~/.local/share/passman`, and its +handy lab copy beside it: it never touches `~/.local/share/secretspace`, and its window title says `[LAB - ]` (the package's never does). If both sync to the same server, give lab vaults names your real vaults do not use — the server keeps one vault per username, so a lab vault with a @@ -97,19 +106,19 @@ real vault's name would sync into it. | `config.json` | non-secret preferences (last username, auto-lock delay, sort order) | The vault files are readable by your user only (`600`), and so is the -`vault` folder (`700`) when PassMan creates it. A plaintext CSV export is +`vault` folder (`700`) when SecretSpace creates it. A plaintext CSV export is created `600` too — it holds every password in the clear, so delete it once it has done its job. -**Moving a vault from Windows:** copy `%APPDATA%\PassMan\vault\.vault.enc` +**Moving a vault from Windows:** copy `%APPDATA%\SecretSpace\vault\.vault.enc` into the `vault` folder here, or use *Restore from server* on the login screen if you sync. ## What is different from Windows -- **Clipboard.** PassMan uses Tk's own clipboard, so nothing like `xclip` +- **Clipboard.** SecretSpace uses Tk's own clipboard, so nothing like `xclip` needs installing. It works on X11 and, through XWayland, on Wayland. On - X11 what PassMan copied disappears when PassMan closes. As on Windows, + X11 what SecretSpace copied disappears when SecretSpace closes. As on Windows, locking leaves a copied password pasteable, closing clears it at once, and copied passwords are cleared after 30 seconds — but a clipboard manager (GNOME or KDE clipboard history, CopyQ, …) may keep its own copy, which @@ -120,12 +129,12 @@ screen if you sync. installer does: a menu entry, data in your home folder, removal that keeps the vaults. Unlike the Windows installer it does not offer to move a vault from a copy run from source — copy the `vault` folder into - `~/.local/share/passman` yourself. + `~/.local/share/secretspace` yourself. Everything else — syncing (and sync on unlock), the archive, revision history, 2FA codes, importing from other password managers, and the security notes and limits — works and -reads exactly as in [PassMan for Windows's -README](https://github.com/usermaneGermane/PassMan-Client-Windows#syncing-two-pcs). +reads exactly as in [SecretSpace for Windows's +README](https://github.com/usermaneGermane/SecretSpace-Client-Windows#syncing-two-pcs). Where that README names a Windows version, read the Linux one beside it: | Windows | Linux | What arrived | @@ -139,6 +148,7 @@ Where that README names a Windows version, read the Linux one beside it: | 2.9.0 | 0.7.0 | the dialogs redesigned to match | | 2.10.0 | 0.8.0 | 2FA codes, behind the master password | | 2.11.0 | 0.9.0 | sync on unlock, a setting that is off by default | +| 2.12.0 | 0.10.0 | renamed to SecretSpace (package `secretspace`, replaces `passman`) | (0.2.0 added the `.deb` package, which has no Windows counterpart.) @@ -152,8 +162,8 @@ your master password. ## Project layout ``` -PassMan-Client-Linux/ -├── sourceFiles/ the program — ported from PassMan-Client-Windows +SecretSpace-Client-Linux/ +├── sourceFiles/ the program — ported from SecretSpace-Client-Windows │ ├── gui.py app shell: login, account list, lifecycle │ ├── clipboard.py the clipboard, through Tk (Linux only) │ ├── ... the same modules as on Windows @@ -161,7 +171,7 @@ PassMan-Client-Linux/ │ └── sync_server/ a copy of the server, for the end-to-end sync tests ├── deb/ │ ├── build_deb.py builds the .deb -│ ├── passman.py the launcher installed in /usr/lib/passman +│ ├── secretspace.py the launcher installed in /usr/lib/secretspace │ └── vendor.txt the libraries bundled into the package, pinned by hash └── tools/smoke_gui.py starts the real app on a display and takes screenshots ``` @@ -187,12 +197,12 @@ the login and main windows as the run's artifact. The `deb` job, on Ubuntu 22.04 and 24.04, builds the package, installs it with apt, runs the tests on the system's own Python, Tk, cryptography and Pillow, runs the smoke test against the installed copy -(`tools/smoke_gui.py --installed`), starts `passman` as the menu would, and +(`tools/smoke_gui.py --installed`), starts `secretspace` as the menu would, and removes the package again. The 24.04 run keeps the `.deb` as the -`passman-deb` artifact. +`secretspace-deb` artifact. **Staying in step with Windows.** The modules here began as copies of -PassMan-Client-Windows's `sourceFiles/`; only `vault.py` (where data lives, +SecretSpace-Client-Windows's `sourceFiles/`; only `vault.py` (where data lives, file modes), `gui.py` (clipboard, window icon), `theme.py` (fonts), `version.py`, `password_generator.py` and the new `clipboard.py` differ. A fix to the shared logic — the vault, sync, importers — belongs in both @@ -200,4 +210,12 @@ repositories. ## License -MIT — see [LICENSE](LICENSE). +SecretSpace for Linux is free software under the **GNU General Public License +v3.0 only** (GPL-3.0-only) — see [LICENSE](LICENSE). You may use, study, +change and share it; if you distribute a changed version, it must stay under +the same licence, with its source. + +The other SecretSpace repositories (the Windows and Linux clients and sync servers) +are free software under the same licence. + +Security issues: please report them privately, see [SECURITY.md](SECURITY.md). diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 0000000..0b3d2ec --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,26 @@ +# Security policy + +SecretSpace keeps passwords, so security reports are welcome and taken seriously. + +## Reporting a vulnerability + +Please **do not open a public issue**. Report it privately through GitHub: +the repository's **Security** tab -> **Report a vulnerability**. + +Include what you found, the version (Settings -> About, or `dpkg -s secretspace`), and the steps to +reproduce it. You will get an answer within a week. Please give a reasonable +time for a fix before you publish anything. + +## Supported versions + +| Version | Supported | +|---|---| +| Latest release | Yes | +| Pre-releases (alpha) | Best effort; they are test versions | +| Older releases | No; please update first | + +## Scope + +The client in this repository: vault encryption, the master password, +Secret Key and recovery phrase handling, the clipboard, the .deb package and +the sync client. Server issues go to SecretSpace-Server-Linux, the same way. diff --git a/deb/build_deb.py b/deb/build_deb.py index 7590e76..460824f 100644 --- a/deb/build_deb.py +++ b/deb/build_deb.py @@ -1,11 +1,11 @@ """ -Build the PassMan .deb on Debian or Ubuntu: +Build the SecretSpace .deb on Debian or Ubuntu: python3 deb/build_deb.py -writes build/passman__all.deb. Install it with +writes build/secretspace__all.deb. Install it with - sudo apt install ./build/passman__all.deb + sudo apt install ./build/secretspace__all.deb Needs dpkg-deb (every Debian and Ubuntu has it) and pip, which fetches the libraries listed in deb/vendor.txt. Nothing is installed on the build @@ -13,14 +13,14 @@ What the package holds: - /usr/bin/passman starts the app (python3 -I) - /usr/lib/passman/passman.py the launcher behind it - /usr/lib/passman/sourceFiles/ the program, without its tests - /usr/lib/passman/lib/ customtkinter, darkdetect, packaging - /usr/lib/passman/installed the marker: data lives in - ~/.local/share/passman, not here - /usr/share/applications/passman.desktop - /usr/share/icons/hicolor/512x512/apps/passman.png + /usr/bin/secretspace starts the app (python3 -I) + /usr/lib/secretspace/secretspace.py the launcher behind it + /usr/lib/secretspace/sourceFiles/ the program, without its tests + /usr/lib/secretspace/lib/ customtkinter, darkdetect, packaging + /usr/lib/secretspace/installed the marker: data lives in + ~/.local/share/secretspace, not here + /usr/share/applications/secretspace.desktop + /usr/share/icons/hicolor/512x512/apps/secretspace.png cryptography, Pillow and Tk come from Ubuntu (DEPENDS), so the package is Architecture: all and keeps working when the system's python3 is upgraded. @@ -41,10 +41,12 @@ SOURCE_DIR = os.path.join(ROOT, "sourceFiles") VENDOR_FILE = os.path.join(HERE, "vendor.txt") -PACKAGE = "passman" -APP_DIR = "/usr/lib/passman" +PACKAGE = "secretspace" +#: The package name before the rename (0.9.0 and 1.0.0~alpha.1). +OLD_PACKAGE = "passman" +APP_DIR = "/usr/lib/secretspace" MAINTAINER = "usermaneGermane " -HOMEPAGE = "https://github.com/usermaneGermane/PassMan-Client-Linux" +HOMEPAGE = "https://github.com/usermaneGermane/SecretSpace-Client-Linux" #: Ubuntu 22.04 ships Python 3.10, the oldest the app supports. #: python3-pil.imagetk is separate from python3-pil on Debian and @@ -67,20 +69,20 @@ LAUNCHER = f"""#!/bin/sh # -I: the user's PYTHONPATH and ~/.local packages must not replace the # libraries in {APP_DIR}/lib. -exec /usr/bin/python3 -I {APP_DIR}/passman.py "$@" +exec /usr/bin/python3 -I {APP_DIR}/secretspace.py "$@" """ DESKTOP_ENTRY = """[Desktop Entry] Type=Application -Name=PassMan +Name=SecretSpace GenericName=Password Manager Comment=A local, encrypted password manager -Exec=passman -Icon=passman +Exec=secretspace +Icon=secretspace Terminal=false Categories=Utility; Keywords=password;vault;login; -StartupWMClass=passman +StartupWMClass=secretspace """ # The program folder is not writable by the user, so the app cannot leave @@ -102,8 +104,8 @@ """ MARKER_TEXT = """\ -Installed by the passman package. Because this file exists, PassMan keeps -its vaults and settings in ~/.local/share/passman (or $XDG_DATA_HOME/passman) +Installed by the secretspace package. Because this file exists, SecretSpace keeps +its vaults and settings in ~/.local/share/secretspace (or $XDG_DATA_HOME/secretspace) and never in this folder. Removing the package leaves them in place. """ @@ -136,14 +138,20 @@ def control(version, installed_size_kb): f"Maintainer: {MAINTAINER}\n" f"Installed-Size: {installed_size_kb}\n" f"Depends: {', '.join(DEPENDS)}\n" + # The package was called passman before the rename to SecretSpace. + # Installing this one removes that one in the same step; the vaults + # in the user's home are not part of either package and stay put. + f"Conflicts: {OLD_PACKAGE}\n" + f"Replaces: {OLD_PACKAGE}\n" + f"Provides: {OLD_PACKAGE}\n" "Section: utils\n" "Priority: optional\n" f"Homepage: {HOMEPAGE}\n" "Description: local, encrypted password manager\n" - " PassMan keeps your logins in a single AES-256-GCM encrypted vault\n" + " SecretSpace keeps your logins in a single AES-256-GCM encrypted vault\n" " file. It works offline, with no account; two PCs can stay in step\n" " through a sync server you run yourself. Vaults move unchanged\n" - " between PassMan for Windows and for Linux.\n" + " between SecretSpace for Windows and for Linux.\n" ) @@ -151,7 +159,7 @@ def copyright_text(pins): bundled = "\n".join(f" {name} {version}" for name, version in pins) return f"""\ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: PassMan +Upstream-Name: SecretSpace Source: {HOMEPAGE} Files: * @@ -159,7 +167,7 @@ def copyright_text(pins): License: none No licence has been granted yet. -Files: usr/lib/passman/lib/* +Files: usr/lib/secretspace/lib/* Comment: bundled Python libraries; each one's licence is in its *.dist-info folder next to it: {bundled} @@ -207,16 +215,16 @@ def stage(tree, version, wheels, source_dir=SOURCE_DIR, pins=()): shutil.copyfile(path, os.path.join(src_out, name)) unpack_wheels(wheels, os.path.join(app, "lib")) - shutil.copyfile(os.path.join(HERE, "passman.py"), os.path.join(app, "passman.py")) + shutil.copyfile(os.path.join(HERE, "secretspace.py"), os.path.join(app, "secretspace.py")) write(os.path.join(app, "installed"), MARKER_TEXT) - write(os.path.join(tree, "usr", "bin", "passman"), LAUNCHER, 0o755) - write(os.path.join(tree, "usr", "share", "applications", "passman.desktop"), + write(os.path.join(tree, "usr", "bin", "secretspace"), LAUNCHER, 0o755) + write(os.path.join(tree, "usr", "share", "applications", "secretspace.desktop"), DESKTOP_ENTRY) icon = os.path.join(tree, "usr", "share", "icons", "hicolor", "512x512", - "apps", "passman.png") + "apps", "secretspace.png") os.makedirs(os.path.dirname(icon)) - shutil.copyfile(os.path.join(source_dir, "PassMan-logo.png"), icon) + shutil.copyfile(os.path.join(source_dir, "SecretSpace-logo.png"), icon) write(os.path.join(tree, "usr", "share", "doc", PACKAGE, "copyright"), copyright_text(pins)) @@ -226,7 +234,7 @@ def stage(tree, version, wheels, source_dir=SOURCE_DIR, pins=()): os.chmod(dirpath, 0o755) for name in filenames: path = os.path.join(dirpath, name) - os.chmod(path, 0o755 if path.endswith(os.path.join("bin", "passman")) else 0o644) + os.chmod(path, 0o755 if path.endswith(os.path.join("bin", "secretspace")) else 0o644) size = sum(os.path.getsize(os.path.join(d, n)) for d, _, files in os.walk(tree) for n in files) @@ -239,7 +247,7 @@ def stage(tree, version, wheels, source_dir=SOURCE_DIR, pins=()): def main(argv=None): - parser = argparse.ArgumentParser(description="Build the PassMan .deb.") + parser = argparse.ArgumentParser(description="Build the SecretSpace .deb.") parser.add_argument("--out", default=os.path.join(ROOT, "build"), help="folder for the .deb (default: build/)") args = parser.parse_args(argv) diff --git a/deb/passman.py b/deb/secretspace.py similarity index 61% rename from deb/passman.py rename to deb/secretspace.py index cd67864..7d099c1 100644 --- a/deb/passman.py +++ b/deb/secretspace.py @@ -1,6 +1,6 @@ """ -Start an installed PassMan. The package puts this at /usr/lib/passman and -/usr/bin/passman runs it with ``python3 -I``, so nothing from the user's own +Start an installed SecretSpace. The package puts this at /usr/lib/secretspace and +/usr/bin/secretspace runs it with ``python3 -I``, so nothing from the user's own Python setup (PYTHONPATH, ~/.local site-packages) can stand in for the libraries the package ships. """ @@ -15,8 +15,8 @@ # helpers); cryptography and Pillow come from the system's python3. sys.path[:0] = [os.path.join(APP_DIR, "sourceFiles"), os.path.join(APP_DIR, "lib")] -# Tk names the window after argv[0]; "passman" ties it to passman.desktop, -# so the dock shows PassMan's icon. -sys.argv[0] = "passman" +# Tk names the window after argv[0]; "secretspace" ties it to secretspace.desktop, +# so the dock shows SecretSpace's icon. +sys.argv[0] = "secretspace" runpy.run_path(os.path.join(APP_DIR, "sourceFiles", "gui.py"), run_name="__main__") diff --git a/deb/tests/test_build_deb.py b/deb/tests/test_build_deb.py index 69bd942..cfd67da 100644 --- a/deb/tests/test_build_deb.py +++ b/deb/tests/test_build_deb.py @@ -46,43 +46,46 @@ def test_vendored_pins_are_exact(): def test_program_without_its_tests(tree): - src = os.path.join(tree, "usr", "lib", "passman", "sourceFiles") + src = os.path.join(tree, "usr", "lib", "secretspace", "sourceFiles") names = set(os.listdir(src)) - assert {"gui.py", "vault.py", "version.py", "PassMan-logo.png"} <= names + assert {"gui.py", "vault.py", "version.py", "SecretSpace-logo.png"} <= names assert "tests" not in names and "__pycache__" not in names def test_installed_marker_moves_data_to_home(tree): # vault.is_installed() looks for this file next to sourceFiles/. - assert os.path.isfile(os.path.join(tree, "usr", "lib", "passman", "installed")) + assert os.path.isfile(os.path.join(tree, "usr", "lib", "secretspace", "installed")) def test_wheels_unpacked_into_lib(tree): - lib = os.path.join(tree, "usr", "lib", "passman", "lib") + lib = os.path.join(tree, "usr", "lib", "secretspace", "lib") assert os.path.isfile(os.path.join(lib, "fakelib", "__init__.py")) assert os.path.isfile(os.path.join(lib, "fakelib-1.0.dist-info", "LICENSE")) def test_launcher_runs_isolated_python(tree): - text = read(tree, "usr", "bin", "passman") + text = read(tree, "usr", "bin", "secretspace") assert text.startswith("#!/bin/sh\n") - assert 'exec /usr/bin/python3 -I /usr/lib/passman/passman.py "$@"' in text - assert os.path.isfile(os.path.join(tree, "usr", "lib", "passman", "passman.py")) + assert 'exec /usr/bin/python3 -I /usr/lib/secretspace/secretspace.py "$@"' in text + assert os.path.isfile(os.path.join(tree, "usr", "lib", "secretspace", "secretspace.py")) def test_desktop_entry_and_icon(tree): - entry = read(tree, "usr", "share", "applications", "passman.desktop") - assert "Exec=passman\n" in entry and "Icon=passman\n" in entry - assert "StartupWMClass=passman\n" in entry + entry = read(tree, "usr", "share", "applications", "secretspace.desktop") + assert "Exec=secretspace\n" in entry and "Icon=secretspace\n" in entry + assert "StartupWMClass=secretspace\n" in entry assert os.path.isfile(os.path.join(tree, "usr", "share", "icons", "hicolor", - "512x512", "apps", "passman.png")) + "512x512", "apps", "secretspace.png")) def test_control_file(tree): text = read(tree, "DEBIAN", "control") fields = dict(line.split(": ", 1) for line in text.splitlines() if line and not line.startswith(" ")) - assert fields["Package"] == "passman" + assert fields["Package"] == "secretspace" + # Upgrading from the passman package (before the rename) replaces it. + for field in ("Conflicts", "Replaces", "Provides"): + assert fields[field] == "passman" assert fields["Version"] == "9.8.7" assert fields["Architecture"] == "all" assert int(fields["Installed-Size"]) > 0 @@ -93,16 +96,16 @@ def test_control_file(tree): def test_maintainer_scripts_compile_and_clean(tree): - assert "py3compile -p passman /usr/lib/passman" in read(tree, "DEBIAN", "postinst") - assert "py3clean -p passman" in read(tree, "DEBIAN", "prerm") + assert "py3compile -p secretspace /usr/lib/secretspace" in read(tree, "DEBIAN", "postinst") + assert "py3clean -p secretspace" in read(tree, "DEBIAN", "prerm") def test_copyright_lists_bundled_libraries(tree): - assert "fakelib 1.0" in read(tree, "usr", "share", "doc", "passman", "copyright") + assert "fakelib 1.0" in read(tree, "usr", "share", "doc", "secretspace", "copyright") def test_generated_files_use_lf(tree): - for parts in (("usr", "bin", "passman"), ("DEBIAN", "control"), ("DEBIAN", "prerm")): + for parts in (("usr", "bin", "secretspace"), ("DEBIAN", "control"), ("DEBIAN", "prerm")): with open(os.path.join(tree, *parts), "rb") as f: assert b"\r" not in f.read() @@ -112,10 +115,10 @@ def test_file_modes(tree): def mode(*parts): return os.stat(os.path.join(tree, *parts)).st_mode & 0o777 - assert mode("usr", "bin", "passman") == 0o755 + assert mode("usr", "bin", "secretspace") == 0o755 assert mode("DEBIAN", "postinst") == 0o755 - assert mode("usr", "lib", "passman", "sourceFiles", "gui.py") == 0o644 - assert mode("usr", "lib", "passman") == 0o755 + assert mode("usr", "lib", "secretspace", "sourceFiles", "gui.py") == 0o644 + assert mode("usr", "lib", "secretspace") == 0o755 def test_refuses_compiled_wheels(tmp_path, monkeypatch): diff --git a/deb/vendor.txt b/deb/vendor.txt index 22be80a..e6c85c5 100644 --- a/deb/vendor.txt +++ b/deb/vendor.txt @@ -1,4 +1,4 @@ -# Python libraries bundled into the .deb, in /usr/lib/passman/lib. +# Python libraries bundled into the .deb, in /usr/lib/secretspace/lib. # # Only pure-Python wheels go here, so the package stays Architecture: all # and works with whatever python3 the system has. cryptography and Pillow diff --git a/requirements.txt b/requirements.txt index ab1553c..f53d5e4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -# PassMan dependencies. Also needs Tk from the system: sudo apt install python3-tk +# SecretSpace dependencies. Also needs Tk from the system: sudo apt install python3-tk cryptography>=42 # AES-GCM + PBKDF2 vault encryption argon2-cffi>=21.1 # Argon2id for 3.0 accounts (Ubuntu: python3-argon2; or cryptography>=44) customtkinter>=5.2 # modern UI toolkit diff --git a/sourceFiles/PassMan-logo.png b/sourceFiles/SecretSpace-logo.png similarity index 100% rename from sourceFiles/PassMan-logo.png rename to sourceFiles/SecretSpace-logo.png diff --git a/sourceFiles/account_crypto.py b/sourceFiles/account_crypto.py index c073596..a2189a8 100644 --- a/sourceFiles/account_crypto.py +++ b/sourceFiles/account_crypto.py @@ -1,5 +1,5 @@ """ -The cryptography of PassMan 3.0 accounts (design: E:\\CLAUDE\\PassMan\\DESIGN-3.0.md). +The cryptography of SecretSpace 3.0 accounts (design: E:\\CLAUDE\\SecretSpace\\DESIGN-3.0.md). Nothing in the 2.x app calls this yet: phase 1 builds the local account on it. Every function is pure -- bytes and dicts in, bytes and dicts out, no files -- @@ -128,7 +128,7 @@ def _check_cost(passes, memory_kib, lanes): and 8 * lanes <= memory_kib <= ARGON2_MAX_MEMORY_KIB and 1 <= lanes <= ARGON2_MAX_LANES): raise CryptoError("The account file asks for an unreasonable key " - "derivation cost; it is damaged or not PassMan's.") + "derivation cost; it is damaged or not SecretSpace's.") # =========================================================================== @@ -252,13 +252,13 @@ def keyset_header(blob: str) -> dict: the password is stretched, so the stored cost is the one used.""" raw = _unb64(blob, "account file") if len(raw) < _KEYSET_HEADER.size + NONCE_LEN + 16: - raise CryptoError("The account file is too short to be PassMan's.") + raise CryptoError("The account file is too short to be SecretSpace's.") magic, version, kdf, memory_kib, passes, lanes, salt = \ _KEYSET_HEADER.unpack(raw[:_KEYSET_HEADER.size]) if magic != KEYSET_MAGIC: - raise CryptoError("That is not a PassMan 3 account file.") + raise CryptoError("That is not a SecretSpace 3 account file.") if version != KEYSET_VERSION: - raise CryptoError("The account file was written by a newer PassMan; " + raise CryptoError("The account file was written by a newer SecretSpace; " "update this one.") if kdf not in (KDF_ARGON2ID, KDF_NONE): raise CryptoError("The account file uses an unknown key derivation.") @@ -329,7 +329,7 @@ def wrap_key(recipient_public: bytes, vault_key: bytes, vault_id: bytes, def unwrap_key(keyset: dict, wrapped: str, vault_id: bytes, member: str) -> bytes: raw = _unb64(wrapped, "shared vault key") if len(raw) != 1 + 32 + NONCE_LEN + KEY_LEN + 16 or raw[0] != WRAP_VERSION: - raise CryptoError("A shared vault key is damaged or from a newer PassMan.") + raise CryptoError("A shared vault key is damaged or from a newer SecretSpace.") eph_pub, nonce, ct = raw[1:33], raw[33:33 + NONCE_LEN], raw[33 + NONCE_LEN:] private = X25519PrivateKey.from_private_bytes( _unb64(keyset["x25519_private"], "account key")) @@ -373,13 +373,13 @@ def encrypt_vault(vault_key: bytes, vault_id: bytes, key_generation: int, def vault_header(blob: str) -> dict: raw = _unb64(blob, "vault") if len(raw) < _VAULT_HEADER.size + NONCE_LEN + 16: - raise CryptoError("The vault file is too short to be a PassMan 3 vault.") + raise CryptoError("The vault file is too short to be a SecretSpace 3 vault.") magic, version, vault_id, generation = _VAULT_HEADER.unpack( raw[:_VAULT_HEADER.size]) if magic != VAULT_MAGIC: - raise CryptoError("That is not a PassMan 3 vault.") + raise CryptoError("That is not a SecretSpace 3 vault.") if version != VAULT_VERSION: - raise CryptoError("The vault was written by a newer PassMan; update " + raise CryptoError("The vault was written by a newer SecretSpace; update " "this one.") return {"vault_id": vault_id, "key_generation": generation} diff --git a/sourceFiles/clipboard.py b/sourceFiles/clipboard.py index e55090f..ecf8481 100644 --- a/sourceFiles/clipboard.py +++ b/sourceFiles/clipboard.py @@ -4,8 +4,8 @@ On Linux pyperclip needs xclip, xsel or wl-clipboard installed and fails without them. Tk's own clipboard needs nothing: it works on X11 and, through XWayland, on Wayland desktops. It also suits a password manager: on X11 the -clipboard belongs to the program that copied, so what PassMan copied is gone -once PassMan closes -- unless a clipboard manager kept its own copy. +clipboard belongs to the program that copied, so what SecretSpace copied is gone +once SecretSpace closes -- unless a clipboard manager kept its own copy. """ import tkinter as tk diff --git a/sourceFiles/crypto_utils.py b/sourceFiles/crypto_utils.py index 7d451f8..626dde8 100644 --- a/sourceFiles/crypto_utils.py +++ b/sourceFiles/crypto_utils.py @@ -1,5 +1,5 @@ """ -Vault encryption for PassMan. +Vault encryption for SecretSpace. Container format (all vaults written by this version):: @@ -99,7 +99,7 @@ def _decrypt_v2(master_password: str, raw: bytes) -> dict: kdf_id = header[len(MAGIC)] if kdf_id != KDF_PBKDF2_SHA256: raise ValueError(f"Unsupported key-derivation function id {kdf_id}. " - "This vault needs a newer version of PassMan.") + "This vault needs a newer version of SecretSpace.") iterations = int.from_bytes(header[len(MAGIC) + 1:], "big") if not 1 <= iterations <= MAX_ITERATIONS: diff --git a/sourceFiles/dialogs.py b/sourceFiles/dialogs.py index 40f52d7..5316784 100644 --- a/sourceFiles/dialogs.py +++ b/sourceFiles/dialogs.py @@ -115,7 +115,7 @@ def import_dialog(app): if not path: return - # Encrypted PassMan vault files (.vault / .vault.enc / .enc) must be + # Encrypted SecretSpace vault files (.vault / .vault.enc / .enc) must be # decrypted with their own master password before we can read accounts. ext = os.path.splitext(path)[1].lower() if ext in (".vault", ".enc"): @@ -200,7 +200,7 @@ def _finish_import(app, parsed, path): # Say so up front: silently losing data is how people get locked # out of their accounts after a migration. msg += ("\n\nThis file also contains " + ", ".join(parsed.dropped) + - ", which PassMan cannot store. Keep the original file " + ", which SecretSpace cannot store. Keep the original file " "until you have checked you still have them.") msg += "\n\nAdd them to your vault?" if not app._confirm("Import accounts", msg, danger=False): @@ -466,7 +466,7 @@ def set_on_unlock(): on_unlock = ctk.CTkSwitch( setting_row(syn, "Sync when I unlock", "Off: nothing is sent until you press Sync. On: " - "PassMan syncs right after you unlock; a conflict " + "SecretSpace syncs right after you unlock; a conflict " "still waits for your choice.", hint), text="", width=46, switch_width=42, switch_height=22, progress_color=GREEN, button_color=TEXT, diff --git a/sourceFiles/gui.py b/sourceFiles/gui.py index 74e8c70..19b9761 100644 --- a/sourceFiles/gui.py +++ b/sourceFiles/gui.py @@ -1,5 +1,5 @@ """ -PassMan - a modern desktop password manager. +SecretSpace - a modern desktop password manager. Only the presentation layer lives here, and only the application shell: the login screen, the account list with its details pane and the session @@ -142,7 +142,7 @@ def __init__(self, root): def _load_branding(self): # Linux takes the window icon as an image, not an .ico. With # default=True every dialog gets it too, so icon_path stays None. - for p in asset_candidates("PassMan-logo.png"): + for p in asset_candidates("SecretSpace-logo.png"): if os.path.exists(p): try: self._icon_photo = tk.PhotoImage(file=p) @@ -152,7 +152,7 @@ def _load_branding(self): pass self.logo_image = self.logo_small = None - for p in asset_candidates("PassMan-logo.png"): + for p in asset_candidates("SecretSpace-logo.png"): if os.path.exists(p): try: from PIL import Image, ImageChops @@ -654,7 +654,7 @@ def show_main_window(self): brand = ctk.CTkFrame(bar, fg_color="transparent") brand.grid(row=0, column=0, padx=(24, 14)) self._logo(brand, small=True).pack(side="left") - ctk.CTkLabel(brand, text="PassMan", font=F(17, "bold"), + ctk.CTkLabel(brand, text="SecretSpace", font=F(17, "bold"), text_color=TEXT).pack(side="left", padx=(10, 0)) bg, ink, _ = tile_colors(self.current_user) @@ -1142,7 +1142,7 @@ def toggle(): if not dialogs.ask_master_password( self, "Show 2FA code", f"Enter your master password to see the code for " - f"“{_clip(acc['site'], 40)}”. PassMan asks every time.", + f"“{_clip(acc['site'], 40)}”. SecretSpace asks every time.", action="Show code"): return if not shown.winfo_exists(): diff --git a/sourceFiles/importers.py b/sourceFiles/importers.py index 429a96d..3c38530 100644 --- a/sourceFiles/importers.py +++ b/sourceFiles/importers.py @@ -30,7 +30,7 @@ TOTP_KEYS = ("totp", "login_totp", "otp", "otpauth", "authenticator", "two_factor", "2fa") -#: Columns whose contents PassMan has nowhere to put. Reported to the user +#: Columns whose contents SecretSpace has nowhere to put. Reported to the user #: rather than discarded quietly -- losing a TOTP seed without being told is #: how people get locked out of their accounts after a migration. LOSSY_KEYS = ( diff --git a/sourceFiles/sync_ui.py b/sourceFiles/sync_ui.py index c07a98f..374192f 100644 --- a/sourceFiles/sync_ui.py +++ b/sourceFiles/sync_ui.py @@ -445,7 +445,7 @@ def password_mismatch_dialog(app, adopt, wrong=False): body = ("You changed this vault's master password while the server " "could not be reached, so its copy is still under your " "previous password.\n\n" - "Enter the previous password once. PassMan reads the server's " + "Enter the previous password once. SecretSpace reads the server's " "copy with it, merges, and uploads everything again under " "your new password.") label = "Your previous master password" @@ -575,7 +575,7 @@ def purge(): "Delete permanently", f"Permanently delete the saved login for " f"“{entry.get('site', '')}”?\n\n" - "This cannot be undone, and it is the only action in PassMan " + "This cannot be undone, and it is the only action in SecretSpace " "that really destroys a password."): return vault.purge_account(app.vault, entry["id"]) @@ -643,7 +643,7 @@ def sync_settings_dialog(app): token_entry.insert(0, settings.get("token", "")) ca_entry = field(wrap, "Certificate file (only for https, optional)", - placeholder="/home/you/passman/server.crt") + placeholder="/home/you/secretspace/server.crt") ca_entry.insert(0, settings.get("ca_file", "")) note(wrap, "Plain http is reasonable over a VPN you trust. For https with " diff --git a/sourceFiles/tests/sync_server/README.md b/sourceFiles/tests/sync_server/README.md index 3ae7660..6b4307f 100644 --- a/sourceFiles/tests/sync_server/README.md +++ b/sourceFiles/tests/sync_server/README.md @@ -1,7 +1,7 @@ # A copy of the sync server, for the tests `passman_server.py` here is an unchanged copy of `server/passman_server.py` -from the server repositories (PassMan-Server-Windows and PassMan-Server-Linux +from the server repositories (SecretSpace-Server-Windows and SecretSpace-Server-Linux hold the same file). `test_sync_server.py` runs it on a free port and syncs two simulated PCs through it over a real socket, so the client is tested against the real server rather than a mock. diff --git a/sourceFiles/tests/sync_server/passman_server.py b/sourceFiles/tests/sync_server/passman_server.py index 4b2c557..47e7d98 100644 --- a/sourceFiles/tests/sync_server/passman_server.py +++ b/sourceFiles/tests/sync_server/passman_server.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 """ -PassMan sync server -- a store for encrypted vault blobs. +SecretSpace sync server -- a store for encrypted vault blobs. What it is NOT: it cannot read your passwords. The client encrypts the vault with your master password before it ever reaches the network, so this process @@ -524,7 +524,7 @@ def main(argv=None): # flush: under systemd stdout is a pipe and fully buffered, so without it # these lines never reach the journal while the server is running -- and # a silent journal after `systemctl start` reads as a failure. - print(f"PassMan sync on {scheme}://{args.host}:{args.port}") + print(f"SecretSpace sync on {scheme}://{args.host}:{args.port}") print(f"Vault store: {httpd.store.root}") if scheme == "http" and args.host not in ("127.0.0.1", "localhost"): print("NOTE: plain HTTP on a network address. Vaults are encrypted " diff --git a/sourceFiles/tests/test_account_crypto.py b/sourceFiles/tests/test_account_crypto.py index ba1b924..ec47bf5 100644 --- a/sourceFiles/tests/test_account_crypto.py +++ b/sourceFiles/tests/test_account_crypto.py @@ -1,4 +1,4 @@ -"""PassMan 3.0 account cryptography: published vectors first, then the format.""" +"""SecretSpace 3.0 account cryptography: published vectors first, then the format.""" import base64 import hashlib @@ -178,8 +178,8 @@ def test_an_absurd_cost_is_refused_before_any_work(cost): @pytest.mark.parametrize("mangle,words", [ - (lambda r: b"PMV2" + r[4:], "not a PassMan 3 account"), - (lambda r: r[:4] + b"\x09" + r[5:], "newer PassMan"), + (lambda r: b"PMV2" + r[4:], "not a SecretSpace 3 account"), + (lambda r: r[:4] + b"\x09" + r[5:], "newer SecretSpace"), (lambda r: r[:30], "too short"), ]) def test_a_wrong_file_says_so(mangle, words): @@ -254,7 +254,7 @@ def test_a_2x_vault_is_not_mistaken_for_pmv3(): import crypto_utils blob = crypto_utils.encrypt("pw", DATA, iterations=1000) blob = blob.decode() if isinstance(blob, bytes) else blob - with pytest.raises(ac.CryptoError, match="not a PassMan 3 vault"): + with pytest.raises(ac.CryptoError, match="not a SecretSpace 3 vault"): ac.vault_header(blob) diff --git a/sourceFiles/tests/test_crypto.py b/sourceFiles/tests/test_crypto.py index 3908c54..cd9680f 100644 --- a/sourceFiles/tests/test_crypto.py +++ b/sourceFiles/tests/test_crypto.py @@ -13,7 +13,7 @@ def legacy_blob(password, data): - """A vault exactly as PassMan wrote them before the PMV2 header existed.""" + """A vault exactly as SecretSpace wrote them before the PMV2 header existed.""" salt, nonce = os.urandom(16), os.urandom(12) key = C.derive_key(password, salt, C.LEGACY_ITERATIONS) ct = AESGCM(key).encrypt(nonce, json.dumps(data).encode(), None) diff --git a/sourceFiles/tests/test_sync_server.py b/sourceFiles/tests/test_sync_server.py index b174752..fc51150 100644 --- a/sourceFiles/tests/test_sync_server.py +++ b/sourceFiles/tests/test_sync_server.py @@ -17,7 +17,7 @@ import pytest -# A copy of the server, from PassMan-Server-Windows / PassMan-Server-Linux +# A copy of the server, from SecretSpace-Server-Windows / SecretSpace-Server-Linux # (sync_server/README.md says how to refresh it). sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "sync_server")) diff --git a/sourceFiles/tests/test_vault.py b/sourceFiles/tests/test_vault.py index 4302bda..23c8068 100644 --- a/sourceFiles/tests/test_vault.py +++ b/sourceFiles/tests/test_vault.py @@ -753,7 +753,7 @@ def test_csv_export_leaves_history_out_json_keeps_it(tmp_path): assert exported["accounts"][0]["history"][0]["password"] == "v1" -# --- installed copy: data in ~/.local/share/passman, not the program folder +# --- installed copy: data in ~/.local/share/secretspace, not the program folder def test_portable_copy_keeps_data_next_to_the_app(tmp_path, monkeypatch): monkeypatch.delenv("PASSMAN_DATA_DIR", raising=False) monkeypatch.setattr(vault, "get_app_dir", lambda: str(tmp_path / "app")) @@ -765,12 +765,12 @@ def test_portable_copy_keeps_data_next_to_the_app(tmp_path, monkeypatch): def test_installed_copy_keeps_data_in_xdg_data_home(tmp_path, monkeypatch): import appconfig monkeypatch.delenv("PASSMAN_DATA_DIR", raising=False) - app = tmp_path / "usr" / "lib" / "passman" + app = tmp_path / "usr" / "lib" / "secretspace" app.mkdir(parents=True) (app / vault.INSTALLED_MARKER).write_text("installed by the package") monkeypatch.setattr(vault, "get_app_dir", lambda: str(app)) monkeypatch.setenv("XDG_DATA_HOME", str(tmp_path / "share")) - home = tmp_path / "share" / "passman" + home = tmp_path / "share" / "secretspace" assert vault.is_installed() assert vault.get_data_dir() == str(home / "vault") assert appconfig.config_file() == str(home / "config.json") @@ -789,7 +789,36 @@ def test_installed_without_xdg_data_home_uses_local_share(tmp_path, monkeypatch.setattr(vault.os.path, "expanduser", lambda path: path.replace("~", home, 1)) assert vault.get_home_dir() == str(tmp_path / "home" / ".local" / - "share" / "passman") + "share" / "secretspace") + + +def _installed(tmp_path, monkeypatch): + monkeypatch.delenv("PASSMAN_DATA_DIR", raising=False) + app = tmp_path / "usr" / "lib" / "secretspace" + app.mkdir(parents=True) + (app / vault.INSTALLED_MARKER).write_text("installed by the package") + monkeypatch.setattr(vault, "get_app_dir", lambda: str(app)) + monkeypatch.setenv("XDG_DATA_HOME", str(tmp_path / "share")) + return tmp_path / "share" + + +def test_an_upgrade_from_passman_keeps_the_old_data_folder(tmp_path, monkeypatch): + """Installed as the passman package before the rename: the vaults stay + where they are, nothing is moved, no empty secretspace folder appears.""" + share = _installed(tmp_path, monkeypatch) + old = share / "passman" + (old / "vault").mkdir(parents=True) + (old / "vault" / "bob.vault.enc").write_bytes(b"x") + assert vault.get_data_dir() == str(old / "vault") + assert "bob" in vault.list_users() + assert not (share / "secretspace").exists() + + +def test_the_new_folder_wins_once_it_exists(tmp_path, monkeypatch): + share = _installed(tmp_path, monkeypatch) + (share / "passman").mkdir(parents=True) + (share / "secretspace").mkdir(parents=True) + assert vault.get_data_dir() == str(share / "secretspace" / "vault") @pytest.mark.skipif(os.name != "posix", reason="POSIX file modes") diff --git a/sourceFiles/tests/test_version.py b/sourceFiles/tests/test_version.py index f1383c2..0f2ca3f 100644 --- a/sourceFiles/tests/test_version.py +++ b/sourceFiles/tests/test_version.py @@ -16,7 +16,7 @@ def test_version_string_is_prefixed(): def test_long_version_mentions_app_and_format(): text = version.long_version_string() - assert "PassMan" in text + assert "SecretSpace" in text assert version.version_string() in text assert version.VAULT_FORMAT in text diff --git a/sourceFiles/vault.py b/sourceFiles/vault.py index d5205c4..ffd8ef3 100644 --- a/sourceFiles/vault.py +++ b/sourceFiles/vault.py @@ -92,7 +92,7 @@ def get_app_dir() -> str: """ if getattr(sys, "frozen", False): return os.path.dirname(os.path.abspath(sys.executable)) - # .../PassMan/sourceFiles/vault.py -> .../PassMan + # .../SecretSpace/sourceFiles/vault.py -> .../SecretSpace return os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -112,18 +112,37 @@ def get_home_dir() -> str: Run from a checkout (no installed marker): the app folder, so the app and its data travel together, as on Windows. Installed: - $XDG_DATA_HOME/passman, by default ~/.local/share/passman, which survives - upgrades and removing the package and needs no write access to the - program folder. + $XDG_DATA_HOME/secretspace, by default ~/.local/share/secretspace, which + survives upgrades and removing the package and needs no write access to + the program folder -- or .../passman, see ``data_home``. """ if is_installed(): base = os.environ.get("XDG_DATA_HOME") or os.path.join( os.path.expanduser("~"), ".local", "share") - return os.path.join(base, "passman") + return data_home(base) return get_app_dir() -APP_TITLE = "PassMan - Password Manager" +#: The folder name before the rename to SecretSpace (2026-11). +OLD_HOME_NAME = "passman" +HOME_NAME = "secretspace" + + +def data_home(base: str) -> str: + """ + The data folder under ``base``: secretspace, unless only the folder of + the old name, passman, exists -- then that one, so an upgrade from the + passman package finds the vaults where they are. Nothing is moved or + renamed. The same rule as appdata_home in SecretSpace for Windows. + """ + new = os.path.join(base, HOME_NAME) + old = os.path.join(base, OLD_HOME_NAME) + if not os.path.isdir(new) and os.path.isdir(old): + return old + return new + + +APP_TITLE = "SecretSpace - Password Manager" def window_title() -> str: @@ -144,7 +163,7 @@ def get_data_dir() -> str: deliberately the ONLY place vaults are read from or written to — the user requires a single copy they control (no AppData mirrors, no automatic migration copies). Do not re-add code that copies vault files - elsewhere. An installed copy keeps its one copy in ~/.local/share/passman + elsewhere. An installed copy keeps its one copy in ~/.local/share/secretspace instead of next to the program; that is a different home, not a mirror. If a folder from before the rename (``data``) is present and ``vault`` is @@ -290,7 +309,7 @@ def validate_vault(data) -> dict: bare KeyError after an apparently successful unlock. """ if not isinstance(data, dict): - raise ValueError("This file is not a PassMan vault.") + raise ValueError("This file is not a SecretSpace vault.") accounts = data.get("accounts") if accounts is None: raise ValueError("This vault has no 'accounts' section; it may have " diff --git a/sourceFiles/version.py b/sourceFiles/version.py index d080dcf..197d4f9 100644 --- a/sourceFiles/version.py +++ b/sourceFiles/version.py @@ -6,9 +6,9 @@ format changes. """ -__version__ = "0.9.0" +__version__ = "0.10.0" -#: Container version PassMan writes today (see crypto_utils.MAGIC). +#: Container version SecretSpace writes today (see crypto_utils.MAGIC). VAULT_FORMAT = "PMV2" @@ -18,6 +18,6 @@ def version_string() -> str: def long_version_string() -> str: - """e.g. 'PassMan for Linux v0.1.0 · vault format PMV2' — for the + """e.g. 'SecretSpace for Linux v0.1.0 · vault format PMV2' — for the Settings footer.""" - return f"PassMan for Linux {version_string()} · vault format {VAULT_FORMAT}" + return f"SecretSpace for Linux {version_string()} · vault format {VAULT_FORMAT}" diff --git a/tools/smoke_gui.py b/tools/smoke_gui.py index 7aa2e91..5e24893 100644 --- a/tools/smoke_gui.py +++ b/tools/smoke_gui.py @@ -12,9 +12,9 @@ python3 -I tools/smoke_gui.py OUT_DIR --installed -runs the copy the .deb installed in /usr/lib/passman, with its bundled +runs the copy the .deb installed in /usr/lib/secretspace, with its bundled libraries, instead of the checkout, and also checks that it knows it is -installed (data in ~/.local/share/passman). +installed (data in ~/.local/share/secretspace). """ import argparse @@ -24,7 +24,7 @@ import traceback HERE = os.path.dirname(os.path.abspath(__file__)) -INSTALLED_DIR = "/usr/lib/passman" +INSTALLED_DIR = "/usr/lib/secretspace" _parser = argparse.ArgumentParser() _parser.add_argument("out_dir", nargs="?", default="smoke-out") @@ -164,8 +164,8 @@ def check_installed(): ctk.__file__.startswith(os.path.join(INSTALLED_DIR, "lib") + os.sep)) check("knows it is installed", vault.is_installed()) base = os.environ.get("XDG_DATA_HOME") or os.path.expanduser("~/.local/share") - check("data in ~/.local/share/passman", - vault.get_home_dir() == os.path.join(base, "passman")) + check("data in ~/.local/share/secretspace", + vault.get_home_dir() == os.path.join(base, "secretspace")) if __name__ == "__main__":