diff options
40 files changed, 1483 insertions, 25 deletions
diff --git a/LICENSE.schleuder b/LICENSE.schleuder new file mode 100644 index 0000000..d511905 --- /dev/null +++ b/LICENSE.schleuder @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) 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 +this service 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 make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. 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. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the 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 a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE 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. + + 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 +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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 2 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, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision 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, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This 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. @@ -10,11 +10,11 @@ Requirements Keyringer needs: - - Bash - http://tiswww.case.edu/php/chet/bash/bashtop.html - - Git - http://git-scm.com - - GNU Privacy Guard - http://gnupg.org - - OpenSSL - http://www.openssl.org - - Grep, awk, tail, cut, sed and other GNU tools + - Ruby + - Rubygems and the following gems: + - git + - gpgme + - parseconfig Installation ------------ @@ -217,7 +217,7 @@ There are lots of things that can be enhanced, like: - Hidden recipient support (including recipients file). - - Rewrite using an object-oriented programming language? + - Rewrite using an object-oriented programming language. - Tab completion subcommand support for popular shells like bash. @@ -229,8 +229,3 @@ There are lots of things that can be enhanced, like: - List available subommands. -Development ------------ - -Developers needed! :) - diff --git a/bin/keyringer b/bin/keyringer new file mode 100755 index 0000000..fa569ff --- /dev/null +++ b/bin/keyringer @@ -0,0 +1,48 @@ +#!/usr/bin/env ruby +# +# Keyringer key management system. +# +# Copyright (C) 2011 Keyringer Development Team. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +# TODO +# - a lot of things + +$:.unshift File.dirname(__FILE__) + '/../lib' +require 'keyringer' + +begin + Keyringer::Parser.new + puts "Performing action #{$action.capitalize}" + begin + action = Keyringer::Actions.const_get($action.capitalize) + rescue NameError + wrapper = Keyringer::BashWrapper.new + wrapper.execute + else + if action.is_a?(Class) + instance = action.new + output = instance.execute + puts output + end + end +rescue SystemExit => e + exit e.status +rescue Exception => e + puts "Fatal error: #{e.inspect}" + puts e.backtrace.join("\n") + + exit 1 +end @@ -134,7 +134,7 @@ ACTIONS="`dirname $(readlink -f $0)`/share/$NAME" export PREFERENCES="`dirname $CONFIG`/$KEYRING" # Load functions -LIB="`dirname $(readlink -f $0)`/lib/$NAME/functions" +LIB="`dirname $(readlink -f $0)`/lib/bash/functions" source "$LIB" || exit 1 # Setup main configuration and load preferences diff --git a/lib/backend.rb b/lib/backend.rb new file mode 100644 index 0000000..76abd01 --- /dev/null +++ b/lib/backend.rb @@ -0,0 +1,32 @@ +#!/usr/bin/env ruby +# +# Keyringer secret management system. +# +# Copyright (C) 2011 Keyringer Development Team. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +# gems +require 'rubygems' +require 'parseconfig' +require 'git' + +# internal requires +$:.unshift File.dirname(__FILE__) +require 'backend/fs' +require 'backend/git' +require 'backend/crypt' +require 'backend/recipients_store' +require 'backend/parse_config' diff --git a/lib/backend/crypt.rb b/lib/backend/crypt.rb new file mode 100644 index 0000000..2f00515 --- /dev/null +++ b/lib/backend/crypt.rb @@ -0,0 +1,159 @@ +# This code is based on the library from http://schleuder2.nadir.org/ +require 'gpgme' + +module Backend + # Wrapper for ruby-gpgme. Method naming is not strictly logical, this might + # change but aliases will be set up then. + class Crypt + # Instantiates and stores password + def initialize(password) + @password = password + @ctx = GPGME::Ctx.new + # feed the passphrase into the Context + @ctx.set_passphrase_cb(method(:passfunc)) + end + + # TODO: use a logging facility + def debug(message) + puts message + end + + # TODO: use a logging facility + def error(message) + puts message + end + + # Verify a gpg-signature. Use +signed_string+ if the signature is + # detached. Returns a GPGME::SignatureResult + def verify(sig, signed_string='') + in_signed = '' + if signed_string.empty? + # verify +sig+ as cleartext (aka pgp/inline) signature + debug 'No extra signed_string, verifying cleartext signature' + output = GPGME.verify(sig) do |sig| + in_signed = sig + end + else + # verify detached signature + debug 'Verifying detached signature' + # Don't know why we need a GPGME::Data object this time but without gpgme throws exceptions + plain = GPGME::Data.new + GPGME.verify(sig, signed_string, plain) do |sig| + in_signed = sig + end + output = signed_string + + end + debug 'verify_result: ' + in_signed.inspect + + [output, in_signed] + end + + # Decrypt a string. + def decrypt(str) + output = "" + in_encrypted = nil + in_signed = nil + + # TODO: return ciphertext if missing key. Sensible e.g. if it is part + # of a nested MIME-message and encrypted to someone else on purpose. + # Breaking if even the whole message is not decryptable is a job for + # the processor. + + # return input instead of empty String if not encrypted + unless str =~ /^-----BEGIN PGP MESSAGE-----/ + # match pgp-mime- and inline-pgp-signatures + if str =~ /^-----BEGIN PGP SIG/ + debug 'found signed, not encrypted message, verifying' + output, in_signed = verify(str) + else + debug 'found not signed, not encrypted message, returning input' + output = str + end + else + debug 'found pgp content, decrypting and verifying with gpgme' + in_encrypted = true + output = GPGME.decrypt(str, :passphrase_callback => method(:passfunc)) do |sig| + in_signed = sig + end + if output.empty? + Exception.new("Output from GPGME.decrypt was empty!") + end + # TODO: return mailadresses or keys instead of signature-objects? + end + [output, in_encrypted, in_signed] + end + + # Encrypt a string to a single receiver and sign it. +receiver+ must be a + # Keyringer::Member + def encrypt_str(str, receiver) + # encypt and sign and return encrypted data as string + key = receiver.key || receiver.email + GPGME.encrypt([key], str, {:passphrase_callback => method(:passfunc), :armor => true, :sign => true, :always_trust => true}) + end + + # Lists all public keys matching +pattern+. Returns an array of + # GPGME::GpgKey's + def list_keys(pattern='') + GPGME.list_keys(pattern) + end + + # Returns the GPGME::GpgKey matching +pattern+. Log an error if more than + # one matches, because duplicated user-ids is a sensitive issue. + def get_key(pattern) + pattern = "<#{pattern}>" if pattern =~ /.*@.*/ + k = list_keys(pattern) + if k.length > 1 + error "There's more than one key matching the pattern you gave me!\nPattern: #{pattern}\nkeys: #{k.inspect}" + false + else + k.first + end + end + + # Signs +string+ with the private key of the list (aka detached signature) + def sign(string) + GPGME::detach_sign(string, {:armor => true, :passphrase_callback => method(:passfunc)}) + end + + # Clearsigns +string+ with the private key of the list + def clearsign(string) + GPGME::clearsign(string, {:armor => true, :passphrase_callback => method(:passfunc)}) + end + + # Exports the public key matching +keyid+ as ascii key block. + def export(keyid) + GPGME.export(keyid, :armor=>:true) + end + + # Delete the public key matching +pattern+ from the public key ring of the + # list + def delete_key(key) + key = get_key(key) if key.kind_of?(String) + begin + @ctx.delete_key(key) + return true + rescue => e + return e + end + end + + # Import +keydata+ into public key ring of the list + def add_key(keydata) + GPGME.import(keydata) + end + + def add_key_from_file(keyfile) + add_key(File.read(keyfile)) + end + + private + + def passfunc(hook, uid_hint, passphrase_info, prev_was_bad, fd) + io = IO.for_fd(fd, 'w') + io.puts @password + io.flush + end + + end +end diff --git a/lib/backend/fs.rb b/lib/backend/fs.rb new file mode 100644 index 0000000..b657ec9 --- /dev/null +++ b/lib/backend/fs.rb @@ -0,0 +1,32 @@ +#!/usr/bin/env ruby +# +# Keyringer secret management system. +# +# Copyright (C) 2011 Keyringer Development Team. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +module Backend + class Fs + def get_as_string(filename) + data = '' + f = File.open(filename, "r") + f.each_line do |line| + data += line + end + return data + end + end +end diff --git a/lib/backend/git.rb b/lib/backend/git.rb new file mode 100644 index 0000000..3ca2d60 --- /dev/null +++ b/lib/backend/git.rb @@ -0,0 +1,48 @@ +#!/usr/bin/env ruby +# +# Keyringer secret management system. +# +# Copyright (C) 2011 Keyringer Development Team. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +module Backend + class Git + def open(path) + begin + @git = ::Git.open(path) + rescue Exception => e + puts "Cannot open #{path}" + false + end + end + + def init(path) + @git = ::Git.init(path) + end + + def clone(url, path) + @git = ::Git.clone(url, path) + end + + def add(pattern) + @git.add(pattern) + end + + def commit(message) + @git.commit(message) + end + end +end diff --git a/lib/backend/parse_config.rb b/lib/backend/parse_config.rb new file mode 100644 index 0000000..c879cb5 --- /dev/null +++ b/lib/backend/parse_config.rb @@ -0,0 +1,26 @@ +#!/usr/bin/env ruby +# +# Keyringer secret management system. +# +# Copyright (C) 2011 Keyringer Development Team. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +module Backend + # A wrapper around ParseConfig + def self.parse_config(config) + ParseConfig.new(config) + end +end diff --git a/lib/backend/recipients_store.rb b/lib/backend/recipients_store.rb new file mode 100644 index 0000000..bae28df --- /dev/null +++ b/lib/backend/recipients_store.rb @@ -0,0 +1,113 @@ +#!/usr/bin/env ruby
+#
+# Keyringer secret management system.
+#
+# Copyright (C) 2011 Keyringer Development Team.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+module Backend
+ # a store for the recipients configuration
+ class RecipientsStore
+ # Instantiates and stores password
+ def initialize(aBaseDir = "")
+ @baseDir = aBaseDir
+ end
+
+ def addRecipient(aRecipientAddress, aRecipientKey)
+ @recipients.push(Recipient.new(aRecipientAddress, aRecipientKey))
+ end
+
+ def removeRecipient(aRecipientKey)
+# read()
+# @recipients.push(Recipient.new(aRecipientAddress, aRecipientKey))
+# write()
+ end
+
+ def getRecipients()
+ return @recipients
+ end
+
+ def load()
+ read()
+ end
+
+ def save()
+ write()
+ end
+
+ def getPath()
+ File.join(@baseDir, "config", "recipients")
+ end
+
+ def hasPath?()
+ File.directory?(getPath())
+ end
+
+ def create()
+ fileName = getPath()
+ file = File.new(fileName, "w")
+ file.close
+ end
+
+ private
+
+ def read()
+ fileName = getPath()
+ file = File.new(fileName, "r")
+ begin
+ recipients = []
+
+ while (line = file.gets)
+ parts = line.split()
+ if (parts.length == 2)
+ recipients.push(Recipient.new(parts[1], parts[0]))
+ end
+ end
+
+ @recipients = recipients
+ rescue => err
+ throw err
+ ensure
+ file.close
+ end
+ end
+
+ def write()
+ fileName = getPath()
+ file = File.new(fileName, "w")
+ begin
+ @recipients.each do |recipient|
+ file.puts("#{recipient.email} #{recipient.keySignature}")
+ end
+ rescue => err
+ throw err
+ ensure
+ file.close
+ end
+ end
+
+ end
+
+ class Recipient
+ def initialize(aKeySignature, anEmail)
+ @keySignature = aKeySignature
+ @email = anEmail
+ end
+
+ attr_reader :keySignature
+ attr_reader :email
+ end
+end
diff --git a/lib/keyringer/csr.sh b/lib/bash/csr.sh index 881a46f..881a46f 100755 --- a/lib/keyringer/csr.sh +++ b/lib/bash/csr.sh diff --git a/lib/keyringer/functions b/lib/bash/functions index 11d1b86..11d1b86 100644 --- a/lib/keyringer/functions +++ b/lib/bash/functions diff --git a/lib/keyring.rb b/lib/keyring.rb new file mode 100644 index 0000000..8f81bba --- /dev/null +++ b/lib/keyring.rb @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +# +# Keyringer secret management system. +# +# Copyright (C) 2011 Keyringer Development Team. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +# internal requires +$:.unshift File.dirname(__FILE__) +require 'backend' +require 'keyring/fs' +require 'keyring/keys' +require 'keyring/repository' +require 'keyring/crypt' +require 'keyring/recipients' +require 'keyring/user_config' diff --git a/lib/keyring/crypt.rb b/lib/keyring/crypt.rb new file mode 100644 index 0000000..2fae909 --- /dev/null +++ b/lib/keyring/crypt.rb @@ -0,0 +1,43 @@ +#!/usr/bin/env ruby +# +# Keyringer secret management system. +# +# Copyright (C) 2011 Keyringer Development Team. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +module Keyring + class Crypt + def initialize + @keyStore = UserConfig.instance.path + '/keys' + end + + def decrypt(filename) + file = Backend::Fs.new + crypt = Backend::Crypt.new(nil) + content = file.get_as_string(filename) + crypt.decrypt(content) + end + + # Determine the file name for a given key + def keyFile(name) + @keyStore + '/' + File.dirname(name) + '/' + File.basename(name, '.asc') + '.asc' + end + + def decryptKey(name) + decrypt(keyFile(name)) + end + end +end diff --git a/lib/keyring/fs.rb b/lib/keyring/fs.rb new file mode 100644 index 0000000..6252217 --- /dev/null +++ b/lib/keyring/fs.rb @@ -0,0 +1,31 @@ +#!/usr/bin/env ruby +# +# Keyringer secret management system. +# +# Copyright (C) 2011 Keyringer Development Team. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +module Keyring + class Fs + def listKeys(relativePath) + path = Keys.getPath + files = Dir.entries(path + "#{relativePath}") + files.delete('.') + files.delete('..') + files + end + end +end diff --git a/lib/keyring/keys.rb b/lib/keyring/keys.rb new file mode 100644 index 0000000..846baee --- /dev/null +++ b/lib/keyring/keys.rb @@ -0,0 +1,31 @@ +#!/usr/bin/env ruby +# +# Keyringer secret management system. +# +# Copyright (C) 2011 Keyringer Development Team. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +module Keyring + class Keys + def self.getPath(path = nil) + if path != nil + path + "/keys" + else + UserConfig.instance.path + "/keys" + end + end + end +end diff --git a/lib/keyring/recipients.rb b/lib/keyring/recipients.rb new file mode 100644 index 0000000..f3264ed --- /dev/null +++ b/lib/keyring/recipients.rb @@ -0,0 +1,51 @@ +#!/usr/bin/env ruby
+#
+# Keyringer secret management system.
+#
+# Copyright (C) 2011 Keyringer Development Team.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+module Keyring
+ class Recipients
+ def initialize(path = nil)
+ if !path
+ path = UserConfig.instance.path
+ end
+
+ # Load backend and ensure that the file exists
+ @recipientsStore = Backend::RecipientsStore.new(path)
+ @recipientsStore.create()
+ end
+ def addRecipient(anEmail, aKeySignature)
+
+ @recipientsStore.load()
+ @recipientsStore.addRecipient(anEmail, aKeySignature)
+ @recipientsStore.save()
+ end
+
+ def removeRecipient(aKeySignature)
+ @recipientsStore.load()
+ @recipientsStore.removeRecipient(aKeySignature)
+ @recipientsStore.save()
+ end
+
+ def listRecipients()
+ @recipientsStore.load()
+
+ return @recipientsStore.getRecipients()
+ end
+ end
+end
diff --git a/lib/keyring/repository.rb b/lib/keyring/repository.rb new file mode 100644 index 0000000..a9e0de5 --- /dev/null +++ b/lib/keyring/repository.rb @@ -0,0 +1,68 @@ +#!/usr/bin/env ruby +# +# Keyringer secret management system. +# +# Copyright (C) 2011 Keyringer Development Team. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +module Keyring + class Repository + def initialize + @git = Backend::Git.new + end + + # Check for a valid repository + def exists?(path) + File.directory?(path + '/.git') + end + + def getConfigPath(path) + path + '/config' + end + + def create(path, url = nil) + keys_path = Keys.getPath(path) + config_path = getConfigPath(path) + + if url + raise "Path #{path} exists and is a git repository" if exists?(path) + @git.clone(url, path) + else + @git.init(path) + end + + # Setup folders + FileUtils.mkdir_p keys_path + FileUtils.mkdir_p config_path + FileUtils.chmod(0700, path) + + # Reparse basedir to force absolute folder + path = Pathname.new(path).realpath + + # Create recipients + recipients = Keyring::Recipients.new(path) + + # TODO: if needed: + # options, version, keys + # save user config + + @git.add('.') + + # TODO: commit just if the repository status has changed + @git.commit('Importing') + end + end +end diff --git a/lib/keyring/user_config.rb b/lib/keyring/user_config.rb new file mode 100644 index 0000000..c6d48e6 --- /dev/null +++ b/lib/keyring/user_config.rb @@ -0,0 +1,61 @@ +#!/usr/bin/env ruby +# +# Keyringer secret management system. +# +# Copyright (C) 2011 Keyringer Development Team. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +module Keyring + class UserConfig + include Singleton + + def initialize(path = nil) + self.loadMainConfig + self.check + end + + def loadMainConfig + @user_config = ENV['HOME'] + '/.keyringer/config' + @keyrings = Backend::parse_config(@user_config) + @path = @keyrings.get_value($keyring) + end + + # TODO + def saveMainConfig + # TODO: copy each keyring definition to a hash + # update path of the current keyring + file = open(@user_config, 'w') + end + + def keyrings + @keyrings + end + + def path + @path + end + + def setPath(path) + @path = path + saveMainConfig + end + + def check + raise "Not a directory: #{@path}" if !File::directory?(@path) + raise "No keydir configured for #{$keyring} keyring." if @path.nil? + end + end +end diff --git a/lib/keyringer.rb b/lib/keyringer.rb new file mode 100644 index 0000000..94ae4b8 --- /dev/null +++ b/lib/keyringer.rb @@ -0,0 +1,38 @@ +#!/usr/bin/env ruby +# +# Keyringer secret management system. +# +# Copyright (C) 2011 Keyringer Development Team. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +# general requires +require 'singleton' +require 'pathname' + +# internal requires +$:.unshift File.dirname(__FILE__) +require 'keyring' +require 'keyringer/bash_wrapper' +require 'keyringer/parser' +require 'keyringer/console' +require 'keyringer/actions/decrypt' +require 'keyringer/actions/recipients' +require 'keyringer/actions/init' +require 'keyringer/actions/ls' + +module Keyringer + VERSION = '2.0-alpha' +end diff --git a/lib/keyringer/actions/decrypt.rb b/lib/keyringer/actions/decrypt.rb new file mode 100644 index 0000000..316db34 --- /dev/null +++ b/lib/keyringer/actions/decrypt.rb @@ -0,0 +1,31 @@ +#!/usr/bin/env ruby +# +# Keyringer secret management system. +# +# Copyright (C) 2011 Keyringer Development Team. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +module Keyringer + module Actions + class Decrypt + def execute + raise "Missing argument: key" if $args[0].nil? + crypt = Keyring::Crypt.new + crypt.decryptKey($args[0]) + end + end + end +end diff --git a/lib/keyringer/actions/init.rb b/lib/keyringer/actions/init.rb new file mode 100644 index 0000000..00a609a --- /dev/null +++ b/lib/keyringer/actions/init.rb @@ -0,0 +1,31 @@ +#!/usr/bin/env ruby +# +# Keyringer secret management system. +# +# Copyright (C) 2011 Keyringer Development Team. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +module Keyringer + module Actions + class Init + def execute + raise "Missing argument: path" if $args[0].nil? + repository = Keyring::Repository.new + repository.create($args[0], $args[1]) + end + end + end +end diff --git a/lib/keyringer/actions/ls.rb b/lib/keyringer/actions/ls.rb new file mode 100644 index 0000000..c9b0fd1 --- /dev/null +++ b/lib/keyringer/actions/ls.rb @@ -0,0 +1,30 @@ +#!/usr/bin/env ruby +# +# Keyringer secret management system. +# +# Copyright (C) 2011 Keyringer Development Team. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +module Keyringer + module Actions + class Ls + def execute + fs = Keyring::Fs.new + fs.listKeys($args[0]).join(' ') + end + end + end +end diff --git a/lib/keyringer/actions/recipients.rb b/lib/keyringer/actions/recipients.rb new file mode 100644 index 0000000..c093416 --- /dev/null +++ b/lib/keyringer/actions/recipients.rb @@ -0,0 +1,45 @@ +#!/usr/bin/env ruby
+#
+# Keyringer secret management system.
+#
+# Copyright (C) 2011 Keyringer Development Team.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+module Keyringer
+ module Actions
+ class Recipients
+ def execute
+ subCommand = $args[0]
+
+ recipients = Keyring::Recipients.new
+
+ if subCommand == "add"
+ recipients.addRecipient($args[1], $args[2])
+ elsif subCommand == "remove"
+ recipients.removeRecipient($args[1])
+ elsif subCommand == "list"
+ recipients.listRecipients().each() do |recipient|
+ puts("#{recipient.email} #{recipient.keySignature}")
+ end
+ else
+ throw "Invalid recipients command: #{subCommand} "
+ end
+
+ return ""
+ end
+ end
+ end
+end
diff --git a/lib/keyringer/bash_wrapper.rb b/lib/keyringer/bash_wrapper.rb new file mode 100644 index 0000000..30aa3d2 --- /dev/null +++ b/lib/keyringer/bash_wrapper.rb @@ -0,0 +1,27 @@ +#!/usr/bin/env ruby +# +# Keyringer secret management system. +# +# Copyright (C) 2011 Keyringer Development Team. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +module Keyringer + class BashWrapper + def execute + exec("keyringer #{$keyring} #{$action} " + $args.join(' ')) + end + end +end diff --git a/lib/keyringer/console.rb b/lib/keyringer/console.rb new file mode 100644 index 0000000..e3b6fae --- /dev/null +++ b/lib/keyringer/console.rb @@ -0,0 +1,27 @@ +#!/usr/bin/env ruby +# +# Keyringer secret management system. +# +# Copyright (C) 2011 Keyringer Development Team. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +module Keyringer + class Console + include Singleton + def initialize + end + end +end diff --git a/lib/keyringer/parser.rb b/lib/keyringer/parser.rb new file mode 100644 index 0000000..0e7f46a --- /dev/null +++ b/lib/keyringer/parser.rb @@ -0,0 +1,64 @@ +#!/usr/bin/env ruby +# +# Keyringer secret management system. +# +# Copyright (C) 2011 Keyringer Development Team. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +module Keyringer + class Parser + def initialize + require 'optparse' + + options = {} + optparse = OptionParser.new do |opts| + # Set a banner, displayed at the top of the help screen. + opts.banner = "Usage: #{File.basename($0)} <keyring> <action> [arguments]" + + # TODO: example option + #options[:verbose] = false + #opts.on( '-v', '--verbose', 'Output more information' ) do + #options[:verbose] = true + #end + + # TODO: example option + #options[:logfile] = nil + #opts.on( '-l', '--logfile FILE', 'Write log to FILE' ) do |file| + #options[:logfile] = file + #end + + # This displays the help screen + opts.on( '-h', '--help', 'Display this help message' ) do + puts opts + exit + end + end + + # Parse using 'parse!' to remove all options found at ARGV + optparse.parse! + + # Parse positional arguments + $args = ARGV.dup + $keyring = $args.shift + $action = $args.shift + + unless $action + puts optparse + exit + end + end + end +end diff --git a/share/keyringer/append b/share/keyringer/append index 045ba86..5570b6e 100755 --- a/share/keyringer/append +++ b/share/keyringer/append @@ -4,7 +4,7 @@ # # Load functions -LIB="`dirname $0`/../../lib/keyringer/functions" +LIB="`dirname $0`/../../lib/bash/functions" source "$LIB" || exit 1 # Get file diff --git a/share/keyringer/append-batch b/share/keyringer/append-batch index 6b140f7..5570b6e 120000..100755 --- a/share/keyringer/append-batch +++ b/share/keyringer/append-batch @@ -1 +1,35 @@ -append
\ No newline at end of file +#!/bin/bash +# +# Append information into encrypted files. +# + +# Load functions +LIB="`dirname $0`/../../lib/bash/functions" +source "$LIB" || exit 1 + +# Get file +keyringer_get_file "$2" + +OLDIFS="$IFS" +IFS=$'\n' + +CONTENT=($(keyringer_exec decrypt "$BASEDIR" "$FILE")) + +if [ "$BASENAME" == "append" ]; then + # only display directions if we're running append, not append-batch + printf "\n%s currently has %d lines\n\n" "$FILE" "${#CONTENT[@]}" + printf "Now please write the content to be appended on %s, finnishing with Ctrl-D:\n" "$FILE" +fi + +# FIXME: dkg doesn't know how to check that this does proper escaping +# (2010-11-16) + +APPEND=($(cat -)) + +NEW=( ${CONTENT[@]} ${APPEND[@]} ) + +for element in $(seq 0 $((${#NEW[@]} - 1))); do + echo ${NEW[$element]} +done | keyringer_exec encrypt-batch $BASEDIR $FILE + +IFS="$OLDIFS" diff --git a/share/keyringer/decrypt b/share/keyringer/decrypt index c0584f2..c316e8d 100755 --- a/share/keyringer/decrypt +++ b/share/keyringer/decrypt @@ -4,7 +4,7 @@ # # Load functions -LIB="`dirname $0`/../../lib/keyringer/functions" +LIB="`dirname $0`/../../lib/bash/functions" source "$LIB" || exit 1 # Get file diff --git a/share/keyringer/del b/share/keyringer/del index 4eca0e3..b10d6a3 100755 --- a/share/keyringer/del +++ b/share/keyringer/del @@ -4,7 +4,7 @@ # # Load functions -LIB="`dirname $0`/../../lib/keyringer/functions" +LIB="`dirname $0`/../../lib/bash/functions" source "$LIB" || exit 1 # Get file diff --git a/share/keyringer/edit b/share/keyringer/edit index 47945f3..d729aa6 100755 --- a/share/keyringer/edit +++ b/share/keyringer/edit @@ -4,7 +4,7 @@ # # Load functions -LIB="`dirname $0`/../../lib/keyringer/functions" +LIB="`dirname $0`/../../lib/bash/functions" source "$LIB" || exit 1 # Get file diff --git a/share/keyringer/encrypt b/share/keyringer/encrypt index 8cbf72a..915af3c 100755 --- a/share/keyringer/encrypt +++ b/share/keyringer/encrypt @@ -4,7 +4,7 @@ # # Load functions -LIB="`dirname $0`/../../lib/keyringer/functions" +LIB="`dirname $0`/../../lib/bash/functions" source "$LIB" || exit 1 # Aditional parameters diff --git a/share/keyringer/encrypt-batch b/share/keyringer/encrypt-batch index 8267197..915af3c 120000..100755 --- a/share/keyringer/encrypt-batch +++ b/share/keyringer/encrypt-batch @@ -1 +1,26 @@ -encrypt
\ No newline at end of file +#!/bin/bash +# +# Encrypt files to multiple recipients. +# + +# Load functions +LIB="`dirname $0`/../../lib/bash/functions" +source "$LIB" || exit 1 + +# Aditional parameters +keyringer_get_new_file "$2" + +# Encrypt +mkdir -p "$KEYDIR/`dirname $FILE`" + +if [ "$BASENAME" == "encrypt" ]; then + # Only display directions if we're running encrypt, not encrypt-batch + echo "Type your message and finish your input with EOF (Ctrl-D)." +fi + +gpg --use-agent --armor -e -s $(keyringer_recipients "$RECIPIENTS") - > "$KEYDIR/$FILE" + +# Stage +if [ -d "$BASEDIR/.git" ]; then + keyringer_exec git "$BASEDIR" add "keys/$FILE" +fi diff --git a/share/keyringer/genpair b/share/keyringer/genpair index 065111e..405dd9e 100755 --- a/share/keyringer/genpair +++ b/share/keyringer/genpair @@ -142,7 +142,7 @@ function genpair_ssl { } # Load functions -LIB="`dirname $0`/../../lib/keyringer" +LIB="`dirname $0`/../../lib/bash" source "$LIB/functions" || exit 1 # Aditional parameters diff --git a/share/keyringer/git b/share/keyringer/git index cd2a188..cd9879c 100755 --- a/share/keyringer/git +++ b/share/keyringer/git @@ -4,7 +4,7 @@ # # Load functions -LIB="`dirname $0`/../../lib/keyringer/functions" +LIB="`dirname $0`/../../lib/bash/functions" source "$LIB" || exit 1 # Aditional parameters diff --git a/share/keyringer/ls b/share/keyringer/ls index 31e8805..f63f95d 100755 --- a/share/keyringer/ls +++ b/share/keyringer/ls @@ -4,7 +4,7 @@ # # Load functions -LIB="`dirname $0`/../../lib/keyringer/functions" +LIB="`dirname $0`/../../lib/bash/functions" source "$LIB" || exit 1 # Aditional parameters diff --git a/share/keyringer/options b/share/keyringer/options index 3047380..abcca50 100755 --- a/share/keyringer/options +++ b/share/keyringer/options @@ -4,7 +4,7 @@ # # Load functions -LIB="`dirname $0`/../../lib/keyringer" +LIB="`dirname $0`/../../lib/bash" source "$LIB/functions" || exit 1 # Command parser diff --git a/share/keyringer/recipients b/share/keyringer/recipients index 2fe2ddf..abf4d94 100755 --- a/share/keyringer/recipients +++ b/share/keyringer/recipients @@ -4,7 +4,7 @@ # # Load functions -LIB="`dirname $0`/../../lib/keyringer" +LIB="`dirname $0`/../../lib/bash" source "$LIB/functions" || exit 1 # Command parser diff --git a/share/keyringer/recrypt b/share/keyringer/recrypt index a7607e0..2ea859b 100755 --- a/share/keyringer/recrypt +++ b/share/keyringer/recrypt @@ -4,7 +4,7 @@ # # Load functions -LIB="`dirname $0`/../../lib/keyringer/functions" +LIB="`dirname $0`/../../lib/bash/functions" source "$LIB" || exit 1 # Get file |