From 74479a864eb64e3ea7670c40231924fd61e5b98c Mon Sep 17 00:00:00 2001 From: usermaneGermane Date: Mon, 9 Nov 2026 23:08:52 +0200 Subject: [PATCH] SecretSpace 2.12.0: 2.11.0 renamed Owner 2026-11-09: the public "Latest" release should carry the new name before the repositories go public, so the 2.x line gets the rename too. This is 2.11.0 with exactly the rename of main's #19, nothing from 3.0: display names, SecretSpace.exe / SecretSpace-Client-Installer.exe, the builder, the README ("Formerly PassMan"), plus main's LICENSE (GPL-3.0-only) and SECURITY.md, and main's copy of the test server. Upgrading 2.11.0 -> 2.12.0 (the owner's prod path), as on main: - same Inno AppId, so it upgrades in place and keeps the install folder; - InstallDelete removes PassMan.exe and the PassMan Start Menu / desktop shortcuts; - vault.appdata_home and the installer's DataHome keep using %APPDATA%\PassMan when only that folder exists; nothing is moved. Not renamed: X-PassMan-* sync headers, b"PassMan3 ..." strings, PASSMAN_DATA_DIR, file magics. pytest 437 passed, 1 skipped (3 new data-folder tests). Test build: SecretSpace-Client-Installer.exe 2.12.0, ProductName SecretSpace. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_011ojnyVg7ccsR3pZ64s7aRH --- .github/workflows/tests.yml | 2 +- .gitignore | 7 +- LICENSE | 695 +++++++++++++++++- README.md | 128 ++-- SECURITY.md | 27 + ...-Builder.spec => SecretSpace-Builder.spec} | 16 +- builder/build.py | 69 +- builder/builder_gui.py | 14 +- builder/tests/test_build.py | 20 +- installer/{PassMan.iss => SecretSpace.iss} | 58 +- installer/installed | 7 +- requirements.txt | 2 +- ...taller.spec => SecretSpace-installer.spec} | 12 +- ...{PassMan-logo.ico => SecretSpace-logo.ico} | Bin ...{PassMan-logo.png => SecretSpace-logo.png} | Bin sourceFiles/account_crypto.py | 18 +- sourceFiles/build_version.py | 8 +- sourceFiles/crypto_utils.py | 4 +- sourceFiles/dialogs.py | 6 +- sourceFiles/gui.py | 10 +- sourceFiles/importers.py | 2 +- sourceFiles/sync_ui.py | 6 +- sourceFiles/tests/sync_server/README.md | 2 +- .../tests/sync_server/passman_server.py | 4 +- sourceFiles/tests/test_account_crypto.py | 8 +- sourceFiles/tests/test_crypto.py | 2 +- sourceFiles/tests/test_sync_server.py | 2 +- sourceFiles/tests/test_vault.py | 40 +- sourceFiles/tests/test_version.py | 2 +- sourceFiles/vault.py | 37 +- sourceFiles/version.py | 8 +- 31 files changed, 996 insertions(+), 220 deletions(-) create mode 100644 SECURITY.md rename builder/{PassMan-Builder.spec => SecretSpace-Builder.spec} (70%) rename installer/{PassMan.iss => SecretSpace.iss} (75%) rename sourceFiles/{PassMan-installer.spec => SecretSpace-installer.spec} (85%) rename sourceFiles/{PassMan-logo.ico => SecretSpace-logo.ico} (100%) rename sourceFiles/{PassMan-logo.png => SecretSpace-logo.png} (100%) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 056b862..83b7492 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,7 +10,7 @@ permissions: jobs: pytest: - # Windows, because that is what PassMan ships for: the paths, the + # Windows, because that is what SecretSpace ships for: the paths, the # installer marker and the tkinter build all match what users run. runs-on: windows-latest strategy: diff --git a/.gitignore b/.gitignore index 0f559b9..43c2a6b 100644 --- a/.gitignore +++ b/.gitignore @@ -24,14 +24,17 @@ data/ *.vault.enc.base config.json -# What the PassMan Builder writes here: the installer it packs from -# installer\PassMan.iss, and the builder itself (py builder\build.py +# What the SecretSpace Builder writes here: the installer it packs from +# installer\SecretSpace.iss, and the builder itself (py builder\build.py # --builder). Publish them as release assets rather than committing them. # PassMan.exe is the portable exe of 2.2 and earlier, no longer built; still # ignored in case an old copy is around. +SecretSpace.exe PassMan.exe PassMan-Client-Installer.exe PassMan-Builder.exe +SecretSpace-Client-Installer.exe +SecretSpace-Builder.exe # Working notes, kept locally and out of the public repository. TODO.txt 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 aa7fdd6..4d0997f 100644 --- a/README.md +++ b/README.md @@ -1,47 +1,58 @@ -# PassMan for Windows +# SecretSpace for Windows A local desktop password manager for Windows. Your vault is a single -AES-256-GCM encrypted file. There is no account and no service behind it: it +AES-256-GCM 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. -PassMan lives in four repositories: +**Formerly PassMan.** The project was renamed to SecretSpace in November +2026, because another password manager already uses the name PassMan. +Releases up to 2.11.0 still carry the old name: their +installer is `PassMan-Client-Installer.exe`, the program `PassMan.exe`, and +the data folder `%APPDATA%\PassMan`. Upgrading from them is an ordinary +upgrade: the installer replaces the PassMan program and shortcuts with +SecretSpace's, and your vaults stay in `%APPDATA%\PassMan`, which +SecretSpace keeps using (nothing is moved or renamed). The vault files are +the same. + +SecretSpace lives in four repositories: | Repository | What it holds | |---|---| -| **PassMan-Client-Windows** (this one) | the app for Windows, and its installer | -| [PassMan-Client-Linux](https://github.com/usermaneGermane/PassMan-Client-Linux) | the app for Linux — from source or a .deb package | -| [PassMan-Server-Windows](https://github.com/usermaneGermane/PassMan-Server-Windows) | the sync server for Windows, and its installer | -| [PassMan-Server-Linux](https://github.com/usermaneGermane/PassMan-Server-Linux) | the sync server for Linux (systemd) | +| **SecretSpace-Client-Windows** (this one) | the app for Windows, and its installer | +| [SecretSpace-Client-Linux](https://github.com/usermaneGermane/SecretSpace-Client-Linux) | the app for Linux — from source or a .deb package | +| [SecretSpace-Server-Windows](https://github.com/usermaneGermane/SecretSpace-Server-Windows) | the sync server for Windows, and its installer | +| [SecretSpace-Server-Linux](https://github.com/usermaneGermane/SecretSpace-Server-Linux) | the sync server for Linux (systemd) | -![PassMan](sourceFiles/PassMan-logo.png) +![SecretSpace](sourceFiles/SecretSpace-logo.png) ## Running it The repository does not contain the app itself. Download -`PassMan-Client-Installer.exe` from the -[Releases](https://github.com/usermaneGermane/PassMan-Client-Windows/releases) page, or build it -yourself with the [PassMan Builder](#building-it-yourself-windows). The +`SecretSpace-Client-Installer.exe` from the +[Releases](https://github.com/usermaneGermane/SecretSpace-Client-Windows/releases) page, or build it +yourself with the [SecretSpace Builder](#building-it-yourself-windows). The installer is all you need: it brings Python and every library with it, so installing needs no source code and no Python. -**`PassMan-Client-Installer.exe`** installs it. Run it and choose a folder -(by default `%LOCALAPPDATA%\Programs\PassMan`) and whether you want a +**`SecretSpace-Client-Installer.exe`** installs it. Run it and choose a folder +(by default `%LOCALAPPDATA%\Programs\SecretSpace`) and whether you want a desktop shortcut. It needs Windows 10 or 11 (64-bit) and installs for your Windows user only, so it needs no admin rights. You get a Start Menu entry and an uninstaller under Settings → Apps; the program it installs is -`PassMan.exe`. The vault lives in **`%APPDATA%\PassMan`**, not in the -program folder, so upgrading or uninstalling never touches it. +`SecretSpace.exe`. The vault lives in **`%APPDATA%\SecretSpace`**, not in the +program folder, so upgrading or uninstalling never touches it. A copy first +installed as PassMan keeps `%APPDATA%\PassMan` instead. If you used the portable `PassMan.exe` of 2.2 or earlier, the installer can move your vaults across. They are moved, not copied, and a vault already in -`%APPDATA%\PassMan` is never overwritten. The portable single-file exe is +`%APPDATA%\SecretSpace` is never overwritten. The portable single-file exe is no longer made: it unpacked itself to a temporary folder on every launch, which made it slow to start. The optional sync server is a separate download from its own repository: -**`PassMan-Server-Installer.exe`** from [PassMan-Server-Windows](https://github.com/usermaneGermane/PassMan-Server-Windows), or a Python script and a -systemd unit from [PassMan-Server-Linux](https://github.com/usermaneGermane/PassMan-Server-Linux). The app never needs it, and it never needs the +**`SecretSpace-Server-Installer.exe`** from [SecretSpace-Server-Windows](https://github.com/usermaneGermane/SecretSpace-Server-Windows), or a Python script and a +systemd unit from [SecretSpace-Server-Linux](https://github.com/usermaneGermane/SecretSpace-Server-Linux). The app never needs it, and it never needs the app. To run from source: @@ -54,15 +65,15 @@ python sourceFiles/gui.py ## Building it yourself (Windows) Building needs a checkout of this repository: the builder looks for the -source next to itself and builds from it. Run **`PassMan-Builder.exe`** +source next to itself and builds from it. Run **`SecretSpace-Builder.exe`** from the project folder. It is not on the Releases page (it is only useful inside a checkout); make it once with `py builder\build.py --builder`, see below. It shows a checklist of what the build needs: -- the PassMan source files +- the SecretSpace source files - Python 3 and its `tkinter` -- PassMan's libraries (`requirements.txt`) +- SecretSpace's libraries (`requirements.txt`) - PyInstaller - that the app imports cleanly - Inno Setup 6, for the installer @@ -78,14 +89,14 @@ it is reported missing, re-run the Python installer, choose **Modify**, and tick **tcl/tk and IDLE**. When every line is ✓, press **Build**. About a minute later the project -folder holds the installer, `PassMan-Client-Installer.exe`. The version +folder holds the installer, `SecretSpace-Client-Installer.exe`. The version comes from `sourceFiles/version.py`. The builder does not compile anything itself. It drives the Python installed on the PC, which is why Python is on the checklist. It prefers the `py` launcher's newest Python 3 over a bare `python` on `PATH`, which is often a virtualenv or the Microsoft Store placeholder. It never touches -an installed or running PassMan: everything it writes is in the project +an installed or running SecretSpace: everything it writes is in the project folder. The same steps run in a terminal, without the window: @@ -93,7 +104,7 @@ The same steps run in a terminal, without the window: ``` py builder\build.py check, then build py builder\build.py --install-missing install what is missing first -py builder\build.py --builder build PassMan-Builder.exe itself +py builder\build.py --builder build SecretSpace-Builder.exe itself ``` The last line is how the builder is made in the first place, so a fresh @@ -107,7 +118,7 @@ Copy the **whole project folder** to the other PC. The build needs: ``` requirements.txt sourceFiles\ (all of it) -installer\ (for PassMan-Client-Installer.exe) +installer\ (for SecretSpace-Client-Installer.exe) ``` `README.md` is not needed to build, and neither are the `tests` folders. @@ -121,32 +132,32 @@ that while the error is still readable. The installer is self-contained: what it installs bundles Python and every library, so the target PC does not need Python installed to *run* -PassMan. Python is only needed to *build* it. +SecretSpace. Python is only needed to *build* it. The exe is not code-signed, so Windows SmartScreen will likely warn the first time — "More info" then "Run anyway". Your passwords do **not** travel with the installer. The vault lives in -`%APPDATA%\PassMan`, so a fresh install on a new PC starts empty. To bring +`%APPDATA%\SecretSpace`, so a fresh install on a new PC starts empty. To bring your logins across, use *Restore from server* if you sync, or copy -`vault\.vault.enc` into `%APPDATA%\PassMan\vault` on the new PC, or +`vault\.vault.enc` into `%APPDATA%\SecretSpace\vault` on the new PC, or use Settings → *Encrypted backup* → *Save backup…* and copy that file over. The backup is still protected by your master password. ## A lab copy for testing -The installed copy is your production PassMan: its vaults are in -`%APPDATA%\PassMan`. Only one copy can be installed — a second run of the +The installed copy is your production SecretSpace: its vaults are in +`%APPDATA%\SecretSpace`. Only one copy can be installed — a second run of the installer upgrades the first — so a copy for trying things out runs *without* the installer, and keeps its vaults and `config.json` in its own folder instead: -1. Build (`py builder\build.py`, or PassMan Builder). -2. Copy the folder `build\installer\PassMan` somewhere of its own, e.g. - `D:\PassMan-Lab`, and run `PassMan.exe` from there. +1. Build (`py builder\build.py`, or SecretSpace Builder). +2. Copy the folder `build\installer\SecretSpace` somewhere of its own, e.g. + `D:\SecretSpace-Lab`, and run `SecretSpace.exe` from there. That folder has no `installed` file, so it never touches -`%APPDATA%\PassMan`. Its window title says +`%APPDATA%\SecretSpace`. Its window title says `[LAB - ]`; the installed copy's title never does. Do not copy the `installed` file into it. @@ -154,7 +165,7 @@ To update the lab copy after a new build, close it and copy the new program files over the old ones, leaving its `vault` folder and `config.json` alone: ``` -robocopy build\installer\PassMan D:\PassMan-Lab /E /XD vault /XF config.json +robocopy build\installer\SecretSpace D:\SecretSpace-Lab /E /XD vault /XF config.json ``` (`/E` adds and replaces files but deletes nothing.) @@ -165,18 +176,18 @@ your real vaults do not use** (e.g. `test`, `lab-alice`): a lab vault with the same name as a real one would sync into it. **Moving test vaults out of production.** Uninstalling keeps the vaults, so -`%APPDATA%\PassMan\vault` may still hold vaults you made while testing. With -PassMan closed, move each `.vault.enc` together with its `.bak` and +`%APPDATA%\SecretSpace\vault` may still hold vaults you made while testing. With +SecretSpace closed, move each `.vault.enc` together with its `.bak` and `.base` into the lab copy's `vault` folder (and `config.json` too, if it names a test vault as the last user). ## Project layout ``` -PassMan-Client-Windows/ -├── builder/ PassMan Builder: build.py, its window, its spec -├── PassMan-Builder.exe the builder (built, not committed) -├── PassMan-Client-Installer.exe installs the app (built, not committed) +SecretSpace-Client-Windows/ +├── builder/ SecretSpace Builder: build.py, its window, its spec +├── SecretSpace-Builder.exe the builder (built, not committed) +├── SecretSpace-Client-Installer.exe installs the app (built, not committed) ├── vault/ vaults when running from source - never committed ├── installer/ the Inno Setup script for the installer └── sourceFiles/ the program itself @@ -195,7 +206,7 @@ PassMan-Client-Windows/ ├── lockout.py rate limiting of master-password attempts ├── password_generator.py ├── version.py the version shown in the UI - ├── PassMan-installer.spec the PyInstaller build the installer ships + ├── SecretSpace-installer.spec the PyInstaller build the installer ships ├── build_version.py the exe's version resource, read from version.py └── tests/ └── sync_server/ a copy of the server, for the end-to-end sync tests @@ -209,7 +220,7 @@ backup* if it has one. The upgrade is one-way. This version reads vaults written by older builds and transparently re-encrypts them at the stronger settings on first unlock — -but once that has happened, **an older PassMan.exe can no longer open the +but once that has happened, **an older SecretSpace.exe can no longer open the vault**. It reports "Decryption failed. Wrong password or corrupted data.", which looks alarmingly like a lost password even though the data is fine. @@ -226,11 +237,11 @@ So once any PC runs 2.0: - update **every** PC to 2.0 before using it, and keep no 1.x executable pointing at that vault folder; -- update the sync server too (see "Updating" in [PassMan-Server-Windows](https://github.com/usermaneGermane/PassMan-Server-Windows) or [PassMan-Server-Linux](https://github.com/usermaneGermane/PassMan-Server-Linux)). +- update the sync server too (see "Updating" in [SecretSpace-Server-Windows](https://github.com/usermaneGermane/SecretSpace-Server-Windows) or [SecretSpace-Server-Linux](https://github.com/usermaneGermane/SecretSpace-Server-Linux)). ## Syncing two PCs -Point both PCs at a server you run — [PassMan-Server-Windows](https://github.com/usermaneGermane/PassMan-Server-Windows) or [PassMan-Server-Linux](https://github.com/usermaneGermane/PassMan-Server-Linux) says how to set one +Point both PCs at a server you run — [SecretSpace-Server-Windows](https://github.com/usermaneGermane/SecretSpace-Server-Windows) or [SecretSpace-Server-Linux](https://github.com/usermaneGermane/SecretSpace-Server-Linux) says how to set one up — then press **Sync**. The vault is encrypted before it leaves your machine, so the server stores ciphertext it has no key for and never sees your master password. @@ -246,7 +257,7 @@ your master password. down. After that, Sync on either machine. **Sync when I unlock.** Sync is manual unless you switch this on, in -Settings → Sync once sync is set up (off by default). With it on, PassMan +Settings → Sync once sync is set up (off by default). With it on, SecretSpace syncs right after you unlock; a conflict still waits for your choice, and a server that cannot be reached only shows a warning — the vault opens either way. The switch is per vault and per PC: a merge keeps this PC's choice, @@ -259,7 +270,7 @@ side by side, and **whichever side you do not keep is saved in that entry's history** — every outcome is reversible with one click on *Revert*. Cancelling it changes nothing on either side. -**More than one vault.** Each PassMan user syncs as its own, independent vault +**More than one vault.** Each SecretSpace user syncs as its own, independent vault on the server, matched across PCs by username (exactly, including case). Set up sync once per vault, while that vault is unlocked; Sync only ever syncs the vault that is open. @@ -354,7 +365,7 @@ History syncs, and never causes a conflict: each PC ends up with the combined history from both sides. When you settle a sync conflict, the version you do not keep becomes the entry's newest revision. -**Update every PC** before relying on it: an older PassMan does not know the +**Update every PC** before relying on it: an older SecretSpace does not know the field, drops it when it saves, and that loss would then sync. The server needs no update for this. @@ -396,7 +407,8 @@ drive or in cloud storage. ## Where your data lives -The files below are in `%APPDATA%\PassMan`. An installed copy is +The files below are in `%APPDATA%\SecretSpace` (in `%APPDATA%\PassMan` if +that folder was there first, from before the rename). An installed copy is recognised by the `installed` file that the installer puts next to its exe; without it — running from source, or a portable exe from 2.2 or earlier — they are next to the program instead. @@ -414,13 +426,13 @@ is encrypted with the same master password as the vault. Deleting it is safe master password deletes it automatically, since it cannot be re-encrypted without the old one. -This folder used to be called `data`. If you already have one, PassMan keeps +This folder used to be called `data`. If you already have one, SecretSpace keeps using it as-is and creates nothing new — rename it to `vault` yourself when convenient, while the app is closed. Vault writes go to a temporary file and are then atomically renamed into place, so an interrupted save (full disk, power cut) cannot corrupt the vault. -If the main file is ever damaged, PassMan falls back to the `.bak` copy. +If the main file is ever damaged, SecretSpace falls back to the `.bak` copy. ## Vault format @@ -445,7 +457,7 @@ Worth knowing about, in the interest of not overselling this: - **The unlocked vault lives in memory in the clear**, and Python strings cannot be reliably wiped. Auto-lock limits the window; it does not close it. - **Locking does not clear a copied password.** It stays pasteable until - the 30-second auto-clear, so you can lock and then paste. Closing PassMan + the 30-second auto-clear, so you can lock and then paste. Closing SecretSpace still clears it at once, since nothing would be left to clear it later. - **Clipboard auto-clear only clears the live clipboard.** Windows clipboard history (Win+V) and cloud clipboard sync keep copies no application can @@ -456,7 +468,7 @@ Worth knowing about, in the interest of not overselling this: codes are made on this PC (RFC 6238); scanning a QR code is not supported yet, so paste the secret shown under it. - **Card details, custom fields and attachments** in an export are not - imported; PassMan warns when it sees them. + imported; SecretSpace warns when it sees them. - **The unlock delay is a speed bump, not a boundary.** It slows guessing at the login screen and survives a restart, but anyone who can copy the vault file can attack it offline with no limit at all. Deleting `config.json` @@ -519,4 +531,12 @@ every pull request and every push to `main` ## License -MIT — see [LICENSE](LICENSE). +SecretSpace (this client) 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..3498884 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,27 @@ +# 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 the installer +name), 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 2.x release | Yes | +| 3.0 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 installer and the +sync client. Server issues go to the SecretSpace-Server-Windows or +SecretSpace-Server-Linux repository, the same way. diff --git a/builder/PassMan-Builder.spec b/builder/SecretSpace-Builder.spec similarity index 70% rename from builder/PassMan-Builder.spec rename to builder/SecretSpace-Builder.spec index 9d9f80c..9c9919d 100644 --- a/builder/PassMan-Builder.spec +++ b/builder/SecretSpace-Builder.spec @@ -1,9 +1,9 @@ # -*- mode: python ; coding: utf-8 -*- # -# PassMan-Builder.exe: build.py + builder_gui.py frozen into one file that -# checks the prerequisites and builds PassMan. Built with: +# SecretSpace-Builder.exe: build.py + builder_gui.py frozen into one file that +# checks the prerequisites and builds SecretSpace. Built with: # py builder\build.py --builder -# It borrows PassMan's theme and widgets from sourceFiles/ for its look. +# It borrows SecretSpace's theme and widgets from sourceFiles/ for its look. import os import sys @@ -14,8 +14,8 @@ SRC = os.path.join(os.path.dirname(HERE), 'sourceFiles') sys.path.insert(0, SRC) from build_version import version_info # Properties > Details -datas = [(os.path.join(SRC, 'PassMan-logo.png'), '.'), - (os.path.join(SRC, 'PassMan-logo.ico'), '.')] +datas = [(os.path.join(SRC, 'SecretSpace-logo.png'), '.'), + (os.path.join(SRC, 'SecretSpace-logo.ico'), '.')] binaries = [] hiddenimports = [] tmp_ret = collect_all('customtkinter') @@ -43,7 +43,7 @@ exe = EXE( a.binaries, a.datas, [], - name='PassMan-Builder', + name='SecretSpace-Builder', debug=False, bootloader_ignore_signals=False, strip=False, @@ -55,6 +55,6 @@ exe = EXE( target_arch=None, codesign_identity=None, entitlements_file=None, - icon=[os.path.join(SRC, 'PassMan-logo.ico')], - version=version_info("PassMan Builder", "PassMan-Builder.exe"), + icon=[os.path.join(SRC, 'SecretSpace-logo.ico')], + version=version_info("SecretSpace Builder", "SecretSpace-Builder.exe"), ) diff --git a/builder/build.py b/builder/build.py index 482f342..9626612 100644 --- a/builder/build.py +++ b/builder/build.py @@ -1,14 +1,14 @@ """ -Build PassMan-Client-Installer.exe from the source, after checking every +Build SecretSpace-Client-Installer.exe from the source, after checking every prerequisite. This replaces build.bat. The sync server is built from its own -repository (PassMan-Server-Windows). +repository (SecretSpace-Server-Windows). Two ways to run it: - PassMan-Builder.exe double-click; a window walks through it + SecretSpace-Builder.exe double-click; a window walks through it py builder\\build.py the same steps in a terminal -PassMan-Builder.exe is this module frozen with builder_gui.py. It does not +SecretSpace-Builder.exe is this module frozen with builder_gui.py. It does not compile anything itself -- a frozen exe cannot run PyInstaller on the source -- it drives a real Python installed on the PC, the way build.bat did. Everything here is plain functions over an injectable command runner, @@ -34,10 +34,10 @@ "requirements.txt", os.path.join("sourceFiles", "gui.py"), os.path.join("sourceFiles", "version.py"), - os.path.join("sourceFiles", "PassMan-installer.spec"), - os.path.join("sourceFiles", "PassMan-logo.png"), - os.path.join("sourceFiles", "PassMan-logo.ico"), - os.path.join("installer", "PassMan.iss"), + os.path.join("sourceFiles", "SecretSpace-installer.spec"), + os.path.join("sourceFiles", "SecretSpace-logo.png"), + os.path.join("sourceFiles", "SecretSpace-logo.ico"), + os.path.join("installer", "SecretSpace.iss"), os.path.join("installer", "installed"), ) @@ -83,7 +83,7 @@ def run(cmd, cwd=None, env=None, on_line=None) -> Result: # --------------------------------------------------------------------------- def project_dir() -> str: """ - The PassMan folder: the one holding PassMan-Builder.exe when frozen, + The SecretSpace folder: the one holding SecretSpace-Builder.exe when frozen, else the parent of builder/ where this file lives. """ if getattr(sys, "frozen", False): @@ -170,7 +170,7 @@ def check_all(project: str, runner=run, find_iscc=find_iscc) -> list: checks = [] gone = missing_files(project) checks.append(Check( - "PassMan source files", not gone, + "SecretSpace source files", not gone, "all present" if not gone else "missing: " + ", ".join(gone) + ". Copy the whole project folder.", None if not gone else "manual")) @@ -178,7 +178,7 @@ def check_all(project: str, runner=run, find_iscc=find_iscc) -> list: py = find_python(runner) if py is None: checks.append(Check("Python 3", False, "not found", "winget-python")) - for name in ("tkinter", "PassMan's libraries", "PyInstaller", + for name in ("tkinter", "SecretSpace's libraries", "PyInstaller", "The app imports cleanly"): checks.append(Check(name, False, "needs Python first")) else: @@ -195,7 +195,7 @@ def check_all(project: str, runner=run, find_iscc=find_iscc) -> list: missing = [pip for mod, pip in APP_PACKAGES if runner(py.cmd + ["-c", f"import {mod}"]).code != 0] checks.append(Check( - "PassMan's libraries", not missing, + "SecretSpace's libraries", not missing, "ok" if not missing else "missing: " + ", ".join(missing), None if not missing else "pip", missing)) @@ -244,10 +244,10 @@ def fix_commands(checks, project: str, py: "Python" = None) -> list: elif c.fix == "winget-inno": out.append(("Install Inno Setup 6", winget + [WINGET_INNO])) elif c.fix == "pip" and py is not None: - if c.name == "PassMan's libraries": + if c.name == "SecretSpace's libraries": cmd = py.cmd + ["-m", "pip", "install", "-r", os.path.join(project, "requirements.txt")] - out.append(("Install PassMan's libraries", cmd)) + out.append(("Install SecretSpace's libraries", cmd)) else: out.append((f"Install {', '.join(c.packages)}", py.cmd + ["-m", "pip", "install"] + c.packages)) @@ -267,14 +267,17 @@ def remove_previous(project: str) -> None: successful one because last time's files are still there.""" import shutil # PassMan.exe here is the portable exe of 2.2 and earlier, no longer - # built: removed so it cannot pass for a current build. - for name in ("PassMan.exe", "PassMan-Client-Installer.exe"): + # built, and the PassMan-* names are those from before the rename to + # SecretSpace: removed so none of them can pass for a current build. + for name in ("SecretSpace.exe", "SecretSpace-Client-Installer.exe", + "PassMan.exe", "PassMan-Client-Installer.exe"): path = os.path.join(project, name) if os.path.exists(path): os.remove(path) - folder = os.path.join(project, "build", "installer", "PassMan") - if os.path.isdir(folder): - shutil.rmtree(folder) + for folder in (os.path.join(project, "build", "installer", "SecretSpace"), + os.path.join(project, "build", "installer", "PassMan")): + if os.path.isdir(folder): + shutil.rmtree(folder) def build_steps(project: str, py: "Python", iscc: str, version: str) -> list: @@ -287,13 +290,13 @@ def build_steps(project: str, py: "Python", iscc: str, version: str) -> list: "--distpath", os.path.join(project, "build", "installer"), "--workpath", os.path.join(project, "build", "installer-work"), - os.path.join(src, "PassMan-installer.spec")], - os.path.join(project, "build", "installer", "PassMan", - "PassMan.exe")), - ("Packing PassMan-Client-Installer.exe", + os.path.join(src, "SecretSpace-installer.spec")], + os.path.join(project, "build", "installer", "SecretSpace", + "SecretSpace.exe")), + ("Packing SecretSpace-Client-Installer.exe", [iscc, "/Q", f"/DAppVersion={version}", - os.path.join(project, "installer", "PassMan.iss")], - os.path.join(project, "PassMan-Client-Installer.exe")), + os.path.join(project, "installer", "SecretSpace.iss")], + os.path.join(project, "SecretSpace-Client-Installer.exe")), ] @@ -301,7 +304,7 @@ def build(project: str, py: "Python", iscc: str, log=print, runner=run, exists=os.path.isfile) -> bool: """Run the build, logging as it goes. True when every output exists.""" version = app_version(project) - log(f"PassMan {version}") + log(f"SecretSpace {version}") remove_previous(project) for label, cmd, product in build_steps(project, py, iscc, version): log("") @@ -313,31 +316,31 @@ def build(project: str, py: "Python", iscc: str, log=print, runner=run, "The messages above give the reason.") return False log("") - log(f"DONE. Version {version}: PassMan-Client-Installer.exe") + log(f"DONE. Version {version}: SecretSpace-Client-Installer.exe") return True def build_builder(project: str, py: "Python", log=print, runner=run) -> bool: - """Freeze this module and builder_gui.py into PassMan-Builder.exe.""" - product = os.path.join(project, "PassMan-Builder.exe") + """Freeze this module and builder_gui.py into SecretSpace-Builder.exe.""" + product = os.path.join(project, "SecretSpace-Builder.exe") if os.path.exists(product): os.remove(product) res = runner(py.cmd + ["-m", "PyInstaller", "--noconfirm", "--distpath", project, "--workpath", os.path.join(project, "build"), os.path.join(project, "builder", - "PassMan-Builder.spec")], + "SecretSpace-Builder.spec")], cwd=project, on_line=log) ok = res.code == 0 and os.path.isfile(product) - log("DONE: PassMan-Builder.exe" if ok else - f"FAILED to build PassMan-Builder.exe (exit code {res.code})") + log("DONE: SecretSpace-Builder.exe" if ok else + f"FAILED to build SecretSpace-Builder.exe (exit code {res.code})") return ok # --------------------------------------------------------------------------- # Terminal use: py builder\build.py [--install-missing] [--builder] # --install-missing install what is missing, then build -# --builder build PassMan-Builder.exe instead of the app +# --builder build SecretSpace-Builder.exe instead of the app # --------------------------------------------------------------------------- def main(argv=None) -> int: argv = sys.argv[1:] if argv is None else argv diff --git a/builder/builder_gui.py b/builder/builder_gui.py index 11e0889..8ac3817 100644 --- a/builder/builder_gui.py +++ b/builder/builder_gui.py @@ -1,9 +1,9 @@ """ -PassMan Builder: the window around build.py. +SecretSpace Builder: the window around build.py. It shows every prerequisite as a checklist, offers to install what is missing (asking before each install), then builds -PassMan-Client-Installer.exe with a live log. All the work happens in build.py, on a background thread, so the +SecretSpace-Client-Installer.exe with a live log. All the work happens in build.py, on a background thread, so the window never freezes during a long build. """ @@ -13,7 +13,7 @@ import threading from tkinter import filedialog, messagebox -# Reuse PassMan's own look. When frozen, PyInstaller has bundled theme.py. +# Reuse SecretSpace's own look. When frozen, PyInstaller has bundled theme.py. if not getattr(sys, "frozen", False): sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname( os.path.abspath(__file__))), "sourceFiles")) @@ -37,10 +37,10 @@ def __init__(self, root, project): self.checks = [] self.python = None - root.title("PassMan Builder") + root.title("SecretSpace Builder") root.geometry("760x640") root.minsize(640, 520) - for path in asset_candidates("PassMan-logo.ico"): + for path in asset_candidates("SecretSpace-logo.ico"): if os.path.exists(path): try: root.iconbitmap(path) @@ -53,7 +53,7 @@ def __init__(self, root, project): head = ctk.CTkFrame(root, fg_color=HEADER_BG, corner_radius=0) head.grid(row=0, column=0, sticky="ew") - ctk.CTkLabel(head, text="PassMan Builder", font=F(20, "bold"), + ctk.CTkLabel(head, text="SecretSpace Builder", font=F(20, "bold"), text_color=GREEN).pack(anchor="w", padx=20, pady=(14, 0)) self.where = ctk.CTkLabel(head, text="", font=F(12), text_color=MUTED, anchor="w") @@ -236,7 +236,7 @@ def done(ok): def choose_folder(self): folder = filedialog.askdirectory( - parent=self.root, title="Choose the PassMan project folder", + parent=self.root, title="Choose the SecretSpace project folder", initialdir=self.project) if folder: self.project = os.path.normpath(folder) diff --git a/builder/tests/test_build.py b/builder/tests/test_build.py index 3ae0482..33522f9 100644 --- a/builder/tests/test_build.py +++ b/builder/tests/test_build.py @@ -72,7 +72,7 @@ def test_missing_libraries_are_installed_from_requirements(): runner = healthy(**{"import customtkinter": build.Result(1, ""), "import PIL": build.Result(1, "")}) checks = build.check_all(PROJECT, runner, find_iscc=has_iscc) - libs = checks_by_name(checks)["PassMan's libraries"] + libs = checks_by_name(checks)["SecretSpace's libraries"] assert not libs.ok and libs.fix == "pip" assert libs.detail == "missing: customtkinter, Pillow" [(label, cmd)] = build.fix_commands(checks, PROJECT, @@ -125,7 +125,7 @@ def test_a_broken_source_file_blocks_the_build(): def test_an_incomplete_folder_is_reported(tmp_path): checks = build.check_all(str(tmp_path), healthy(), find_iscc=has_iscc) - files = checks_by_name(checks)["PassMan source files"] + files = checks_by_name(checks)["SecretSpace source files"] assert not files.ok and "Copy the whole project folder" in files.detail @@ -147,7 +147,7 @@ def project(tmp_path): (tmp_path / "sourceFiles").mkdir() (tmp_path / "sourceFiles" / "version.py").write_text( '__version__ = "9.8.7"\n') - (tmp_path / "PassMan.exe").write_text("last time's build") + (tmp_path / "SecretSpace.exe").write_text("last time's build") return str(tmp_path) @@ -157,8 +157,8 @@ def test_build_runs_the_steps_in_order(project): assert build.build(project, py, r"C:\Inno\ISCC.exe", log=lambda s: None, runner=runner, exists=lambda p: True) cmds = [" ".join(c) for c, _ in runner.calls] - assert "PassMan-installer.spec" in cmds[0] - assert "/DAppVersion=9.8.7" in cmds[1] and "PassMan.iss" in cmds[1] + assert "SecretSpace-installer.spec" in cmds[0] + assert "/DAppVersion=9.8.7" in cmds[1] and "SecretSpace.iss" in cmds[1] assert len(cmds) == 2 @@ -167,7 +167,7 @@ def test_the_portable_exe_is_no_longer_built(project): build.build(project, build.Python(["py"], "3", "p"), "iscc", log=lambda s: None, runner=runner, exists=lambda p: True) cmds = [" ".join(c) for c, _ in runner.calls] - assert not any(c.endswith("PassMan.spec") for c in cmds) + assert not any(c.endswith("SecretSpace.spec") for c in cmds) assert not any("--distpath " + project + " " in c for c in cmds) @@ -175,7 +175,7 @@ def test_only_the_app_is_built(): """The server has its own repository and its own build.""" steps = build.build_steps("P", build.Python(["py"], "3", "p"), "iscc", "1") products = [os.path.basename(product) for _, _, product in steps] - assert products == ["PassMan.exe", "PassMan-Client-Installer.exe"] + assert products == ["SecretSpace.exe", "SecretSpace-Client-Installer.exe"] def test_old_outputs_are_removed_before_building(project): @@ -183,11 +183,11 @@ def test_old_outputs_are_removed_before_building(project): log=lambda s: None, runner=FakeRunner(), exists=lambda p: True) # A portable exe left by 2.2 or earlier must not pass for a new build. - assert not os.path.exists(os.path.join(project, "PassMan.exe")) + assert not os.path.exists(os.path.join(project, "SecretSpace.exe")) def test_an_old_installer_is_removed_too(project): - old = os.path.join(project, "PassMan-Client-Installer.exe") + old = os.path.join(project, "SecretSpace-Client-Installer.exe") with open(old, "w") as f: f.write("last time's build") build.remove_previous(project) @@ -195,7 +195,7 @@ def test_an_old_installer_is_removed_too(project): def test_build_stops_at_the_first_failure(project): - runner = FakeRunner({"PassMan-installer.spec": build.Result(1, "boom")}) + runner = FakeRunner({"SecretSpace-installer.spec": build.Result(1, "boom")}) lines = [] ok = build.build(project, build.Python(["py"], "3", "p"), "iscc", log=lines.append, runner=runner, exists=lambda p: True) diff --git a/installer/PassMan.iss b/installer/SecretSpace.iss similarity index 75% rename from installer/PassMan.iss rename to installer/SecretSpace.iss index f574f0f..a1fda6b 100644 --- a/installer/PassMan.iss +++ b/installer/SecretSpace.iss @@ -1,18 +1,19 @@ -; PassMan installer - compiled by the PassMan Builder (builder\build.py) +; SecretSpace installer - compiled by the SecretSpace Builder (builder\build.py) ; with Inno Setup 6: -; ISCC.exe /DAppVersion=2.1.0 installer\PassMan.iss +; ISCC.exe /DAppVersion=2.1.0 installer\SecretSpace.iss ; ; Installs for the current user only (no admin prompt), by default into -; %LOCALAPPDATA%\Programs\PassMan, with a Start Menu entry, an optional +; %LOCALAPPDATA%\Programs\SecretSpace, with a Start Menu entry, an optional ; desktop shortcut and an uninstaller in Settings > Apps. ; ; The vaults are NOT in the program folder. The "installed" marker file makes -; PassMan keep them in %APPDATA%\PassMan (see vault.get_home_dir), so an -; upgrade or an uninstall never touches them. +; SecretSpace keep them in %APPDATA%\SecretSpace (see vault.get_home_dir), so an +; upgrade or an uninstall never touches them. A copy installed before the +; rename (as PassMan) keeps %APPDATA%\PassMan: see DataHome below. ; ; Silent install, e.g. for testing: -; PassMan-Client-Installer.exe /VERYSILENT /DIR="C:\somewhere" /TASKS="desktopicon" -; /MOVEVAULTS="E:\old\PassMan" +; SecretSpace-Client-Installer.exe /VERYSILENT /DIR="C:\somewhere" /TASKS="desktopicon" +; /MOVEVAULTS="E:\old\SecretSpace" #ifndef AppVersion #define AppVersion "0.0.0" @@ -21,11 +22,11 @@ [Setup] ; Never change AppId: it is how an upgrade finds the copy it replaces. AppId={{2142690B-93AA-41F8-9056-BE62EE0426B4} -AppName=PassMan +AppName=SecretSpace AppVersion={#AppVersion} -AppVerName=PassMan {#AppVersion} +AppVerName=SecretSpace {#AppVersion} VersionInfoVersion={#AppVersion} -DefaultDirName={autopf}\PassMan +DefaultDirName={autopf}\SecretSpace DisableProgramGroupPage=yes PrivilegesRequired=lowest ; Windows 10 and 11 only (11 reports itself as 10.0.22000+). Older Windows @@ -34,14 +35,14 @@ MinVersion=10.0 ArchitecturesAllowed=x64compatible ArchitecturesInstallIn64BitMode=x64compatible OutputDir=.. -OutputBaseFilename=PassMan-Client-Installer -SetupIconFile=..\sourceFiles\PassMan-logo.ico -UninstallDisplayIcon={app}\PassMan.exe -UninstallDisplayName=PassMan +OutputBaseFilename=SecretSpace-Client-Installer +SetupIconFile=..\sourceFiles\SecretSpace-logo.ico +UninstallDisplayIcon={app}\SecretSpace.exe +UninstallDisplayName=SecretSpace WizardStyle=modern Compression=lzma2 SolidCompression=yes -; Close a running PassMan before replacing its files. +; Close a running SecretSpace before replacing its files. CloseApplications=yes ; The vault move below writes to the user's own profile on purpose. UsedUserAreasWarning=no @@ -52,26 +53,41 @@ Name: "desktopicon"; Description: "Create a &desktop shortcut"; GroupDescription [InstallDelete] ; An upgrade must not leave the previous version's libraries behind. Type: filesandordirs; Name: "{app}\_internal" +; Nor the program and shortcuts of the name before SecretSpace. An upgrade +; keeps the folder it was installed in, even if that folder says PassMan. +Type: files; Name: "{app}\PassMan.exe" +Type: files; Name: "{autoprograms}\PassMan.lnk" +Type: files; Name: "{autodesktop}\PassMan.lnk" [Files] -Source: "..\build\installer\PassMan\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "..\build\installer\SecretSpace\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "installed"; DestDir: "{app}"; Flags: ignoreversion [Icons] -Name: "{autoprograms}\PassMan"; Filename: "{app}\PassMan.exe" -Name: "{autodesktop}\PassMan"; Filename: "{app}\PassMan.exe"; Tasks: desktopicon +Name: "{autoprograms}\SecretSpace"; Filename: "{app}\SecretSpace.exe" +Name: "{autodesktop}\SecretSpace"; Filename: "{app}\SecretSpace.exe"; Tasks: desktopicon [Run] -Filename: "{app}\PassMan.exe"; Description: "Start PassMan now"; Flags: nowait postinstall skipifsilent +Filename: "{app}\SecretSpace.exe"; Description: "Start SecretSpace now"; Flags: nowait postinstall skipifsilent [Code] var MovePage: TInputOptionWizardPage; FromPage: TInputDirWizardPage; +{ Where the installed app keeps its data (vault.appdata_home makes the same + choice): SecretSpace, unless only the folder of the old name PassMan exists, + which an upgrade then keeps using. Nothing is moved or renamed. } function DataHome: String; +var + NewHome, OldHome: String; begin - Result := ExpandConstant('{userappdata}\PassMan'); + NewHome := ExpandConstant('{userappdata}\SecretSpace'); + OldHome := ExpandConstant('{userappdata}\PassMan'); + if (not DirExists(NewHome)) and DirExists(OldHome) then + Result := OldHome + else + Result := NewHome; end; function HasVaults(Dir: String): Boolean; @@ -102,7 +118,7 @@ procedure InitializeWizard; begin MovePage := CreateInputOptionPage(wpSelectTasks, 'Existing vaults', 'Have you used the portable PassMan.exe before?', - 'This copy of PassMan keeps its vaults in your user profile:' + #13#10 + + 'This copy of SecretSpace keeps its vaults in your user profile:' + #13#10 + ' ' + DataHome + #13#10 + #13#10 + 'If you have vaults next to an earlier PassMan.exe, Setup can move ' + 'them there now. They are moved, not copied, so you still have one ' + diff --git a/installer/installed b/installer/installed index 7149ec8..c2befd1 100644 --- a/installer/installed +++ b/installer/installed @@ -1,4 +1,5 @@ -This file was put here by PassMan-Setup.exe. While it is next to -PassMan.exe, PassMan keeps your vaults and settings in -%APPDATA%\PassMan instead of in this folder, so upgrading or +This file was put here by SecretSpace-Setup.exe. While it is next to +SecretSpace.exe, SecretSpace keeps your vaults and settings in +%APPDATA%\SecretSpace (or %APPDATA%\PassMan, if that is where they +already are) instead of in this folder, so upgrading or uninstalling the program never touches them. diff --git a/requirements.txt b/requirements.txt index 2b0b2c8..908adcd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -# PassMan dependencies +# SecretSpace dependencies cryptography>=44 # AES-GCM + PBKDF2 vaults; 44+ for Argon2id (3.0 accounts) pyperclip>=1.8 # copy username/password to clipboard customtkinter>=5.2 # modern UI toolkit diff --git a/sourceFiles/PassMan-installer.spec b/sourceFiles/SecretSpace-installer.spec similarity index 85% rename from sourceFiles/PassMan-installer.spec rename to sourceFiles/SecretSpace-installer.spec index bd94e15..242c786 100644 --- a/sourceFiles/PassMan-installer.spec +++ b/sourceFiles/SecretSpace-installer.spec @@ -1,6 +1,6 @@ # -*- mode: python ; coding: utf-8 -*- # -# The build the installer ships: a folder (PassMan.exe + _internal\), not a +# The build the installer ships: a folder (SecretSpace.exe + _internal\), not a # single self-extracting file. A single-file exe unpacks ~45 MB to %TEMP% on # every launch - about a second of start-up, and a leftover _MEI folder # whenever it is killed - which is why the portable one was retired. UPX is off for the same reason: every DLL would otherwise be @@ -14,8 +14,8 @@ SRC = SPECPATH sys.path.insert(0, SRC) from build_version import version_info # Properties > Details -datas = [(os.path.join(SRC, 'PassMan-logo.png'), '.'), - (os.path.join(SRC, 'PassMan-logo.ico'), '.')] +datas = [(os.path.join(SRC, 'SecretSpace-logo.png'), '.'), + (os.path.join(SRC, 'SecretSpace-logo.ico'), '.')] binaries = [] # PIL.ImageTk pulls in PIL._tkinter_finder at runtime, and PyInstaller's # Pillow hook does not always detect it. Without it the frozen app crashes @@ -46,7 +46,7 @@ exe = EXE( a.scripts, [], exclude_binaries=True, - name='PassMan', + name='SecretSpace', debug=False, bootloader_ignore_signals=False, strip=False, @@ -57,7 +57,7 @@ exe = EXE( target_arch=None, codesign_identity=None, entitlements_file=None, - icon=[os.path.join(SRC, 'PassMan-logo.ico')], + icon=[os.path.join(SRC, 'SecretSpace-logo.ico')], version=version_info(), ) @@ -68,5 +68,5 @@ coll = COLLECT( strip=False, upx=False, upx_exclude=[], - name='PassMan', + name='SecretSpace', ) diff --git a/sourceFiles/PassMan-logo.ico b/sourceFiles/SecretSpace-logo.ico similarity index 100% rename from sourceFiles/PassMan-logo.ico rename to sourceFiles/SecretSpace-logo.ico 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/build_version.py b/sourceFiles/build_version.py index c513ddd..7af254a 100644 --- a/sourceFiles/build_version.py +++ b/sourceFiles/build_version.py @@ -1,5 +1,5 @@ """ -The Windows version resource for PassMan.exe -- what Explorer shows under +The Windows version resource for SecretSpace.exe -- what Explorer shows under Properties > Details. Used by both .spec files at build time only; the app never imports it, so PyInstaller does not bundle it. @@ -14,8 +14,8 @@ from version import __version__ -def version_info(description="PassMan password manager", - filename="PassMan.exe") -> VSVersionInfo: +def version_info(description="SecretSpace password manager", + filename="SecretSpace.exe") -> VSVersionInfo: numbers = tuple(int(part) for part in __version__.split(".")) + (0,) return VSVersionInfo( ffi=FixedFileInfo(filevers=numbers, prodvers=numbers), @@ -25,7 +25,7 @@ def version_info(description="PassMan password manager", StringStruct("FileVersion", __version__), StringStruct("InternalName", filename[:-4]), StringStruct("OriginalFilename", filename), - StringStruct("ProductName", "PassMan"), + StringStruct("ProductName", "SecretSpace"), StringStruct("ProductVersion", __version__), ])]), VarFileInfo([VarStruct("Translation", [0x0409, 1200])]), 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 11fb611..4bb9cf1 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 @@ -140,7 +140,7 @@ def __init__(self, root): # Branding (window icon + logo) - all optional / best effort # ------------------------------------------------------------------ def _load_branding(self): - for p in asset_candidates("PassMan-logo.ico"): + for p in asset_candidates("SecretSpace-logo.ico"): if os.path.exists(p): try: self.root.iconbitmap(p) @@ -150,7 +150,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 @@ -652,7 +652,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) @@ -1140,7 +1140,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 b8da2ba..bbca769 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="C:\\PassMan\\server.crt") + placeholder="C:\\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 ac77b3c..6f5e1fd 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 %APPDATA%\PassMan, not the program folder ----- +# --- installed copy: data in %APPDATA%\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_appdata(tmp_path, monkeypatch): import appconfig monkeypatch.delenv("PASSMAN_DATA_DIR", raising=False) - app = tmp_path / "Programs" / "PassMan" + app = tmp_path / "Programs" / "SecretSpace" app.mkdir(parents=True) (app / vault.INSTALLED_MARKER).write_text("installed by setup") monkeypatch.setattr(vault, "get_app_dir", lambda: str(app)) monkeypatch.setenv("APPDATA", str(tmp_path / "Roaming")) - home = tmp_path / "Roaming" / "PassMan" + home = tmp_path / "Roaming" / "SecretSpace" assert vault.is_installed() assert vault.get_data_dir() == str(home / "vault") assert appconfig.config_file() == str(home / "config.json") @@ -780,6 +780,40 @@ def test_installed_copy_keeps_data_in_appdata(tmp_path, monkeypatch): assert sorted(p.name for p in app.iterdir()) == [vault.INSTALLED_MARKER] +def _installed(tmp_path, monkeypatch): + monkeypatch.delenv("PASSMAN_DATA_DIR", raising=False) + app = tmp_path / "Programs" / "SecretSpace" + app.mkdir(parents=True) + (app / vault.INSTALLED_MARKER).write_text("installed by setup") + monkeypatch.setattr(vault, "get_app_dir", lambda: str(app)) + monkeypatch.setenv("APPDATA", str(tmp_path / "Roaming")) + return tmp_path / "Roaming" + + +def test_an_upgrade_from_passman_keeps_the_old_data_folder(tmp_path, monkeypatch): + """Installed as PassMan before the rename: the vaults stay where they are, + nothing is moved, and no empty SecretSpace folder appears beside them.""" + roaming = _installed(tmp_path, monkeypatch) + old = roaming / "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 (roaming / "SecretSpace").exists() + + +def test_the_new_folder_wins_once_it_exists(tmp_path, monkeypatch): + roaming = _installed(tmp_path, monkeypatch) + (roaming / "PassMan").mkdir(parents=True) + (roaming / "SecretSpace").mkdir(parents=True) + assert vault.get_data_dir() == str(roaming / "SecretSpace" / "vault") + + +def test_a_new_install_uses_the_new_name(tmp_path, monkeypatch): + roaming = _installed(tmp_path, monkeypatch) + assert vault.get_data_dir() == str(roaming / "SecretSpace" / "vault") + + def test_env_override_beats_an_installed_copy(tmp_path, monkeypatch): (tmp_path / vault.INSTALLED_MARKER).write_text("") monkeypatch.setattr(vault, "get_app_dir", lambda: str(tmp_path)) 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 9ab98b9..99a3e88 100644 --- a/sourceFiles/vault.py +++ b/sourceFiles/vault.py @@ -82,7 +82,7 @@ def legacy_id(site: str, username: str) -> str: def get_app_dir() -> str: """ - The project root: the folder holding PassMan.exe when frozen, else the + The project root: the folder holding SecretSpace.exe when frozen, else the parent of ``sourceFiles`` where this module lives. Anchored to the executable, NOT the working directory, so shortcuts with @@ -92,11 +92,11 @@ 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__))) -#: The installer puts a file of this name next to PassMan.exe. Its presence +#: The installer puts a file of this name next to SecretSpace.exe. Its presence #: means "installed copy": the program folder is replaced on upgrade and #: removed on uninstall, so the user's data must live somewhere else. INSTALLED_MARKER = "installed" @@ -111,18 +111,37 @@ def get_home_dir() -> str: Where config.json and the vault folder live. Portable (no installer marker): the app folder, so the app and its data - travel together on a USB stick. Installed: %APPDATA%\\PassMan, which + travel together on a USB stick. Installed: %APPDATA%\\SecretSpace, which survives upgrades and uninstalling and does not need the program folder - to be writable. + to be writable -- or %APPDATA%\\PassMan, see ``appdata_home``. """ if is_installed(): base = os.environ.get("APPDATA") or os.path.join( os.path.expanduser("~"), "AppData", "Roaming") - return os.path.join(base, "PassMan") + return appdata_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 appdata_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 finds the + vaults where they are. Nothing is moved or renamed; the installer's + DataHome makes the same choice. + """ + 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: @@ -143,7 +162,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 %APPDATA%\\PassMan + elsewhere. An installed copy keeps its one copy in %APPDATA%\\SecretSpace instead of next to the exe; that is a different home, not a mirror. If a folder from before the rename (``data``) is present and ``vault`` is @@ -286,7 +305,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 48f62ea..9b5e578 100644 --- a/sourceFiles/version.py +++ b/sourceFiles/version.py @@ -6,9 +6,9 @@ format changes. """ -__version__ = "2.11.0" +__version__ = "2.12.0" -#: Container version PassMan writes today (see crypto_utils.MAGIC). +#: Container version SecretSpace writes today (see crypto_utils.MAGIC). VAULT_FORMAT = "PMV2" @@ -18,5 +18,5 @@ def version_string() -> str: def long_version_string() -> str: - """e.g. 'PassMan v2.0.0 · vault format PMV2' — for the Settings footer.""" - return f"PassMan {version_string()} · vault format {VAULT_FORMAT}" + """e.g. 'SecretSpace v2.0.0 · vault format PMV2' — for the Settings footer.""" + return f"SecretSpace {version_string()} · vault format {VAULT_FORMAT}"