lenc 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbdf59fe864cde5c6b5d6ab0029ed7b3086b6abb
-  data.tar.gz: 935307daa431368ca0f0d86a8b9eca068d1d1b58
+  metadata.gz: 4f09c6e3e0d5b6ce0ebb95fe5a2b7f24a672601d
+  data.tar.gz: a5e5dd2ac1ea3c34f2a96fb5568381d4a1368803
 SHA512:
-  metadata.gz: 1377690289e75b202bf0a6ee0cffc28c469688ccde9a8dcba36051eed8433b2f32010f5db40b6d648a4d214e0a74ead2c2f4555c2caef5aa5875d21fd17cb90e
-  data.tar.gz: 46b0cc17fc7254f5a87abe27099d0f3ee21e92fc133bd87de2e20c1df052bc385def1bcda8a1e64f7fd280656a8e46c6664143c1020a91bfc989fb694cbc71a0
+  metadata.gz: a54fe2806c2703d53770abfcf3eedfd66ef0c7d714683de2e15644c6053ead25a83da08ea272a84c059de5208bccd65161aa0618e68e605326e5fe449992b389
+  data.tar.gz: eb0aec9260ed9fd7d5f771cc11cb48845746dc58ec9d68399d2912f1e428fdef1a8e2c94e1a80c50a6285237891083114127a103951867e568a682eeda13611e

data/CHANGELOG.txt

@@ -2,6 +2,15 @@
   * Version 1.0.0 released
 
 2013-03-22 
+  * 1.1.0 released
   * For added safety, unless the --storekey option is given when the repository is
     initialized, the key is no longer stored in repository configuration file, and
     the user is prompted at every update to enter the password.
+
+2013-04-08
+  * 1.1.1 released
+	* Fixed problem with README that was omitting a word
+	* Now allows passwords as short as 8 characters, to agree with documentation
+	* Now omitting symlink'd files (it used to fail upon encountering these)
+	* Added ability to provide update password as command line argument (i.e. lencrypt <pwd>)
+

data/README.txt

@@ -33,7 +33,7 @@ Running the program
 
 The program can be asked to perform one of the following tasks:
 
-1) Setting up a repository.  Select a directory you wish to be the <source> 
+1) Setting up a repository.  Select a directory you wish to be the \<source\> 
 directory, and make it the current directory.  Type:
     
     lencrypt -i KEY ENCDIR
@@ -50,7 +50,8 @@ it cannot lie within the current directory's tree).
 You will be prompted for the encryption key, and then the program will examine 
 which files within the \<source\> directory have been changed (since the repository 
 was created or last updated), and re-encrypt these into the \<encrypted\> directory.
-    
+
+
 3) Recovering encrypted files.  Type:
 
     lencrypt -r KEY ENCDIR RECDIR
@@ -97,4 +98,7 @@ The format of ignore files is similar to that of .gitignore files.  Details:
 * If the pattern contains any path separators, then the wildcards '*', '?' will not
  		match the path separator.
  
+ Miscellaneous Issues
+ -------
+ At present, the program will ignore any files (or directories) that are symbolic links.
  

data/lib/lenc/aes.rb

@@ -2,10 +2,6 @@ require_relative 'tools'
 
 require 'openssl'
 
-module LEnc
-  class DecryptionError < Exception 
-  end
-end
 
 module RepoInternal
   

data/lib/lenc/lencrypt.rb

@@ -13,7 +13,8 @@ class LEncApp
         opt :orignames, "(with --init) leave filenames unencrypted"
         opt :storekey, "(with --init) store the key within the repository configuration file so it" \
               " need not be entered with every update"
-        opt :update, "update encrypted repository (default operation)"
+        opt :update, "update encrypted repository (default operation): KEY", :default => ""
+        #opt :updatepwd, "specify key for update: KEY", :type => :string
         opt :recover, "recover files from an encrypted repository: KEY ENCDIR RECDIR", :type => :strings
         opt :where, "specify source directory (default = current directory)", :type => :string
         opt :verbose,"verbose operation"
@@ -25,16 +26,25 @@ class LEncApp
       p.parse argv
     end
     
+    # Not sure how to determine if there were leftover arguments;
+    # trollop seems to include path information ('.')
+    #p.die("Unrecognized argument: #{p.leftovers[0]}",nil) if p.leftovers.size
+    
     v = 0
     v = -1 if options[:quiet]
     v = 1  if options[:verbose]
     
+    update_pwd = options[:update]
+    update_pwd = nil if update_pwd.size == 0
+    
     nOpt = 0
     nOpt += 1 if options[:init]
