rmega 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ed425ea5b0da557c00e5e2abd80b00ddb72f7d32e4a12c6ee3e79d65a0e4a34
-  data.tar.gz: d4ddf7dcb5e5b40433da1e03eec12ccf91c3b400009493158c2b5055c5bc6119
+  metadata.gz: 48d1cd2037a5511fdc9adc693fbd1b6e74331327a3e46a93e2326a3c9aef7f42
+  data.tar.gz: 159cd701d79d5fdb8d903a562f01fff6a439fedb2d6efff926acf8df772182f0
 SHA512:
-  metadata.gz: 466832e6ceedaf3df21715c17bec1a507dde658db7821aae46f6427bda5e1031ed34d454f97b0ef90b4a5ee9f86da877af51cfbfd78f0b64cb36fd93be957b2a
-  data.tar.gz: f3928e47b107ab5693c3daa73c9d6725e94f622e539e4d30e96b3fff8c2af0b4394e38068b5f7508c6dc4b3802c45a5a3c8014ba2a967ba3e8da6b56fa07fa2f
+  metadata.gz: 74c4ac1a15aeafeea21aed3dce4f17e8bdc7f82bf50608d776bc3c9df27e57ece398e8b8cf1b77d6dcd34114a020b7b1bcbcf3bdeca398da80b0ab80c3e72f39
+  data.tar.gz: 48a51f07da3be0c88619068afa1fc93a42d4f77dc008ddf6a5504a66aa536584e46af9e3c799fcf8f70fec44c6d31c5aabdaf74bd13257fa4910df9418c793b9

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.2.7
+
+### New Features
+* Add support for login ver. 2 (newer accounts only)
+* Add new error codes
+* Fixed crash when uploading file with invalid UTF-8 characters
+
 ## 0.2.6
 
 ### New Features

data/lib/rmega.rb

@@ -8,6 +8,7 @@ require 'openssl'
 require 'digest/md5'
 require 'json'
 require 'securerandom'
+require 'pbkdf2'
 
 # Used only in specs
 require 'yaml'

data/lib/rmega/api_response.rb

@@ -26,6 +26,9 @@ module Rmega
       -20 => 'Write failed',
       -21 => 'Read failed',
       -22 => 'Invalid application key; request not processed',
+      -23 => 'SSL verification failed',
+      -24 => 'Not enough quota',
+      -26 => '2FA required',
     }.freeze
 
     def initialize(http_response)

data/lib/rmega/nodes/expandable.rb

@@ -7,7 +7,7 @@ module Rmega
         node_key = NodeKey.random
 
         # encrypt attributes
-        _attr = serialize_attributes(:n => name.strip)
+        _attr = serialize_attributes(:n => Utils.utf8(name).strip)
         _attr = aes_cbc_encrypt(node_key.aes_key, _attr)
 
         # Encrypt node key

data/lib/rmega/nodes/node.rb

@@ -31,14 +31,14 @@ module Rmega
       def serialize_attributes(hash)
         str = "MEGA"
         str << hash.to_json
-        str << ("\x00" * (16 - (str.size % 16)))
+        str << ("\x00" * (16 - (str.bytesize % 16)))
         return str
       end
 
       def rename(new_name)
         node_key = NodeKey.load(decrypted_file_key)
 
-        _attr = serialize_attributes(attributes.merge("n" => new_name))
+        _attr = serialize_attributes(attributes.merge("n" => Utils.utf8(new_name)))
         _attr = aes_cbc_encrypt(node_key.aes_key, _attr)
         _attr = Utils.base64urlencode(_attr)
 

data/lib/rmega/nodes/uploadable.rb

@@ -69,7 +69,7 @@ module Rmega
         pool.shutdown
 
         # encrypt attributes
-        _attr = serialize_attributes(:n => ::File.basename(path))
+        _attr = serialize_attributes(:n => Utils.utf8(::File.basename(path)))
         _attr = aes_cbc_encrypt(rnd_node_key.aes_key, _attr)
 
         # Calculate meta_mac

data/lib/rmega/session.rb

@@ -86,12 +86,31 @@ module Rmega
     # * The user master_key (128 bit for AES) encrypted with the password_hash
     # * The RSA private key ecrypted with the master_key
     # * A brand new session_id encrypted with the RSA private key
-    def login(email, password)
+    def login(email, password)      
+      # discover the version of the account (1: old accounts, >=2: newer accouts)
+      resp = request(a: 'us0', user: email.strip)
+      account_version = resp["v"].to_i
+
       # Derive an hash from the user password
-      password_hash = hash_password(password)
-      u_hash = user_hash(password_hash, email.strip.downcase)
+      if account_version == 1
+        password_hash = hash_password(password)
+        u_hash = user_hash(password_hash, email.strip.downcase)
+      else
+        df2 = PBKDF2.new(
+          :password      => password,
+          :salt          => Utils.base64urldecode(resp['s']),
+          :iterations    => 100000,
+          :hash_function => :sha512,
+          :key_length    => 16 * 2,
+        ).bin_string
+        password_hash = df2[0,16]
+        u_hash = Utils.base64urlencode(df2[16,32])
+      end
 
-      resp = request(a: 'us', user: email.strip, uh: u_hash)
+      # Send the login request
+      req = {a: 'us', user: email.strip, uh: u_hash}
+      req[:sek] = Utils.base64urlencode(SecureRandom.random_bytes(16)) if account_version != 1
+      resp = request(req)
 
       @master_key = aes_cbc_decrypt(password_hash, Utils.base64urldecode(resp['k']))
       @rsa_privk = decrypt_rsa_private_key(resp['privk'])

data/lib/rmega/utils.rb

@@ -40,5 +40,12 @@ module Rmega
         ary
       end.map(&:chr).join
     end
+
+    def utf8(s)
+      str = s.dup
+      str.force_encoding("UTF-8") 
+      str.encode!("UTF-8", invalid: :replace, replace: "-")
+      return str
+    end
   end
 end

data/lib/rmega/version.rb

@@ -1,4 +1,4 @@
 module Rmega
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
   HOMEPAGE = "https://github.com/topac/rmega"
 end

data/rmega.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |gem|
   gem.license       = 'MIT'
   gem.required_ruby_version = '>= 1.9.3'
 
+  gem.add_dependency "pbkdf2-ruby"
+
   gem.add_development_dependency "pry"
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "rake"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rmega
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - topac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-05 00:00:00.000000000 Z
+date: 2020-06-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: pbkdf2-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement