glogin 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47dc331e9d98417c38d66ddbeae5b6424284ede02d5a9e1680bc1c3eba6dd3f2
-  data.tar.gz: abaa0b7082a1b641a21b1c5828e8ff775cefe0bd78bae72f01d8a5592098ea00
+  metadata.gz: d64766709045453b457180e430e7c21e92e0d2aa83aaf5045496dd579f20ecb4
+  data.tar.gz: '0829be0aa00b90774dfe10c2f2a0957dac27bb516f3c5558127432dea85453fc'
 SHA512:
-  metadata.gz: 9212904c0f496ae545e401e995bc4d1e47e23c9c0d6644fda205a2cad7e46160244417455a3333501c8e542a2707985aea87319dd3fe7982b4b72a2e2d30fb9b
-  data.tar.gz: e093b8ef78894ac6350d8b36f5cacd4251c04957a85b8742d0bd4c7170ff064f77da087172590c5f8715dbb6ba04efd887fa8f4c0821d8c7690d01f280f9a90c
+  metadata.gz: 6242a74d222652a65b6039c10c584e4bd32f581e279d38c86e435f40a1abaac0fcde212f8b827a826d7ebef36e80310072b6636ffe840b341ae3cf636a2499c3
+  data.tar.gz: af688ddc396853533c69b4377c9fe3e4dc3308d8cb9c11d8ef0113c39aa806c8f78d6b22562853aafc26ac89c89d75f0b4604fbc74b8a062c83c2afd1773f4e1

data/.github/workflows/codecov.yml

@@ -6,7 +6,7 @@ on:
       - master
 jobs:
   codecov:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1

data/.github/workflows/pdd.yml

@@ -5,7 +5,7 @@ on:
   pull_request:
 jobs:
   pdd:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - uses: g4s8/pdd-action@master

data/.github/workflows/xcop.yml

@@ -5,7 +5,7 @@ on:
   pull_request:
 jobs:
   xcop:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - uses: g4s8/xcop-action@master

data/.rubocop.yml

@@ -20,8 +20,8 @@ Metrics/AbcSize:
 Metrics/BlockLength:
   Max: 30
 Metrics/CyclomaticComplexity:
-  Max: 10
+  Max: 20
 Metrics/PerceivedComplexity:
-  Max: 10
+  Max: 20
 Layout/EmptyLineAfterGuardClause:
   Enabled: false

data/Gemfile

@@ -24,11 +24,11 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'minitest', '5.18.0', require: false
+gem 'minitest', '5.19.0', require: false
 gem 'rake', '13.0.6', require: false
 gem 'rdoc', '6.5.0', require: false
-gem 'rspec-rails', '5.1.2', require: false
-gem 'rubocop', '1.51.0', require: false
-gem 'rubocop-rspec', '2.22.0', require: false
+gem 'rspec-rails', '6.0.3', require: false
+gem 'rubocop', '1.56.0', require: false
+gem 'rubocop-rspec', '2.23.2', require: false
 gem 'simplecov', '0.22.0', require: false
 gem 'webmock', '3.18.1', require: false

data/lib/glogin/codec.rb

@@ -25,6 +25,7 @@ require 'securerandom'
 require 'openssl'
 require 'digest/sha1'
 require 'base58'
+require 'base64'
 
 # Codec.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -36,9 +37,13 @@ module GLogin
     # When can't decode.
     class DecodingError < StandardError; end
 
-    def initialize(secret = '')
+    # Ctor.
+    # +secret+: The secret to do the encoding
+    # +base64+: If TRUE, Base-64 will be used, otherwise Base-58
+    def initialize(secret = '', base64: false)
       raise 'Secret can\'t be nil' if secret.nil?
       @secret = secret
+      @base64 = base64
     end
 
     def decrypt(text)
@@ -49,8 +54,12 @@ module GLogin
         cpr = cipher
         cpr.decrypt
         cpr.key = digest(cpr.key_len)
-        raise DecodingError unless /^[a-zA-Z0-9]+$/.match?(text)
-        plain = Base58.base58_to_binary(text)
+        if @base64
+          raise DecodingError, 'This is not Base64' unless %r{^[a-zA-Z0-9\\+/=]+$}.match?(text)
+        else
+          raise DecodingError, 'This is not Base58' unless /^[a-zA-Z0-9]+$/.match?(text)
+        end
+        plain = @base64 ? Base64.decode64(text) : Base58.base58_to_binary(text)
         raise DecodingError if plain.empty?
         decrypted = cpr.update(plain)
         decrypted << cpr.final
@@ -75,7 +84,7 @@ module GLogin
         salt = SecureRandom.base64(Random.rand(8..32))
         encrypted = cpr.update("#{salt} #{text}")
         encrypted << cpr.final
-        Base58.binary_to_base58(encrypted)
+        @base64 ? Base64.encode64(encrypted).gsub("\n", '') : Base58.binary_to_base58(encrypted)
       end
     end
 

data/lib/glogin/version.rb

@@ -26,5 +26,5 @@
 # Copyright:: Copyright (c) 2017-2023 Yegor Bugayenko
 # License:: MIT
 module GLogin
-  VERSION = '0.11.0'
+  VERSION = '0.12.0'
 end

data/test/glogin/test_codec.rb

@@ -54,6 +54,13 @@ class TestCodec < Minitest::Test
     assert(!text.include?("\n"), text)
   end
 
+  def test_encrypts_using_base64
+    codec = GLogin::Codec.new('6hFGrte5LLmwi', base64: true)
+    text = 'Hello, world!'
+    enc = codec.encrypt(text)
+    assert_equal(text, codec.decrypt(enc))
+  end
+
   def test_decrypts_broken_text
     assert_raises GLogin::Codec::DecodingError do
       GLogin::Codec.new('the key').decrypt('этот текст не был зашифрован')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glogin
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-23 00:00:00.000000000 Z
+date: 2023-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base58