-    nOpt += 1 if options[:update]
+    nOpt += 1 if update_pwd  
     nOpt += 1 if options[:recover]
-          
-    Trollop::die("Only one operation can be performed at a time."  )  if nOpt > 1
+            
+    #pr("trollop opts = %s\n",d2(options))
+      
+    p.die("Only one operation can be performed at a time.",nil) if nOpt > 1
   
     r = Repo.new(:dryrun => options[:dryrun],
       :verbosity => v)
@@ -42,14 +52,14 @@ class LEncApp
     begin
 
       if (a = options[:init])
-        Trollop::die("Expecting: KEY ENCDIR") if a.size != 2
+        p.die("Expecting: KEY ENCDIR",nil) if a.size != 2
         pwd,encDir = a
         r.create(options[:where], pwd, encDir, options[:orignames], options[:storekey])
       elsif (a = options[:recover])
-        Trollop::die("Expecting: KEY ENCDIR RECDIR") if a.size != 3
+        p.Trollop::die("Expecting: KEY ENCDIR RECDIR",nil) if a.size != 3
         r.perform_recovery(a[0],a[1],a[2])
       else
-        r.open(options[:where])
+        r.open(options[:where],update_pwd)
         r.perform_update(options[:verifyenc])
       end
 
@@ -64,19 +74,6 @@ end
 if __FILE__ == $0
   args = ARGV
   
-#  if true && Dir.home.end_with?("/jeff")  
-#    warn("trying special")
-#    bs = File.join(Dir.home,"Desktop/_testdirs_")
-#    
-#    if !File.file? "#{bs}/src/.lenc"
-#      s = "-w #{bs}/src -i onefishtwofishredfishbluefish #{bs}/encr"
-#    else
-#      s = "-w #{bs}/src"
-#    end
-##    s = "-h"
-#    args = s.split
-#    #  args = "-h".split
-#  end
   
   LEncApp.new().run(args)
 end

data/lib/lenc/repo.rb

@@ -1,6 +1,7 @@
 require 'base64'
 require 'pathname'
 require 'fileutils'
+require 'tempfile'
 
 require_relative 'tools'
 req('aes config_file')
@@ -28,6 +29,9 @@ end
 
 module LEnc
 
+  class DecryptionError < Exception 
+  end
+
   class RepoNotFoundException < Exception
   end
   
@@ -66,16 +70,14 @@ module LEnc
     
     if windows?
       IGNOREFILENAME = "__lencignore__.txt"
-      TEMPFILENAME = "__tmp_file__.bin"
     else
       IGNOREFILENAME = ".lencignore"
-      TEMPFILENAME = ".lenc__temp__file"
     end
     
     
     DEFAULTIGNORE = \
-      "#{LENC_REPO_FILENAME}\n #{TEMPFILENAME}\n" + \
-      ".DS_Store\n" + \
+      "#{LENC_REPO_FILENAME}\n " \
+       ".DS_Store\n" + \
       ".recoverdefaults\n"
 
     STATE_CLOSED = 0
@@ -115,7 +117,7 @@ module LEnc
     # Create a new encryption repository, and open it. 
     # 
     # @param repo_dir  directory of new repository (nil for current directory)
-    # @param key      encryption key, a string from 20 to 56 characters in length
+    # @param key      encryption key, a string from 8 to 56 characters in length
     # @param enc_dir   directory to store encrypted files; must not yet exist, and must
     #                 not represent a directory lying within the repo_dir tree
     # @param original_names   if true, the filenames are not encrypted, only the file contents
@@ -161,7 +163,7 @@ module LEnc
          " is a subdirectory of " + pp[1] 
       end
         
-      if (key.size < 20 || key.size > 56) 
+      if (key.size < 8 || key.size > 56) 
         raise ArgumentError, "Password length " + key.size.to_s \
           + " is illegal" 
       end
@@ -272,7 +274,6 @@ module LEnc
       
       raise IllegalStateException if @state != STATE_OPEN
       
-      removeTempFile()
       reset_state()
     end
    
@@ -363,13 +364,6 @@ module LEnc
       nil
     end
     
-    def renameTempFile(newFilename) 
-      if !File.exists?(TEMPFILENAME)
-        raise IOError, "Temporary file missing or of wrong type" 
-      end
-      
-      File.rename(TEMPFILENAME, newFilename)
-    end 
      
     # Starting in a particular directory, attempt to find the nearest 
     # parent repository.
@@ -451,7 +445,6 @@ module LEnc
           #   [...] => [...]
           #   [!..] => [^...]
           
-          
           pat = ''
           
           inBrace = false
