glogin 0.9.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cc141a23e15b0f3ab7b965b281e0af9f0b62d35d4d6e4bfe7f08126f5fd15a8
-  data.tar.gz: f1c8f19028513466cc34370655d07d2a9eb0036ee12d36a191c0f46c5e8b89d2
+  metadata.gz: 47dc331e9d98417c38d66ddbeae5b6424284ede02d5a9e1680bc1c3eba6dd3f2
+  data.tar.gz: abaa0b7082a1b641a21b1c5828e8ff775cefe0bd78bae72f01d8a5592098ea00
 SHA512:
-  metadata.gz: '0639b3241684fb1b20c81e0008f1e4366c579acedb4fa5fede72c0920b9e9c6b9b3f8a7a6cae4a63eb49f394ad7592e86f7a11b7dca1765795cdd4e5c9908266'
-  data.tar.gz: 584d6a182b189286a3a2feb9559e9decdf5a0821aa3a62241c4b71373201b348c12969f2afd72352f5e81c27ce629929dbc17f1aa1832dc0a095973aa5d9144f
+  metadata.gz: 9212904c0f496ae545e401e995bc4d1e47e23c9c0d6644fda205a2cad7e46160244417455a3333501c8e542a2707985aea87319dd3fe7982b4b72a2e2d30fb9b
+  data.tar.gz: e093b8ef78894ac6350d8b36f5cacd4251c04957a85b8742d0bd4c7170ff064f77da087172590c5f8715dbb6ba04efd887fa8f4c0821d8c7690d01f280f9a90c

data/.github/workflows/codecov.yml

@@ -6,10 +6,10 @@ on:
       - master
 jobs:
   codecov:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.7
       - run: bundle update

data/.github/workflows/pdd.yml

@@ -0,0 +1,11 @@
+---
+name: pdd
+on:
+  push:
+  pull_request:
+jobs:
+  pdd:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: g4s8/pdd-action@master

data/.github/workflows/rake.yml

@@ -12,12 +12,12 @@ jobs:
     name: test
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
-        ruby: [2.7]
+        os: [ubuntu-20.04, macos-12]
+        ruby: [2.7, 3.2]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
       - run: bundle update

data/.github/workflows/xcop.yml

@@ -0,0 +1,11 @@
+---
+name: xcop
+on:
+  push:
+  pull_request:
+jobs:
+  xcop:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v3
+      - uses: g4s8/xcop-action@master

data/.rultor.yml

@@ -1,11 +1,13 @@
 docker:
-  image: yegor256/rultor-image:1.9.0
+  image: yegor256/rultor-image:1.19.0
 assets:
   rubygems.yml: yegor256/home#assets/rubygems.yml
 install: |
+  sudo gem install openssl -- --with-openssl-dir=/usr/local/rvm/rubies/ruby-3.0.1/lib/ruby/3.0.0/openssl
   pdd -f /dev/null
   sudo bundle install --no-color "--gemfile=$(pwd)/Gemfile"
 release:
