zipruby 0.2.1-mswin32 → 0.2.2-mswin32

data/README.txt

@@ -21,7 +21,7 @@ gem install zipruby
 https://rubyforge.org/frs/?group_id=6124
 
 == Example
-=== reading zip archives
+=== reading zip archive
 
     require 'zipruby'
     
@@ -64,7 +64,7 @@ https://rubyforge.org/frs/?group_id=6124
       end
     end
 
-=== creating zip archives
+=== creating zip archive
 
     require 'zipruby'
     
@@ -94,7 +94,7 @@ https://rubyforge.org/frs/?group_id=6124
             # args: <entry name>,      <source>
     end
 
-=== modifying zip archives
+=== modifying zip archive
 
     require 'zipruby'
     
@@ -130,10 +130,14 @@ https://rubyforge.org/frs/?group_id=6124
       end
     end
 
-=== decrypt zip archives
+=== encrypt/decrypt zip archive
 
     require 'zipruby'
     
+    # encrypt
+    Zip::Archive.encrypt('filename.zip', 'password')
+    
+    # decrypt
     Zip::Archive.decrypt('filename.zip', 'password')
 
 == License

data/zipruby.c

@@ -29,6 +29,7 @@ static VALUE zipruby_archive_alloc(VALUE klass);
 static void zipruby_archive_free(struct zipruby_archive *p);
 static VALUE zipruby_archive_s_open(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_archive_s_decrypt(VALUE self, VALUE path, VALUE password);
+static VALUE zipruby_archive_s_encrypt(VALUE self, VALUE path, VALUE password);
 static VALUE zipruby_archive_close(VALUE self);
 static VALUE zipruby_archive_num_files(VALUE self);
 static VALUE zipruby_archive_get_name(int argc, VALUE *argv, VALUE self);
@@ -69,6 +70,7 @@ void Init_zipruby_archive() {
   rb_include_module(Archive, rb_mEnumerable);
   rb_define_singleton_method(Archive, "open", zipruby_archive_s_open, -1);
   rb_define_singleton_method(Archive, "decrypt", zipruby_archive_s_decrypt, 2);
+  rb_define_singleton_method(Archive, "encrypt", zipruby_archive_s_encrypt, 2);
   rb_define_method(Archive, "close", zipruby_archive_close, 0);
   rb_define_method(Archive, "num_files", zipruby_archive_num_files, 0);
   rb_define_method(Archive, "get_name", zipruby_archive_get_name, -1);
@@ -157,11 +159,19 @@ static VALUE zipruby_archive_s_open(int argc, VALUE *argv, VALUE self) {
 /* */
 static VALUE zipruby_archive_s_decrypt(VALUE self, VALUE path, VALUE password) {
   int errorp, wrongpwd;
+  long pwdlen;
 
   Check_Type(path, T_STRING);
   Check_Type(password, T_STRING);
+  pwdlen = RSTRING(password)->len;
 
-  if (zip_decrypt(StringValuePtr(path), StringValuePtr(password), RSTRING(password)->len, &errorp, &wrongpwd) == -1) {
+  if (pwdlen < 1) {
+    rb_raise(Error, "Decrypt archive failed - %s: Password is empty", StringValuePtr(path));
+  } else if (pwdlen > 0xff) {
+    rb_raise(Error, "Decrypt archive failed - %s: Password is too long", StringValuePtr(path));
+  }
+
+  if (zip_decrypt(StringValuePtr(path), StringValuePtr(password), pwdlen, &errorp, &wrongpwd) == -1) {
     if (wrongpwd) {
       rb_raise(Error, "Decrypt archive failed - %s: Wrong password", StringValuePtr(path));
     } else {
@@ -174,6 +184,30 @@ static VALUE zipruby_archive_s_decrypt(VALUE self, VALUE path, VALUE password) {
   return Qnil;
 }
 
+/* */
+static VALUE zipruby_archive_s_encrypt(VALUE self, VALUE path, VALUE password) {
+  int errorp;
+  long pwdlen;
+
+  Check_Type(path, T_STRING);
+  Check_Type(password, T_STRING);
+  pwdlen = RSTRING(password)->len;
+
+  if (pwdlen < 1) {
+    rb_raise(Error, "Encrypt archive failed - %s: Password is empty", StringValuePtr(path));
+  } else if (pwdlen > 0xff) {
+    rb_raise(Error, "Encrypt archive failed - %s: Password is too long", StringValuePtr(path));
+  }
+
+  if (zip_encrypt(StringValuePtr(path), StringValuePtr(password), pwdlen, &errorp) == -1) {
+    char errstr[ERRSTR_BUFSIZE];
+    zip_error_to_str(errstr, ERRSTR_BUFSIZE, errorp, errno);
+    rb_raise(Error, "Encrypt archive failed - %s: %s", StringValuePtr(path), errstr);
+  }
+
+  return Qnil;
+}
+
 /* */
 static VALUE zipruby_archive_close(VALUE self) {
   struct zipruby_archive *p_archive;
@@ -845,6 +879,7 @@ void Init_zipruby_error() {
 #endif
 
 #include "zip.h"
+#include "zipint.h"
 #include "zipruby.h"
 #include "zipruby_archive.h"
 #include "zipruby_file.h"
@@ -1016,6 +1051,10 @@ static VALUE zipruby_file_read(int argc, VALUE *argv, VALUE self) {
   Check_File(p_file);
   zip_stat_init(&sb);
 
+  if (p_file->archive->cdir->entry[0].bitflags & ZIP_GPBF_ENCRYPTED) {
+    rb_raise(Error, "Read file failed: File encrypted");
+  }
+
   if (zip_stat_index(p_file->archive, p_file->sb->index, 0, &sb)) {
     rb_raise(Error, "Read file failed: %s", zip_strerror(p_file->archive));
   }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zipruby
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: mswin32
 authors: 
 - winebarrel