@@ -557,12 +550,6 @@ module LEnc
       @ignoreStack.pop()
     end
       
-    def removeTempFile()
-      if not @dryrun and File.file?(TEMPFILENAME) 
-          remove_file_or_dir(TEMPFILENAME)
-      end
-    end
-      
     # Determine the secondary key, which is used for the filenames (not their contents)
     # This is found by encrypting the primary key.
     def prepareKeys() 
@@ -642,8 +629,7 @@ module LEnc
         !db || hex_dump(s,"after cvt to string (#{s})")
       
       rescue ArgumentError => e
-        pr("caught exception during decrypt: %s\n",dt(e))
-        raise DecryptionError(e) 
+        raise DecryptionError.new(e) 
       end
       
       set_recovery_pwd_verified()
@@ -688,7 +674,7 @@ module LEnc
   
       
     # Update a single source file if necessary (not a directory)
-    def encryptFile(sourceFile, encryptFile)
+    def encrypt_file(sourceFile, encryptFile)
   
       # If encrypted file is a directory, delete it
       if File.directory?(encryptFile) 
@@ -716,19 +702,25 @@ module LEnc
           pr("%s", srcDisp) 
         end
         
-        convertFile(sourceFile, encryptFile, true, showProgress, false)
+        encPath = convertFile(sourceFile, true, showProgress, false)
+        FileUtils.mv(encPath, encryptFile)
+        
         
         if @verifyEncryption
           # Verify that the original and decoded files are identical
-          convertFile(encryptFile, TEMPFILENAME, false, showProgress, true)
-          if !FileUtils.compare_file(sourceFile, TEMPFILENAME) 
+          decoded_file = convertFile(encryptFile,  false, showProgress, true)
+          files_match = FileUtils.compare_file(sourceFile, decoded_file.path)
+          decoded_file.unlink
+          
+          if !files_match
+            delete_file_or_dir(encryptFile)
             raise EncryptionVerificationException, \
               "File '#{srcDisp}' did not encrypt/decrypt correctly" 
+            
           end
           if @verbosity >= 0
             pr(" (file #{srcDisp} encrypted correctly)\n")
           end
-          removeTempFile()
         end
       end
     end
@@ -736,13 +728,16 @@ module LEnc
     # Determine if a file matches one of the expressions in the ignore stack.
     # Searches the stack from top to bottom (i.e., the outermost elements are examined last)
     def shouldFileBeIgnored(f)
+      db = false
+      !db || pr("shouldFileBeIgnored? #{f}\n")
       f2 = f
       @ignoreStack.reverse.each do |dir,ients|
         ients.each do |ient|
           fArg = ient.pathMode  ? f2 : f
           
           matches = ient.rexp.match(fArg) 
-          
+          !db || pr("  ent path=#{ient.pathMode} rexp=#{ient.rexp} neg=#{ient.negated} matches=#{matches}\n")
+                  
           if matches 
             return !ient.negated 
           end
@@ -810,10 +805,18 @@ module LEnc
         # Convert string to ASCII-8BIT encoding.
         f = to_ascii8(f2)
         
+        !db || pr(" testing if file should be ignored: #{f}\n")
         ignore = shouldFileBeIgnored(f)
         
         filePath = File.join(sourceDir,f)
         
+        if File.symlink?(filePath)
+          if @verbosity >= 0 
+            pr("Omitting symlink file '#{rel_path(filePath,@inputDir)}'\n")
+          end  
+          next
+        end
+        
         if ignore 
           !db || pr("(ignoring %s)\n", rel_path(filePath, @inputDir)) if @verbosity >= 1 
           next
@@ -821,8 +824,7 @@ module LEnc
         
         if f.start_with?(ENCRFILENAMEPREFIX) 
           if @verbosity >= 0 
-            msg = "Source file/dir found with name that looks encrypted: " + d(f)
-            pr("(%s)\n", f)
+            pr("(Omitting source file / dir with name that looks encrypted: #{d(f)})\n")
           end
         end
         
@@ -848,7 +850,8 @@ module LEnc
         if File.directory?(filePath) 
           encryptDir(filePath, encrPath)
         else 
-          encryptFile(filePath, encrPath)
+          !db || pr("...attempting to encrypt file #{filePath} to #{encrPath}...\n")
+          encrypt_file(filePath, encrPath)
         end
       end
      
@@ -859,6 +862,7 @@ module LEnc
       
       # (if doing dry run, encrypt dir may not exist)
       
+      !db || pr("examining files in encrypted dir #{encryptDir} to delete ones that don't belong\n")
       if File.directory?(encryptDir) 
         dire = dir_entries(encryptDir)
       else