+  pre: false
   script: |-
     [[ "${tag}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] || exit -1
     bundle exec rake
@@ -19,7 +21,3 @@ release:
 merge:
   script: |-
     bundle exec rake
-deploy:
-  script: |-
-    echo "There is nothing to deploy"
-    exit -1

data/.simplecov

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-# Copyright (c) 2017-2022 Yegor Bugayenko
+# Copyright (c) 2017-2023 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal

data/Gemfile

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-# Copyright (c) 2017-2022 Yegor Bugayenko
+# Copyright (c) 2017-2023 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -22,5 +22,13 @@
 # SOFTWARE.
 
 source 'https://rubygems.org'
-ruby '~>2.3'
 gemspec
+
+gem 'minitest', '5.18.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 'simplecov', '0.22.0', require: false
+gem 'webmock', '3.18.1', require: false

data/LICENSE.txt

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017-2022 Yegor Bugayenko
+Copyright (c) 2017-2023 Yegor Bugayenko
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the 'Software'), to deal

data/README.md

@@ -1,6 +1,5 @@
 <img src="/logo.svg" width="64px" height="64px"/>
 
-[![Managed by Zerocracy](https://www.0crat.com/badge/C3RFVLU72.svg)](https://www.0crat.com/p/C3RFVLU72)
 [![DevOps By Rultor.com](http://www.rultor.com/b/yegor256/glogin)](http://www.rultor.com/p/yegor256/glogin)
 [![We recommend RubyMine](https://www.elegantobjects.org/rubymine.svg)](https://www.jetbrains.com/ruby/)
 
@@ -10,7 +9,6 @@
 [![Maintainability](https://api.codeclimate.com/v1/badges/155f86b639d155259219/maintainability)](https://codeclimate.com/github/yegor256/glogin/maintainability)
 [![Test Coverage](https://img.shields.io/codecov/c/github/yegor256/glogin.svg)](https://codecov.io/github/yegor256/glogin?branch=master)
 [![Yard Docs](http://img.shields.io/badge/yard-docs-blue.svg)](http://rubydoc.info/github/yegor256/glogin/master/frames)
-
 ![Lines of code](https://img.shields.io/tokei/lines/github/yegor256/glogin)
 [![Hits-of-Code](https://hitsofcode.com/github/yegor256/glogin)](https://hitsofcode.com/view/github/yegor256/glogin)
 [![License](https://img.shields.io/badge/license-MIT-green.svg)](https://github.com/yegor256/glogin/blob/master/LICENSE.txt)

data/Rakefile

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-# Copyright (c) 2017-2022 Yegor Bugayenko
+# Copyright (c) 2017-2023 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal

data/glogin.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2017-2022 Yegor Bugayenko
+# Copyright (c) 2017-2023 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -41,14 +41,7 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
-  s.add_runtime_dependency 'base58', '0.2.3'
-  s.add_development_dependency 'codecov', '0.6.0'
-  s.add_development_dependency 'minitest', '5.16.1'
-  s.add_development_dependency 'rake', '13.0.6'
-  s.add_development_dependency 'rdoc', '6.4.0'
-  s.add_development_dependency 'rspec-rails', '5.1.2'
-  s.add_development_dependency 'rubocop', '1.31.1'
-  s.add_development_dependency 'rubocop-rspec', '2.11.1'
-  s.add_development_dependency 'webmock', '3.14.0'
+  s.add_runtime_dependency 'base58', '~>0.2'
+  s.add_runtime_dependency 'openssl', '~>3.1'
   s.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/glogin/auth.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-# Copyright (c) 2017-2022 Yegor Bugayenko
+# Copyright (c) 2017-2023 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -28,7 +28,7 @@ require 'cgi'
 
 # GLogin main module.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2017-2022 Yegor Bugayenko
+# Copyright:: Copyright (c) 2017-2023 Yegor Bugayenko
 # License:: MIT
 module GLogin
   #

data/lib/glogin/codec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-# Copyright (c) 2017-2022 Yegor Bugayenko
+# Copyright (c) 2017-2023 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -28,60 +28,65 @@ require 'base58'
 
 # Codec.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2017-2022 Yegor Bugayenko
+# Copyright:: Copyright (c) 2017-2023 Yegor Bugayenko
 # License:: MIT
-class GLogin::Codec
-  # When can't decode.
-  class DecodingError < StandardError; end
+module GLogin
+  # The codec
+  class Codec
+    # When can't decode.
+    class DecodingError < StandardError; end
 
-  def initialize(secret = '')
-    raise 'Secret can\'t be nil' if secret.nil?
-    @secret = secret
-  end
+    def initialize(secret = '')
+      raise 'Secret can\'t be nil' if secret.nil?
+      @secret = secret
+    end
 
-  def decrypt(text)
-    raise 'Text can\'t be nil' if text.nil?
-    if @secret.empty?
-      text
-    else
-      cpr = cipher
-      cpr.decrypt
-      cpr.key = digest
-      raise DecodingError unless /^[a-zA-Z0-9]+$/.match?(text)
-      plain = Base58.base58_to_binary(text)
-      raise DecodingError if plain.empty?
-      decrypted = cpr.update(plain)
-      decrypted << cpr.final
-      salt, body = decrypted.to_s.split(' ', 2)
-      raise DecodingError if salt.empty?
-      raise DecodingError if body.nil?
-      body.force_encoding('UTF-8')
-      body
+    def decrypt(text)
+      raise 'Text can\'t be nil' if text.nil?
+      if @secret.empty?
+        text
+      else
+        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)
+        raise DecodingError if plain.empty?
+        decrypted = cpr.update(plain)
+        decrypted << cpr.final
+        salt, body = decrypted.to_s.split(' ', 2)
+        raise DecodingError if salt.empty?
+        raise DecodingError if body.nil?
+        body.force_encoding('UTF-8')
+        body
+      end
+    rescue OpenSSL::Cipher::CipherError => e
+      raise DecodingError, e.message
     end
-  rescue OpenSSL::Cipher::CipherError => e
-    raise DecodingError, e.message
-  end
 
-  def encrypt(text)
-    raise 'Text can\'t be nil' if text.nil?
-    if @secret.empty?
-      text
-    else
-      cpr = cipher
-      cpr.encrypt
-      cpr.key = digest
-      salt = SecureRandom.base64(Random.rand(8..32))
-      encrypted = cpr.update("#{salt} #{text}")
-      encrypted << cpr.final
-      Base58.binary_to_base58(encrypted)
+    def encrypt(text)
+      raise 'Text can\'t be nil' if text.nil?
+      if @secret.empty?
+        text
+      else
+        cpr = cipher
+        cpr.encrypt
+        cpr.key = digest(cpr.key_len)
+        salt = SecureRandom.base64(Random.rand(8..32))
+        encrypted = cpr.update("#{salt} #{text}")
+        encrypted << cpr.final
+        Base58.binary_to_base58(encrypted)
+      end
     end
-  end
 
-  def digest
-    Digest::SHA1.hexdigest(@secret)[0..31]
-  end
+    private
+
+    def digest(len)
+      Digest::SHA1.hexdigest(@secret)[0..len - 1]
+    end
 
-  def cipher
-    OpenSSL::Cipher.new('aes-256-cbc')
+    def cipher
+      OpenSSL::Cipher.new('aes-256-cbc')
+    end
   end
 end

data/lib/glogin/cookie.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-# Copyright (c) 2017-2022 Yegor Bugayenko
+# Copyright (c) 2017-2023 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -28,7 +28,7 @@ require_relative 'codec'
 
 # GLogin main module.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2017-2022 Yegor Bugayenko
+# Copyright:: Copyright (c) 2017-2023 Yegor Bugayenko
 # License:: MIT
 module GLogin
   # Split symbol inside the cookie text

data/lib/glogin/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-# Copyright (c) 2017-2022 Yegor Bugayenko
+# Copyright (c) 2017-2023 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -23,8 +23,8 @@
 
 # GLogin main module.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2017-2022 Yegor Bugayenko
+# Copyright:: Copyright (c) 2017-2023 Yegor Bugayenko
 # License:: MIT
 module GLogin
-  VERSION = '0.9.0'
+  VERSION = '0.11.0'
 end

data/lib/glogin.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-# Copyright (c) 2017-2022 Yegor Bugayenko
+# Copyright (c) 2017-2023 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -28,7 +28,7 @@ require_relative 'glogin/cookie'
 
 # GLogin main module.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2017-2022 Yegor Bugayenko
+# Copyright:: Copyright (c) 2017-2023 Yegor Bugayenko
 # License:: MIT
 module GLogin
 end

data/test/glogin/test_auth.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-# Copyright (c) 2017-2022 Yegor Bugayenko
+# Copyright (c) 2017-2023 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal

data/test/glogin/test_codec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-# Copyright (c) 2017-2022 Yegor Bugayenko
+# Copyright (c) 2017-2023 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -60,6 +60,12 @@ class TestCodec < Minitest::Test
     end
   end
 
+  def test_decrypts_broken_text_with_empty_key
+    assert_raises GLogin::Codec::DecodingError do
+      GLogin::Codec.new('key').decrypt('')
+    end
+  end
+
   def test_encrypts_and_decrypts_with_empty_key
     crypt = GLogin::Codec.new
     text = 'This is the text, дорогой друг!'

data/test/glogin/test_cookie.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-# Copyright (c) 2017-2022 Yegor Bugayenko
+# Copyright (c) 2017-2023 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal

data/test/test__helper.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-# Copyright (c) 2017-2022 Yegor Bugayenko
+# Copyright (c) 2017-2023 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -25,10 +25,6 @@ $stdout.sync = true
 
 require 'simplecov'
 SimpleCov.start
-if ENV['CI'] == 'true'
-  require 'codecov'
-  SimpleCov.formatter = SimpleCov::Formatter::Codecov
-end
 
 require 'minitest/autorun'
 require_relative '../lib/glogin'

data/test/test_glogin.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-# Copyright (c) 2017-2022 Yegor Bugayenko
+# Copyright (c) 2017-2023 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -26,7 +26,7 @@ require_relative '../lib/glogin'
 
 # GLogin main module test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2017-2022 Yegor Bugayenko
+# Copyright:: Copyright (c) 2017-2023 Yegor Bugayenko
 # License:: MIT
 class TestGLogin < Minitest::Test
   def test_basic

metadata

@@ -1,141 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: glogin
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-20 00:00:00.000000000 Z
+date: 2023-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base58
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: codecov
+  name: openssl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 5.16.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 5.16.1
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 13.0.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 13.0.6
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 6.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 6.4.0
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 5.1.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 5.1.2
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.31.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.31.1
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.11.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.11.1
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.14.0
-  type: :development
+        version: '3.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.14.0
+        version: '3.1'
 description: Enables login/logout functionality for a Ruby web app
 email: yegor256@gmail.com
 executables: []
@@ -147,7 +49,9 @@ files:
 - ".0pdd.yml"
 - ".gitattributes"
 - ".github/workflows/codecov.yml"
+- ".github/workflows/pdd.yml"
 - ".github/workflows/rake.yml"
+- ".github/workflows/xcop.yml"
 - ".gitignore"
 - ".pdd"
 - ".rubocop.yml"
@@ -191,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Login/logout via GitHub OAuth for your web app