From a6c12abdd4ac2189c33f0d690e232d2c1577d5e9 Mon Sep 17 00:00:00 2001 From: Difrex Date: Sun, 27 Apr 2014 23:11:52 +0400 Subject: [PATCH 01/22] db class --- Database.pm | 13 +++++++++++++ Password.pm | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Database.pm b/Database.pm index e69de29..5b869d3 100644 --- a/Database.pm +++ b/Database.pm @@ -0,0 +1,13 @@ +package Database; + +use DBI; + +sub new { + my $class = shift; + + my $self = { + }; + + bless $self, $class; + return $self; +} diff --git a/Password.pm b/Password.pm index ab9864e..67b3488 100644 --- a/Password.pm +++ b/Password.pm @@ -4,7 +4,7 @@ use strict; use warnings; use utf8; -use DBI; +use Database; sub new { my $class = shift; @@ -39,4 +39,4 @@ sub create_base { } } -1; \ No newline at end of file +1; From fa8335b803818a4621e7201be2ce5962955f3bd7 Mon Sep 17 00:00:00 2001 From: Difrex Date: Sun, 27 Apr 2014 23:35:58 +0400 Subject: [PATCH 02/22] 1; :) --- Database.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Database.pm b/Database.pm index 5b869d3..da4f05f 100644 --- a/Database.pm +++ b/Database.pm @@ -11,3 +11,5 @@ sub new { bless $self, $class; return $self; } + +1; \ No newline at end of file From a3f935330ea85c6ce7671a3f0332b03ce5fcebf3 Mon Sep 17 00:00:00 2001 From: Difrex Date: Mon, 28 Apr 2014 00:04:16 +0400 Subject: [PATCH 03/22] create_base function --- Database.pm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ Password.pm | 22 ---------------------- 2 files changed, 47 insertions(+), 22 deletions(-) diff --git a/Database.pm b/Database.pm index da4f05f..102d930 100644 --- a/Database.pm +++ b/Database.pm @@ -5,11 +5,58 @@ use DBI; sub new { my $class = shift; + # Get home dir + my $home = $ENV{HOME}; + my $self = { + _home => $home; }; bless $self, $class; return $self; } +sub connect { + my ($self) = @_; + my $home = $self->{_home}; + my $db_file = $home . "/.PM/db.sqlite"; + + my $dbh = DBI->connect("dbi:SQLite:dbname=$db_file","",""); + + return $dbh; +} + +sub mdo { + my ($self) = @_; + my $dbh = $self->{_dbh}; +} + +sub create_base { + my ($self) = @_; + my $home = $self->{_home}; + my $pm_dir = $home."/.PM/"; + + # Check dir + if !(-d $pm_dir) { + # Create dirrectory + @mkdir_cmd = ("mkdir", "$pm_dir"); + system(@mkdir_cmd) == 0 or die "Cannot create dir $pm_dir: $!\n"; + + # Create DB file + @createdb_cmd = ("touch", "$pm_dir/db.sqlite"); + system(@createdb_cmd) == 0 or die "Cannot create database file: $!\n"; + + # Create table. TODO: write this + my $dbh = DBI->connect("dbi:SQLite:dbname=$pm_dir/db.sqlite","",""); + print "Create database schema\n"; + my $q_table = "create table passwords(name VARCHAR(32), resource TEXT, password TEXT)"; + + return 0; + } + else { + print "Dirrectory is exist!\n"; + return 0; + } +} + 1; \ No newline at end of file diff --git a/Password.pm b/Password.pm index 67b3488..cd575f7 100644 --- a/Password.pm +++ b/Password.pm @@ -9,9 +9,6 @@ use Database; sub new { my $class = shift; - # Get home dir - $home = $ENV{HOME}; - my $self = { _home => $home, }; @@ -20,23 +17,4 @@ sub new { return $self; } -sub create_base { - my $self = shift; - my $home = $self->{_home}; - my $pm_dir = $home."/.PM/"; - - # Check dir - if !(-d $pm_dir) { - # Create dirrectory - @cmd_string = ("mkdir", "$pm_dir"); - system(@cmd_string) == 0 or die "Cannot create dir $pm_dir: $!\n"; - # Create database. TODO: write this - my $dbi = DBI->connect("DBD::sqlite"); - } - else { - print "dirrectory is exist!\n"; - return 0; - } -} - 1; From 7dc29874a67c21f53b94d1af620b33576e3142d5 Mon Sep 17 00:00:00 2001 From: Difrex Date: Mon, 28 Apr 2014 00:12:40 +0400 Subject: [PATCH 04/22] License file added --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From 82d6608c596e3f4d28351b8975b1f0b2c4a8b8f5 Mon Sep 17 00:00:00 2001 From: "Difrex(Denis Zheleztsov)" Date: Mon, 28 Apr 2014 11:29:38 +0400 Subject: [PATCH 05/22] Usage and getopts writed --- pm.pl | 49 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 14 deletions(-) mode change 100644 => 100755 pm.pl diff --git a/pm.pl b/pm.pl old mode 100644 new mode 100755 index efc0378..5702d78 --- a/pm.pl +++ b/pm.pl @@ -1,35 +1,56 @@ #!/usr/bin/perl use Password; - use Getopt::Std; -# Global -use vars qw / %opt /; + our $VERSION = '0.0.0a'; +# Debug +use Data::Dumper; + sub usage() { print STDERR << "EOF"; Simple password manager writed in Perl. Usage: - - -s [Name of resource] -- Show password for resource - -w -- Store new password(interactive) - -W [Name|Link|password] -- Non interactive - -r [Name] -- Remove password + -s -- Show password + -n [Name of resource] -- Name of resource + -w -- Store new password + -l [Link] -- Link to resource + -p [Password] -- Password + -r -- Remove password + -o -- Open link -h -- Show this help screen and exit -v -- Show version info and exit +Examples: + + Show password for resource: + \tpm.pl -s -n LOR + \tPassword copied to xclipboard.\n\t\tLink is http://linux.org.ru/ + + Store new password: + \tpm.pl -w -n PRON -l http://superpronsite.com/ -p my_secret_password + \tPassword for resource PRON is stored into DB! + + Copy password and open link: + \tpm.pl -s -n LOR -o + \tPassword copied to clipboard. Trying to open uri. + EOF exit 1; } sub init() { - my $opt_string = 'swWrhv'; - # TODO: switch's to Getopt::Mixed - getopts("$opt_string", \%opt) or usage(); - print STDOUT "Simple password manager writed in Perl.\nVersion: ".$VERSION . "\n" and exit 0 if $opt{v}; - usage if $opt{h}; + my $opt_string = 'swn:l:p:rhv'; + getopts("$opt_string") or usage(); + our ($opt_s, $opt_w, $opt_n, $opt_r, + $opt_l, $opt_p, $opt_h, $opt_v); + + print "Simple password manager writed in Perl.\nVersion: ". + $VERSION."\n" and exit 0 if $opt_v; + usage if $opt_h; } -init(); +# Parse cmd line +init(); \ No newline at end of file From dc76c9e6f83d915ee8b38c1c45f51f3a99abfb1c Mon Sep 17 00:00:00 2001 From: "Difrex(Denis Zheleztsov)" Date: Mon, 28 Apr 2014 11:51:50 +0400 Subject: [PATCH 06/22] GPG abstraction layer --- GPG.pm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 GPG.pm diff --git a/GPG.pm b/GPG.pm new file mode 100644 index 0000000..21d56dc --- /dev/null +++ b/GPG.pm @@ -0,0 +1,15 @@ +package GPG; + +# GPG abstraction layer for encrypt/decrypt password database + +sub new { + my $class = shift; + + my $self = { + }; + + bless $self, $class; + return $self; +} + +1; \ No newline at end of file From 2423a6d942081b42e79d2dc258a0c941f0be3294 Mon Sep 17 00:00:00 2001 From: "Difrex(Denis Zheleztsov)" Date: Mon, 28 Apr 2014 12:04:17 +0400 Subject: [PATCH 07/22] check_config function --- Database.pm | 13 +++++++++---- Password.pm | 27 +++++++++++++++++++++++++-- pm.pl | 8 ++++++-- 3 files changed, 40 insertions(+), 8 deletions(-) diff --git a/Database.pm b/Database.pm index 102d930..8af5380 100644 --- a/Database.pm +++ b/Database.pm @@ -1,15 +1,16 @@ package Database; use DBI; +use GPG; sub new { my $class = shift; # Get home dir - my $home = $ENV{HOME}; + my $home = $ENV->{HOME}; my $self = { - _home => $home; + _home => $home, }; bless $self, $class; @@ -27,7 +28,7 @@ sub connect { } sub mdo { - my ($self) = @_; + my ($self, $query, $type) = @_; my $dbh = $self->{_dbh}; } @@ -37,7 +38,7 @@ sub create_base { my $pm_dir = $home."/.PM/"; # Check dir - if !(-d $pm_dir) { + if (!(-d $pm_dir)) { # Create dirrectory @mkdir_cmd = ("mkdir", "$pm_dir"); system(@mkdir_cmd) == 0 or die "Cannot create dir $pm_dir: $!\n"; @@ -50,6 +51,10 @@ sub create_base { my $dbh = DBI->connect("dbi:SQLite:dbname=$pm_dir/db.sqlite","",""); print "Create database schema\n"; my $q_table = "create table passwords(name VARCHAR(32), resource TEXT, password TEXT)"; + $dbh->do($q_table); + + # Encrypt db + # TODO: write this return 0; } diff --git a/Password.pm b/Password.pm index cd575f7..01f561f 100644 --- a/Password.pm +++ b/Password.pm @@ -6,15 +6,38 @@ use utf8; use Database; +use PasswordSave; +use PasswordShow; + sub new { my $class = shift; + my $db = Database->new(); + + my $p_save = PasswordSave->new(); + my $p_show = PasswordShow->new(); + my $self = { - _home => $home, + _db => $db, + _p_save => $p_save, + _p_show => $p_show, }; bless $self, $class; return $self; } -1; +# Check configuration. If it doesn't exist create it. +sub check_config { + my ($self) = @_; + if (-e $ENV->{HOME}."/.PM/db.sqlite") { + return 0; + } + else { + my $db = $self->{_db}; + $db->create_base(); + } + return 0; +} + +1; \ No newline at end of file diff --git a/pm.pl b/pm.pl index 5702d78..38a634c 100755 --- a/pm.pl +++ b/pm.pl @@ -3,7 +3,7 @@ use Password; use Getopt::Std; -our $VERSION = '0.0.0a'; +our $VERSION = '0.0.0b'; # Debug use Data::Dumper; @@ -53,4 +53,8 @@ sub init() { } # Parse cmd line -init(); \ No newline at end of file +init(); + +my $pass = Password->new(); +# Don't use it's before GPG and Database +# $pass->check_config() == 0 or die "$!\n"; \ No newline at end of file From dcb70474e398a0950933a4698244f92d33523708 Mon Sep 17 00:00:00 2001 From: "Difrex(Denis Zheleztsov)" Date: Mon, 28 Apr 2014 12:17:17 +0400 Subject: [PATCH 08/22] Start working on GPG module --- Database.pm | 80 ++++++++++++++++++++++++++++------------------------- Password.pm | 38 ++++++++++++------------- pm.pl | 24 ++++++++-------- 3 files changed, 75 insertions(+), 67 deletions(-) diff --git a/Database.pm b/Database.pm index 8af5380..88c3123 100644 --- a/Database.pm +++ b/Database.pm @@ -6,11 +6,14 @@ use GPG; sub new { my $class = shift; - # Get home dir - my $home = $ENV->{HOME}; + # Get home dir + my $home = $ENV->{HOME}; - my $self = { - _home => $home, + my $gpg = GPG->new(); + + my $self = { + _home => $home, + _gpg => $gpg, }; bless $self, $class; @@ -18,50 +21,53 @@ sub new { } sub connect { - my ($self) = @_; - my $home = $self->{_home}; - my $db_file = $home . "/.PM/db.sqlite"; - - my $dbh = DBI->connect("dbi:SQLite:dbname=$db_file","",""); + my ($self) = @_; + my $home = $self->{_home}; + my $db_file = $home . "/.PM/db.sqlite"; + + my $dbh = DBI->connect( "dbi:SQLite:dbname=$db_file", "", "" ); return $dbh; } sub mdo { - my ($self, $query, $type) = @_; - my $dbh = $self->{_dbh}; + my ( $self, $query, $type ) = @_; + my $dbh = $self->{_dbh}; } sub create_base { - my ($self) = @_; - my $home = $self->{_home}; - my $pm_dir = $home."/.PM/"; - - # Check dir - if (!(-d $pm_dir)) { - # Create dirrectory - @mkdir_cmd = ("mkdir", "$pm_dir"); - system(@mkdir_cmd) == 0 or die "Cannot create dir $pm_dir: $!\n"; + my ($self) = @_; + my $home = $self->{_home}; + my $pm_dir = $home . "/.PM/"; - # Create DB file - @createdb_cmd = ("touch", "$pm_dir/db.sqlite"); - system(@createdb_cmd) == 0 or die "Cannot create database file: $!\n"; + # Check dir + if ( !( -d $pm_dir ) ) { - # Create table. TODO: write this - my $dbh = DBI->connect("dbi:SQLite:dbname=$pm_dir/db.sqlite","",""); - print "Create database schema\n"; - my $q_table = "create table passwords(name VARCHAR(32), resource TEXT, password TEXT)"; - $dbh->do($q_table); + # Create dirrectory + my @mkdir_cmd = ( "mkdir", "$pm_dir" ); + system(@mkdir_cmd) == 0 or die "Cannot create dir $pm_dir: $!\n"; - # Encrypt db - # TODO: write this + # Create DB file + my @createdb_cmd = ( "touch", "$pm_dir/db.sqlite" ); + system(@createdb_cmd) == 0 or die "Cannot create database file: $!\n"; - return 0; - } - else { - print "Dirrectory is exist!\n"; - return 0; - } + # Create table. TODO: write this + my $dbh + = DBI->connect( "dbi:SQLite:dbname=$pm_dir/db.sqlite", "", "" ); + print "Create database schema\n"; + my $q_table + = "create table passwords(name VARCHAR(32), resource TEXT, password TEXT)"; + $dbh->do($q_table); + + # Encrypt db + # TODO: write this + + return 0; + } + else { + print "Dirrectory is exist!\n"; + return 0; + } } -1; \ No newline at end of file +1; diff --git a/Password.pm b/Password.pm index 01f561f..3a550d1 100644 --- a/Password.pm +++ b/Password.pm @@ -10,34 +10,34 @@ use PasswordSave; use PasswordShow; sub new { - my $class = shift; + my $class = shift; - my $db = Database->new(); + my $db = Database->new(); - my $p_save = PasswordSave->new(); - my $p_show = PasswordShow->new(); + my $p_save = PasswordSave->new(); + my $p_show = PasswordShow->new(); - my $self = { - _db => $db, - _p_save => $p_save, - _p_show => $p_show, + my $self = { + _db => $db, + _p_save => $p_save, + _p_show => $p_show, }; - + bless $self, $class; return $self; } # Check configuration. If it doesn't exist create it. sub check_config { - my ($self) = @_; - if (-e $ENV->{HOME}."/.PM/db.sqlite") { - return 0; - } - else { - my $db = $self->{_db}; - $db->create_base(); - } - return 0; + my ($self) = @_; + if ( -e $ENV->{HOME} . "/.PM/db.sqlite" ) { + return 0; + } + else { + my $db = $self->{_db}; + $db->create_base(); + } + return 0; } -1; \ No newline at end of file +1; diff --git a/pm.pl b/pm.pl index 38a634c..b2f564c 100755 --- a/pm.pl +++ b/pm.pl @@ -9,7 +9,7 @@ our $VERSION = '0.0.0b'; use Data::Dumper; sub usage() { - print STDERR << "EOF"; + print STDERR << "EOF"; Simple password manager writed in Perl. Usage: @@ -38,23 +38,25 @@ Examples: \tPassword copied to clipboard. Trying to open uri. EOF - exit 1; + exit 1; } sub init() { - my $opt_string = 'swn:l:p:rhv'; - getopts("$opt_string") or usage(); - our ($opt_s, $opt_w, $opt_n, $opt_r, - $opt_l, $opt_p, $opt_h, $opt_v); - - print "Simple password manager writed in Perl.\nVersion: ". - $VERSION."\n" and exit 0 if $opt_v; - usage if $opt_h; + my $opt_string = 'swn:l:p:rhv'; + getopts("$opt_string") or usage(); + our ( $opt_s, $opt_w, $opt_n, $opt_r, $opt_l, $opt_p, $opt_h, $opt_v ); + + print "Simple password manager writed in Perl.\nVersion: " + . $VERSION + . "\n" and exit 0 + if $opt_v; + usage if $opt_h; } # Parse cmd line init(); my $pass = Password->new(); + # Don't use it's before GPG and Database -# $pass->check_config() == 0 or die "$!\n"; \ No newline at end of file +# $pass->check_config() == 0 or die "$!\n"; From 58eea8d76c1df64b1c69e1b4eaeb580d27988ec2 Mon Sep 17 00:00:00 2001 From: "Difrex(Denis Zheleztsov)" Date: Mon, 28 Apr 2014 14:07:01 +0400 Subject: [PATCH 09/22] GPG module writed --- Database.pm | 24 +++++++++++------------ GPG.pm | 56 +++++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 62 insertions(+), 18 deletions(-) diff --git a/Database.pm b/Database.pm index 88c3123..7a68d7f 100644 --- a/Database.pm +++ b/Database.pm @@ -9,7 +9,7 @@ sub new { # Get home dir my $home = $ENV->{HOME}; - my $gpg = GPG->new(); + my $gpg = GPG->new($home); my $self = { _home => $home, @@ -21,24 +21,23 @@ sub new { } sub connect { - my ($self) = @_; - my $home = $self->{_home}; - my $db_file = $home . "/.PM/db.sqlite"; - + my ( $self, $db_file ) = @_; my $dbh = DBI->connect( "dbi:SQLite:dbname=$db_file", "", "" ); return $dbh; } sub mdo { - my ( $self, $query, $type ) = @_; - my $dbh = $self->{_dbh}; + my ( $self, $query, $type, $file ) = @_; + my $dbh = Database->connect(); } +# Create config dirrectory and DB if not exist sub create_base { my ($self) = @_; my $home = $self->{_home}; my $pm_dir = $home . "/.PM/"; + my $gpg = $self->{_gpg}; # Check dir if ( !( -d $pm_dir ) ) { @@ -47,20 +46,21 @@ sub create_base { my @mkdir_cmd = ( "mkdir", "$pm_dir" ); system(@mkdir_cmd) == 0 or die "Cannot create dir $pm_dir: $!\n"; + my $first_sqlite = '/tmp/db.sqlite'; + # Create DB file - my @createdb_cmd = ( "touch", "$pm_dir/db.sqlite" ); + my @createdb_cmd = ( "touch", "$first_sqlite" ); system(@createdb_cmd) == 0 or die "Cannot create database file: $!\n"; - # Create table. TODO: write this - my $dbh - = DBI->connect( "dbi:SQLite:dbname=$pm_dir/db.sqlite", "", "" ); + # Create table. + my $dbh = DBI->connect( "dbi:SQLite:dbname=$first_sqlite", "", "" ); print "Create database schema\n"; my $q_table = "create table passwords(name VARCHAR(32), resource TEXT, password TEXT)"; $dbh->do($q_table); # Encrypt db - # TODO: write this + $gpg->encrypt_db($first_sqlite); return 0; } diff --git a/GPG.pm b/GPG.pm index 21d56dc..96866e6 100644 --- a/GPG.pm +++ b/GPG.pm @@ -1,15 +1,59 @@ +# GPG layer for encrypt/decrypt passwords database package GPG; -# GPG abstraction layer for encrypt/decrypt password database +our $gpg = '/usr/bin/gpg'; sub new { - my $class = shift; + my $class = shift; + + my $home = shift; + my $db = $home . "/.PM/db.sqlite"; + + # Get default private key + + my $self = { _db => $db, }; - my $self = { - }; - bless $self, $class; return $self; } -1; \ No newline at end of file +# Encrypt sqlite database with default key +# and save it in config dir +sub encrypt_db { + my ( $self, $file ) = @_; + my $db = $self->{_db}; + + # gpg --output test.gpg --encrypt -a --default-recipient-self test + @enc_cmd = ( + "$gpg", "--output", + "$db", "--encrypt", + "-a", "--default-recipient-self", + "$file" + ); + system(@enc_cmd) == 0 or die "Cannot encrypt! $!\n"; + + # Remove unencrypted file + @rm_cmd = ( "rm", "$file" ); + system(@rm_cmd) == 0 or die "Cannot remove file $file: $!\n"; +} + +# Decrypt database, save it in new place +# and return path to file +sub decrypt_db { + my ($self) = @_; + my $db = $self->{_db}; + + # Generate random file name + my @chars = ( "A" .. "Z", "a" .. "z" ); + my $string; + $string .= $chars[ rand @chars ] for 1 .. 10; + my $file = '/tmp/' . 'pm.' . $string; + + # gpg --output /tmp/decryptfile --decrypt $db + @dec_cmd = ( "$gpg", "--decrypt", "$db", "--output", "$file" ); + system(@sys_dec_cmd) == 0 or die "Cannot decrypt $db: $!\n"; + + return $file; +} + +1; From a634700cf3b1e9f82984cb258209c49d4b04f899 Mon Sep 17 00:00:00 2001 From: "Difrex(Denis Zheleztsov)" Date: Mon, 28 Apr 2014 16:12:07 +0400 Subject: [PATCH 10/22] Clipboard module --- Clip.pm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 Clip.pm diff --git a/Clip.pm b/Clip.pm new file mode 100644 index 0000000..a6017e8 --- /dev/null +++ b/Clip.pm @@ -0,0 +1,28 @@ +package Clip; + +use Clipboard; + +sub new { + my $class = shift; + + my $self = { _password => shift, }; + + bless $self, $class; + return $self; +} + +sub copy { + my ($self) = @_; + my $password = $self->{_password}; + + if ( 'Clipboard::Xclip' eq $Clipboard::driver ) { + no warnings 'redefine'; + *Clipboard::Xclip::all_selections = sub { + qw(clipboard primary buffer secondary); + }; + } + + Clipboard->copy("$password"); +} + +1; From e4de44a9b4a18605826570a6d541ead9fd19a575 Mon Sep 17 00:00:00 2001 From: "Difrex(Denis Zheleztsov)" Date: Mon, 28 Apr 2014 16:13:19 +0400 Subject: [PATCH 11/22] Some fixes --- GPG.pm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/GPG.pm b/GPG.pm index 96866e6..9fd7b6e 100644 --- a/GPG.pm +++ b/GPG.pm @@ -9,8 +9,6 @@ sub new { my $home = shift; my $db = $home . "/.PM/db.sqlite"; - # Get default private key - my $self = { _db => $db, }; bless $self, $class; @@ -23,6 +21,10 @@ sub encrypt_db { my ( $self, $file ) = @_; my $db = $self->{_db}; + # Remove old database + @rm_db = ( "rm", "-f", "$db" ); + system(@rm_db) == 0 or die "Cannot remove old database: $!\n"; + # gpg --output test.gpg --encrypt -a --default-recipient-self test @enc_cmd = ( "$gpg", "--output", @@ -30,11 +32,14 @@ sub encrypt_db { "-a", "--default-recipient-self", "$file" ); - system(@enc_cmd) == 0 or die "Cannot encrypt! $!\n"; + system(@enc_cmd) == 0 + or die "Cannot encrypt!\nDecrypted file: $file\nTraceback: $!\n"; # Remove unencrypted file - @rm_cmd = ( "rm", "$file" ); + @rm_cmd = ( "rm", "-f", "$file" ); system(@rm_cmd) == 0 or die "Cannot remove file $file: $!\n"; + + return 0; } # Decrypt database, save it in new place From 89920df7096db0bf874c7cafd7ea1333910897f3 Mon Sep 17 00:00:00 2001 From: "Difrex(Denis Zheleztsov)" Date: Mon, 28 Apr 2014 16:14:23 +0400 Subject: [PATCH 12/22] Query proccessing mechanism writed --- Database.pm | 35 ++++++++++++++++++++++++++++++++--- Password.pm | 34 ++++++++++++++++++++++++++++++++-- README.md | 6 ++++++ pm.pl | 2 +- 4 files changed, 71 insertions(+), 6 deletions(-) diff --git a/Database.pm b/Database.pm index 7a68d7f..ef1f99e 100644 --- a/Database.pm +++ b/Database.pm @@ -7,7 +7,7 @@ sub new { my $class = shift; # Get home dir - my $home = $ENV->{HOME}; + my $home = $ENV{HOME}; my $gpg = GPG->new($home); @@ -27,9 +27,38 @@ sub connect { return $dbh; } +# Query proccessing mechanism sub mdo { - my ( $self, $query, $type, $file ) = @_; - my $dbh = Database->connect(); + my ( $self, $query ) = @_; + my $db_file = $query->{file}; + my $q = $query->{query}; + my $name = $query->{name}; + my $type = $query->{type}; + + my $dbh = Database->connect($db_file); + + # Select + if ( $type eq 'select' ) { + my $sth = $dbh->prepare($q); + $sth->execute(); + my ( $name, $resource, $password ) = $sth->fetchrow_array(); + + my $q_hash = { + name => $name, + resource => $resource, + password => $password, + }; + return $q_hash; + } + elsif ( $type eq 'do' ) { + $dbh->do($q); + return 0; + } + else { + print STDERR "Something went wrong! $!\n"; + return 1; + } + return 1; } # Create config dirrectory and DB if not exist diff --git a/Password.pm b/Password.pm index 3a550d1..0c6bc98 100644 --- a/Password.pm +++ b/Password.pm @@ -5,6 +5,7 @@ use warnings; use utf8; use Database; +use GPG; use PasswordSave; use PasswordShow; @@ -12,13 +13,15 @@ use PasswordShow; sub new { my $class = shift; - my $db = Database->new(); + my $db = Database->new(); + my $gpg = GPG->new( $ENV{HOME} ); my $p_save = PasswordSave->new(); my $p_show = PasswordShow->new(); my $self = { _db => $db, + _gpg => $gpg, _p_save => $p_save, _p_show => $p_show, }; @@ -27,10 +30,37 @@ sub new { return $self; } +sub show { + my ( $self, $name ) = @_; + my $db_class = $self->{_db}; + my $gpg = $self->{_gpg}; + + # Decrypt db + my $dec_db_file = $gpg->decrypt_db(); + + # Query + my $query_string + = "select name, resource, password from passwords where name='$name'"; + + my $mdo_q = { + file => $dec_db_file, + query => $query_string, + name => $name, + type => 'select', + }; + my $q_hash = $db_class->mdo($mdo_q); + + # Remove unencrypted file + @rm_cmd = ( "rm", "$dec_db_file" ); + system(@rm_cmd) == 0 or die "Cannot remove unencrypted database! $!\n"; + + return $q_hash; +} + # Check configuration. If it doesn't exist create it. sub check_config { my ($self) = @_; - if ( -e $ENV->{HOME} . "/.PM/db.sqlite" ) { + if ( -e $ENV{HOME} . "/.PM/db.sqlite" ) { return 0; } else { diff --git a/README.md b/README.md index bb8166c..869d98f 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,9 @@ PM == Simple password manager writed in perl. + +TODO +==== + +* Store decrypted DB into RAM not in /tmp/ +* Different keys selection \ No newline at end of file diff --git a/pm.pl b/pm.pl index b2f564c..671168d 100755 --- a/pm.pl +++ b/pm.pl @@ -3,7 +3,7 @@ use Password; use Getopt::Std; -our $VERSION = '0.0.0b'; +our $VERSION = '0.0.0c'; # Debug use Data::Dumper; From 167cad4b92e76932cb54ee03da4308fc3f5457c0 Mon Sep 17 00:00:00 2001 From: "Difrex(Denis Zheleztsov)" Date: Mon, 28 Apr 2014 16:37:19 +0400 Subject: [PATCH 13/22] AUTHORS file --- AUTHORS | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 AUTHORS diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..ac56141 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,3 @@ +Denis a.k.a Difrex Zheleztsov +mailto://difrex.punk@gmail.com/ +copyleft 2014 \ No newline at end of file From 7552e700817c84e0d4b69aaae8237b41cea1bc92 Mon Sep 17 00:00:00 2001 From: "Difrex(Denis Zheleztsov)" Date: Mon, 28 Apr 2014 16:43:00 +0400 Subject: [PATCH 14/22] Small fix --- AUTHORS | 2 +- Password.pm | 2 +- pm.pl | 25 +++++++++++++------------ 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/AUTHORS b/AUTHORS index ac56141..2789be8 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,3 +1,3 @@ Denis a.k.a Difrex Zheleztsov mailto://difrex.punk@gmail.com/ -copyleft 2014 \ No newline at end of file +copyleft 2014 diff --git a/Password.pm b/Password.pm index 0c6bc98..ca2216e 100644 --- a/Password.pm +++ b/Password.pm @@ -51,7 +51,7 @@ sub show { my $q_hash = $db_class->mdo($mdo_q); # Remove unencrypted file - @rm_cmd = ( "rm", "$dec_db_file" ); + my @rm_cmd = ( "rm", "-f", "$dec_db_file" ); system(@rm_cmd) == 0 or die "Cannot remove unencrypted database! $!\n"; return $q_hash; diff --git a/pm.pl b/pm.pl index 671168d..192f4a5 100755 --- a/pm.pl +++ b/pm.pl @@ -3,7 +3,7 @@ use Password; use Getopt::Std; -our $VERSION = '0.0.0c'; +our $VERSION = '0.0.0d'; # Debug use Data::Dumper; @@ -12,22 +12,23 @@ sub usage() { print STDERR << "EOF"; Simple password manager writed in Perl. -Usage: - -s -- Show password - -n [Name of resource] -- Name of resource - -w -- Store new password - -l [Link] -- Link to resource - -p [Password] -- Password - -r -- Remove password - -o -- Open link - -h -- Show this help screen and exit - -v -- Show version info and exit + -s show password + -n [Name of resource] name of resource + -w store new password + -l [Link] link to resource + -p [Password] password + if key not selected PM generate secure password + and copy it to xclipboard + -r remove password + -o open link + -h show this help screen and exit + -v show version info and exit Examples: Show password for resource: \tpm.pl -s -n LOR - \tPassword copied to xclipboard.\n\t\tLink is http://linux.org.ru/ + \tPassword copied to xclipboard.\n\t\tURI is http://linux.org.ru/ Store new password: \tpm.pl -w -n PRON -l http://superpronsite.com/ -p my_secret_password From 085d0a72220d65a8881926eaf0c48147267e15e8 Mon Sep 17 00:00:00 2001 From: "Difrex(Denis Zheleztsov)" Date: Tue, 29 Apr 2014 11:37:41 +0400 Subject: [PATCH 15/22] mdo and save/store writed --- Database.pm | 2 +- Password.pm | 43 +++++++++++++++++++++++++++++++++++++++++-- pm.pl | 4 ++-- 3 files changed, 44 insertions(+), 5 deletions(-) diff --git a/Database.pm b/Database.pm index ef1f99e..72a2784 100644 --- a/Database.pm +++ b/Database.pm @@ -51,7 +51,7 @@ sub mdo { return $q_hash; } elsif ( $type eq 'do' ) { - $dbh->do($q); + $dbh->do($q) or die "$!\n"; return 0; } else { diff --git a/Password.pm b/Password.pm index ca2216e..4c7f753 100644 --- a/Password.pm +++ b/Password.pm @@ -22,8 +22,6 @@ sub new { my $self = { _db => $db, _gpg => $gpg, - _p_save => $p_save, - _p_show => $p_show, }; bless $self, $class; @@ -57,6 +55,47 @@ sub show { return $q_hash; } +# Decrypt base and store new password +sub save { + my ( $self, $store ) = @_; + my $db_class = $self->{_db}; + my $gpg = $self->{_gpg}; + + my $name = $store->{name}; + my $resource = $store->{resource}; + my $password = $store->{password}; + my $generate = $store->{gen}; + + if ( $generate == 1 ) { + $password = Password->generate(); + } + + # Decrypt database + my $dec_db_file = $gpg->decrypt_db(); + my $q + = "insert into passwords(name, resource, password) values($name, $resource, $password)"; + my $mdo_q = { + file => $dec_db_file, + name => $name, + query => $query, + type => 'do', + }; + + $db_class->mdo($mdo_q); + $gpg->encrypt_db($dec_db_file); + + return 0; +} + +# Generate password +sub generate { + my @chars = ( "A" .. "Z", "a" .. "z", 0 .. 9 ); + my $string; + $string .= $chars[ rand @chars ] for 1 .. 16; + + return $string; +} + # Check configuration. If it doesn't exist create it. sub check_config { my ($self) = @_; diff --git a/pm.pl b/pm.pl index 192f4a5..e71679c 100755 --- a/pm.pl +++ b/pm.pl @@ -3,7 +3,7 @@ use Password; use Getopt::Std; -our $VERSION = '0.0.0d'; +our $VERSION = '0.0.1a'; # Debug use Data::Dumper; @@ -45,7 +45,7 @@ EOF sub init() { my $opt_string = 'swn:l:p:rhv'; getopts("$opt_string") or usage(); - our ( $opt_s, $opt_w, $opt_n, $opt_r, $opt_l, $opt_p, $opt_h, $opt_v ); + our ( $opt_s, $opt_w, $opt_n, $opt_r, $opt_l, $opt_p, $opt_h, $opt_v, $opt_o ); print "Simple password manager writed in Perl.\nVersion: " . $VERSION From d6ccfabdb3e611b6a35d2f7c3517ffc616830b21 Mon Sep 17 00:00:00 2001 From: "Difrex(Denis Zheleztsov)" Date: Tue, 29 Apr 2014 11:39:27 +0400 Subject: [PATCH 16/22] Remove empty(not needed) modules --- Password.pm | 3 --- PasswordSave.pm | 12 ------------ PasswordShow.pm | 14 -------------- 3 files changed, 29 deletions(-) delete mode 100644 PasswordSave.pm delete mode 100644 PasswordShow.pm diff --git a/Password.pm b/Password.pm index 4c7f753..2259451 100644 --- a/Password.pm +++ b/Password.pm @@ -7,9 +7,6 @@ use utf8; use Database; use GPG; -use PasswordSave; -use PasswordShow; - sub new { my $class = shift; diff --git a/PasswordSave.pm b/PasswordSave.pm deleted file mode 100644 index a82967f..0000000 --- a/PasswordSave.pm +++ /dev/null @@ -1,12 +0,0 @@ -package PasswordSave; - -sub new { - my $class = shift; - my $self = { - _name => shift, - }; - bless $self, $class; - return $self; -} - -1; \ No newline at end of file diff --git a/PasswordShow.pm b/PasswordShow.pm deleted file mode 100644 index a73d023..0000000 --- a/PasswordShow.pm +++ /dev/null @@ -1,14 +0,0 @@ -package PasswordShow; - -sub new { - my $class = shift; - my $self = { - _name => shift, - }; - bless $self, $class; - return $self; -} - - - -1; \ No newline at end of file From 77ff0e98f10ed6f2bfc6ba56fe511890bfd7b8d5 Mon Sep 17 00:00:00 2001 From: "Difrex(Denis Zheleztsov)" Date: Tue, 29 Apr 2014 15:45:31 +0400 Subject: [PATCH 17/22] Start working on main --- Clip.pm => ClipPass.pm | 2 +- Password.pm | 13 ++++++------ pm.pl | 45 ++++++++++++++++++++++++++++++++++++++---- 3 files changed, 48 insertions(+), 12 deletions(-) rename Clip.pm => ClipPass.pm (96%) diff --git a/Clip.pm b/ClipPass.pm similarity index 96% rename from Clip.pm rename to ClipPass.pm index a6017e8..cc14d01 100644 --- a/Clip.pm +++ b/ClipPass.pm @@ -1,4 +1,4 @@ -package Clip; +package ClipPass; use Clipboard; diff --git a/Password.pm b/Password.pm index 2259451..b975f48 100644 --- a/Password.pm +++ b/Password.pm @@ -13,12 +13,9 @@ sub new { my $db = Database->new(); my $gpg = GPG->new( $ENV{HOME} ); - my $p_save = PasswordSave->new(); - my $p_show = PasswordShow->new(); - my $self = { - _db => $db, - _gpg => $gpg, + _db => $db, + _gpg => $gpg, }; bless $self, $class; @@ -74,7 +71,7 @@ sub save { my $mdo_q = { file => $dec_db_file, name => $name, - query => $query, + query => $q, type => 'do', }; @@ -102,8 +99,10 @@ sub check_config { else { my $db = $self->{_db}; $db->create_base(); + + return 0; } - return 0; + return 1; } 1; diff --git a/pm.pl b/pm.pl index e71679c..91a948b 100755 --- a/pm.pl +++ b/pm.pl @@ -2,12 +2,13 @@ use Password; use Getopt::Std; - -our $VERSION = '0.0.1a'; +use ClipPass; # Debug use Data::Dumper; +our $VERSION = '0.0.1a'; + sub usage() { print STDERR << "EOF"; Simple password manager writed in Perl. @@ -43,9 +44,12 @@ EOF } sub init() { - my $opt_string = 'swn:l:p:rhv'; + my $opt_string = 'swn:l:p:rhvo'; getopts("$opt_string") or usage(); - our ( $opt_s, $opt_w, $opt_n, $opt_r, $opt_l, $opt_p, $opt_h, $opt_v, $opt_o ); + our ( + $opt_s, $opt_w, $opt_n, $opt_r, $opt_l, + $opt_p, $opt_h, $opt_v, $opt_o + ); print "Simple password manager writed in Perl.\nVersion: " . $VERSION @@ -61,3 +65,36 @@ my $pass = Password->new(); # Don't use it's before GPG and Database # $pass->check_config() == 0 or die "$!\n"; + +my $copy = ClipPass->new(); + +# Command line arguments switch +if ( defined($opt_s) and defined($opt_n) and !defined($opt_o) ) { + + # Copy password to xclipboard + print "$opt_s, $opt_n\n"; +} +elsif ( defined($opt_s) and defined($opt_n) and defined($opt_o) ) { + + # Copy password to xclipboard and open the uri + print "$opt_s, $opt_n, $opt_o\n"; +} +elsif ( defined($opt_w) + and defined($opt_n) + and defined($opt_l) + and !defined($opt_p) ) +{ + # Generate password and store it into DB + print "$opt_w, $opt_n, $opt_l, $opt_p\n"; +} +elsif ( defined($opt_w) + and defined($opt_n) + and defined($opt_l) + and defined($opt_p) ) +{ + # Store new password into DB + print "$opt_w, $opt_n, $opt_l, $opt_p\n"; +} +else { + print "FAIL\n" and usage; +} From a2d3c362f5413eb7e060974ea0f37ffbc41b1d14 Mon Sep 17 00:00:00 2001 From: Drisch Date: Mon, 5 May 2014 22:37:59 +0400 Subject: [PATCH 18/22] Readme update --- README.md | 20 ++++++++++++++++++++ pm.pl | 6 +++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 869d98f..8ce3e7c 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,26 @@ PM Simple password manager writed in perl. +== INSTALL == + +=== Perl modules === + + cpan install Module::Name. + +Not recommended. Please use you package manager. + +* DBD::sqlite +* Clipboard + +On Fedora: + + yum/dnf install perl-Class-DBI-SQLite perl-Clipboard + +On Debian-based systems: + + I'm don't have it now. + + TODO ==== diff --git a/pm.pl b/pm.pl index 91a948b..5d12b36 100755 --- a/pm.pl +++ b/pm.pl @@ -58,14 +58,14 @@ sub init() { usage if $opt_h; } -# Parse cmd line -init(); - my $pass = Password->new(); # Don't use it's before GPG and Database # $pass->check_config() == 0 or die "$!\n"; +# Parse cmd line +init(); + my $copy = ClipPass->new(); # Command line arguments switch From 8f4618b8cbce27e8042c4119c1e8e110771ac310 Mon Sep 17 00:00:00 2001 From: Difrex Date: Mon, 5 May 2014 22:55:27 +0400 Subject: [PATCH 19/22] Show password now must be worked. But I'm not tested it. --- README.md | 9 +++++---- pm.pl | 19 ++++++++++++++----- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 8ce3e7c..f2ad4bc 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,11 @@ PM Simple password manager writed in perl. -== INSTALL == - -=== Perl modules === +INSTALL +======= +Perl modules +=== cpan install Module::Name. Not recommended. Please use you package manager. @@ -20,7 +21,7 @@ On Fedora: On Debian-based systems: - I'm don't have it now. + I'm don't have it now :) TODO diff --git a/pm.pl b/pm.pl index 5d12b36..7b04a1c 100755 --- a/pm.pl +++ b/pm.pl @@ -7,7 +7,7 @@ use ClipPass; # Debug use Data::Dumper; -our $VERSION = '0.0.1a'; +our $VERSION = '0.0.1b'; sub usage() { print STDERR << "EOF"; @@ -69,15 +69,24 @@ init(); my $copy = ClipPass->new(); # Command line arguments switch +# It's really ugly code. Sorry :( if ( defined($opt_s) and defined($opt_n) and !defined($opt_o) ) { - # Copy password to xclipboard - print "$opt_s, $opt_n\n"; + my $get_h = $pass->show($opt_n); + $copy->copy($get_h->{password}); + + print "Password copied to xclipboard.\nURI is " . $get_h->{resource}; } elsif ( defined($opt_s) and defined($opt_n) and defined($opt_o) ) { - # Copy password to xclipboard and open the uri - print "$opt_s, $opt_n, $opt_o\n"; + my $get_h = $pass->show($opt_n); + $copy->copy($get_h->{password}); + + # Open resource. + my @open_cmd = ('xdg-open', $get_h->{resource}); + system(@open_cmd) == 0 or die "Cannot open URI: $!\n"; + + print "Password copied to clipboard. Trying to open uri.\n"; } elsif ( defined($opt_w) and defined($opt_n) From a7b4f7bf8e9686bea253f0650ca50ccb96db154b Mon Sep 17 00:00:00 2001 From: Difrex Date: Mon, 5 May 2014 23:42:09 +0400 Subject: [PATCH 20/22] Readme update --- README.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index f2ad4bc..c82c8ba 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,10 @@ PM Simple password manager writed in perl. -INSTALL -======= +# INSTALL + +## Perl modules -Perl modules -=== cpan install Module::Name. Not recommended. Please use you package manager. @@ -21,11 +20,10 @@ On Fedora: On Debian-based systems: - I'm don't have it now :) + apt-get install libtext-clip-perl class-dbi-sqlite-perl -TODO -==== +# TODO * Store decrypted DB into RAM not in /tmp/ * Different keys selection \ No newline at end of file From ea307156d8a3950acc13646cf72637b9119e746b Mon Sep 17 00:00:00 2001 From: Difrex Date: Mon, 5 May 2014 23:51:31 +0400 Subject: [PATCH 21/22] Done. Not all. Not tested. --- pm.pl | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pm.pl b/pm.pl index 7b04a1c..4c202d8 100755 --- a/pm.pl +++ b/pm.pl @@ -7,7 +7,7 @@ use ClipPass; # Debug use Data::Dumper; -our $VERSION = '0.0.1b'; +our $VERSION = '0.0.1c'; sub usage() { print STDERR << "EOF"; @@ -95,6 +95,14 @@ elsif ( defined($opt_w) { # Generate password and store it into DB print "$opt_w, $opt_n, $opt_l, $opt_p\n"; + + my $store_h = { + name => $opt_n, + resource => $opt_l, + gen => 1, + }; + + $pass->save($store_h) == 0 or die "Oops! 105: pm.pl. $!\n"; } elsif ( defined($opt_w) and defined($opt_n) @@ -103,6 +111,15 @@ elsif ( defined($opt_w) { # Store new password into DB print "$opt_w, $opt_n, $opt_l, $opt_p\n"; + + my $store_h = { + name => $opt_n, + resource => $opt_l, + password => $opt_p, + gen => 0, + }; + + $pass->save($store_h) == 0 or die "Oops! 122: pm.pl. $!\n"; } else { print "FAIL\n" and usage; From 992d7268ef889ad11f477a474da3590a234fdcad Mon Sep 17 00:00:00 2001 From: Difrex Date: Tue, 6 May 2014 00:40:26 +0400 Subject: [PATCH 22/22] First buggy but worked version :) --- ClipPass.pm | 5 ++--- Database.pm | 11 +++++++++-- GPG.pm | 21 ++++++++++++--------- Password.pm | 7 ++++++- pm.pl | 10 ++++++---- 5 files changed, 35 insertions(+), 19 deletions(-) diff --git a/ClipPass.pm b/ClipPass.pm index cc14d01..83d1206 100644 --- a/ClipPass.pm +++ b/ClipPass.pm @@ -5,15 +5,14 @@ use Clipboard; sub new { my $class = shift; - my $self = { _password => shift, }; + my $self = {}; bless $self, $class; return $self; } sub copy { - my ($self) = @_; - my $password = $self->{_password}; + my ( $self, $password ) = @_; if ( 'Clipboard::Xclip' eq $Clipboard::driver ) { no warnings 'redefine'; diff --git a/Database.pm b/Database.pm index 72a2784..8744fe7 100644 --- a/Database.pm +++ b/Database.pm @@ -3,6 +3,8 @@ package Database; use DBI; use GPG; +use Password; + sub new { my $class = shift; @@ -51,7 +53,7 @@ sub mdo { return $q_hash; } elsif ( $type eq 'do' ) { - $dbh->do($q) or die "$!\n"; + $dbh->do("$q") or die "$!\n"; return 0; } else { @@ -72,15 +74,19 @@ sub create_base { if ( !( -d $pm_dir ) ) { # Create dirrectory + print "Creating configuration dirrectory...\n"; my @mkdir_cmd = ( "mkdir", "$pm_dir" ); system(@mkdir_cmd) == 0 or die "Cannot create dir $pm_dir: $!\n"; - my $first_sqlite = '/tmp/db.sqlite'; + my $pass = Password->new(); + my $string = $pass->generate(); + my $first_sqlite = "/tmp/$string"; # Create DB file my @createdb_cmd = ( "touch", "$first_sqlite" ); system(@createdb_cmd) == 0 or die "Cannot create database file: $!\n"; + print "Creating database...\n"; # Create table. my $dbh = DBI->connect( "dbi:SQLite:dbname=$first_sqlite", "", "" ); print "Create database schema\n"; @@ -88,6 +94,7 @@ sub create_base { = "create table passwords(name VARCHAR(32), resource TEXT, password TEXT)"; $dbh->do($q_table); + print "Encrypt database...\n"; # Encrypt db $gpg->encrypt_db($first_sqlite); diff --git a/GPG.pm b/GPG.pm index 9fd7b6e..890ce18 100644 --- a/GPG.pm +++ b/GPG.pm @@ -1,12 +1,13 @@ # GPG layer for encrypt/decrypt passwords database package GPG; -our $gpg = '/usr/bin/gpg'; +# Debug +use Data::Dumper; sub new { my $class = shift; - my $home = shift; + my $home = $ENV{HOME}; my $db = $home . "/.PM/db.sqlite"; my $self = { _db => $db, }; @@ -25,13 +26,13 @@ sub encrypt_db { @rm_db = ( "rm", "-f", "$db" ); system(@rm_db) == 0 or die "Cannot remove old database: $!\n"; - # gpg --output test.gpg --encrypt -a --default-recipient-self test + # gpg --output test.gpg --encrypt test -a --default-recipient-self @enc_cmd = ( - "$gpg", "--output", - "$db", "--encrypt", - "-a", "--default-recipient-self", - "$file" + "gpg", "--output", "$db", + "-a", "--default-recipient-self", + "--encrypt", "$file", ); + system(@enc_cmd) == 0 or die "Cannot encrypt!\nDecrypted file: $file\nTraceback: $!\n"; @@ -48,6 +49,8 @@ sub decrypt_db { my ($self) = @_; my $db = $self->{_db}; + my $gpg = '/usr/bin/gpg'; + # Generate random file name my @chars = ( "A" .. "Z", "a" .. "z" ); my $string; @@ -55,8 +58,8 @@ sub decrypt_db { my $file = '/tmp/' . 'pm.' . $string; # gpg --output /tmp/decryptfile --decrypt $db - @dec_cmd = ( "$gpg", "--decrypt", "$db", "--output", "$file" ); - system(@sys_dec_cmd) == 0 or die "Cannot decrypt $db: $!\n"; + @dec_cmd = ( "$gpg", "--output", "$file", "--decrypt", "$db" ); + system(@dec_cmd) == 0 or die "Cannot decrypt $db: $!\n"; return $file; } diff --git a/Password.pm b/Password.pm index b975f48..b4570f0 100644 --- a/Password.pm +++ b/Password.pm @@ -7,6 +7,9 @@ use utf8; use Database; use GPG; +# Debug +use Data::Dumper; + sub new { my $class = shift; @@ -67,7 +70,8 @@ sub save { # Decrypt database my $dec_db_file = $gpg->decrypt_db(); my $q - = "insert into passwords(name, resource, password) values($name, $resource, $password)"; + = "insert into passwords(name, resource, password) + values('$name', '$resource', '$password')"; my $mdo_q = { file => $dec_db_file, name => $name, @@ -100,6 +104,7 @@ sub check_config { my $db = $self->{_db}; $db->create_base(); + print "Done!\n"; return 0; } return 1; diff --git a/pm.pl b/pm.pl index 4c202d8..01574a3 100755 --- a/pm.pl +++ b/pm.pl @@ -7,7 +7,7 @@ use ClipPass; # Debug use Data::Dumper; -our $VERSION = '0.0.1c'; +our $VERSION = '0.0.1-alpha'; sub usage() { print STDERR << "EOF"; @@ -61,7 +61,7 @@ sub init() { my $pass = Password->new(); # Don't use it's before GPG and Database -# $pass->check_config() == 0 or die "$!\n"; +$pass->check_config() == 0 or die "$!\n"; # Parse cmd line init(); @@ -73,9 +73,11 @@ my $copy = ClipPass->new(); if ( defined($opt_s) and defined($opt_n) and !defined($opt_o) ) { my $get_h = $pass->show($opt_n); - $copy->copy($get_h->{password}); + my $get_pass = $get_h->{password}; - print "Password copied to xclipboard.\nURI is " . $get_h->{resource}; + $copy->copy($get_pass); + + print "Password copied to xclipboard.\nURI is " . $get_h->{resource} . "\n"; } elsif ( defined($opt_s) and defined($opt_n) and defined($opt_o) ) {