@@ -872,10 +876,10 @@ module LEnc
           begin
             orphanOrigName = decryptFilename(f)
             next if !orphanOrigName
-            orphanPath = os.path.join(encryptDir, f)
+            orphanPath = File.join(encryptDir, f)
             if @verbosity >= 1 
               printf("Removing encrypted version of missing (or ignored) file " \
-                    +  rel_path(os.path.join(sourceDir, orphanOrigName), @inputDir) + ": " + orphanPath) 
+                    +  rel_path(File.join(sourceDir, orphanOrigName), @inputDir) + ": " + orphanPath) 
             end
             if !@dryrun 
               remove_file_or_dir(orphanPath)
@@ -962,14 +966,19 @@ module LEnc
             pr("%s", pth)
           end
           begin
-            convertFile(encrFullPath, TEMPFILENAME, false, showProgress)
+            tmp_file = convertFile(encrFullPath,false, showProgress)
+            
             set_recovery_pwd_verified()
+            
             if not @dryrun
               if File.file?(origPath) 
                   remove_file_or_dir(origPath)
               end
-              renameTempFile(origPath)
+              FileUtils.mv(tmp_file.path, origPath)
+            else
+              tmp_file.unlink
             end
+            
           rescue DecryptionError => e
                         
             if !@recovery_pwd_verified
@@ -986,18 +995,23 @@ module LEnc
     end
   
     # Encrypt or decrypt a file (not a directory)
-    def convertFile(srcPath, destPath, encrypt, showProgress=false, verifying=false) 
+    # @param srcPath source path
+    # @param encrypt true if encrypting
+    # @return temporary file containing modified file
+    #
+    def convertFile(srcPath,encrypt, showProgress=false, verifying=false) 
   
       db = warndb 0
-      !db||pr("\n\n\n\nconvertFile\n %s =>\n %s;\n %s\n",d(srcPath),d(destPath),df(encrypt,"encrypt"))
+      !db||pr("\n\n\n\nconvertFile\n %s\n",d(srcPath))
       
+      fw = nil
       showDots = false
       if not @dryrun 
         
         fSize = File.size(srcPath)
         
         fr = File.open(srcPath, 'rb')
-        fw = File.open(TEMPFILENAME, 'wb')
+        fw = Tempfile.new("repo")
         
         cSize = 100000
         
@@ -1054,8 +1068,6 @@ module LEnc
         fr.close()
         fw.close()
         
-        renameTempFile(destPath)
-        
         pr("]") if showDots 
         
       end 
@@ -1063,6 +1075,8 @@ module LEnc
       if showProgress and (showDots or not verifying) 
         pr("\n")
       end
+      
+      fw
     end
     
   end # class Repo

data/lib/lenc/tools.rb

@@ -506,7 +506,7 @@ end
 # Convenience method to detect if a script is being run
 # e.g. as a 'main' method (for debug purposes only).
 # If so, it changes the current directory to the 
-# directory containing the script.
+# directory containing the script (if such a directory exists).
 #
 # @param file pass __FILE__ in here
 # @return true if so
@@ -523,7 +523,10 @@ def main?(file)
   end
 
   if (ret = (file == scr))
-    Dir.chdir(File.dirname(file))
+    dr = File.dirname(file)
+    if File.directory?(dr)
+      Dir.chdir(dr)
+    end
   end
   ret
 end

data/test/test.rb

@@ -4,7 +4,7 @@ require_relative '../lib/lenc/tools.rb'
 req('repo lencrypt')
 
 
-#SINGLETEST = "test_200_recover_with_incorrect_password"
+#SINGLETEST = "test_101_update_repo_with_verify"
 if defined? SINGLETEST
   if main?(__FILE__)
     ARGV.concat("-n  #{SINGLETEST}".split)
@@ -350,6 +350,7 @@ end
     end
   end
   
+  
   def test_200_recover_with_incorrect_password   
     create_repo
     ex("") # updates repo
@@ -361,17 +362,4 @@ end
     end
   end
   
-#  def test_300_source_contains_encrypted_filename
-#    create_repo
-#    update_repo  
-#    
-#    makeFile(bogusSourceFile())
-#    assert_raise(UpdateException) do
-#      update_repo  
-#    end
-#    remove_file_or_dir(bogusSourceFile())
-#  end
-  
-  
-  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lenc
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Jeff Sember
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies: []
 description: "Encrypts a set of local files, and copies the encrypted versions to
   a repository, \nwhich may be located within a free cloud service (Dropbox, Google