mirror of
https://github.com/sinatra/sinatra
synced 2023-03-27 23:18:01 -04:00

* Initialize rubocop * Style/StringLiterals: prefer single quotes * Style/AndOr: use `&&` and `||`, instead of `and` and `or` * Style/HashSyntax: use new hash syntax * Layout/EmptyLineAfterGuardClause: add empty lines after guard clause * Style/SingleLineMethods: temporary disable It breaks layout of the code, it is better to fix it manually * Style/Proc: prefer `proc` vs `Proc.new` * Disable Lint/AmbiguousBlockAssociation It affects proc definitions for sinatra DSL * Disable Style/CaseEquality * Lint/UnusedBlockArgument: put underscore in front of it * Style/Alias: prefer alias vs alias_method in a class body * Layout/EmptyLineBetweenDefs: add empty lines between defs * Style/ParallelAssignment: don't use parallel assigment * Style/RegexpLiteral: prefer %r for regular expressions * Naming/UncommunicativeMethodParamName: fix abbrevs * Style/PerlBackrefs: disable cop * Layout/SpaceAfterComma: add missing spaces * Style/Documentation: disable cop * Style/FrozenStringLiteralComment: add frozen_string_literal * Layout/AlignHash: align hash * Layout/ExtraSpacing: allow for alignment * Layout/SpaceAroundOperators: add missing spaces * Style/Not: prefer `!` instead of `not` * Style/GuardClause: add guard conditions * Style/MutableConstant: freeze contants * Lint/IneffectiveAccessModifier: disable cop * Lint/RescueException: disable cop * Style/SpecialGlobalVars: disable cop * Layout/DotPosition: fix position of dot for multiline method chains * Layout/SpaceInsideArrayLiteralBrackets: don't use spaces inside arrays * Layout/SpaceInsideBlockBraces: add space for blocks * Layout/SpaceInsideHashLiteralBraces: add spaces for hashes * Style/FormatString: use format string syntax * Style/StderrPuts: `warn` is preferable to `$stderr.puts` * Bundler/DuplicatedGem: disable cop * Layout/AlignArray: fix warning * Lint/AssignmentInCondition: remove assignments from conditions * Layout/IndentHeredoc: disable cop * Layout/SpaceInsideParens: remove extra spaces * Lint/UnusedMethodArgument: put underscore in front of unused arg * Naming/RescuedExceptionsVariableName: use `e` for exceptions * Style/CommentedKeyword: put comments before the method * Style/FormatStringToken: disable cop * Style/MultilineIfModifier: move condition before the method * Style/SignalException: prefer `raise` to `fail` * Style/SymbolArray: prefer %i for array of symbols * Gemspec/OrderedDependencies: Use alphabetical order for dependencies * Lint/UselessAccessModifier: disable cop * Naming/HeredocDelimiterNaming: change delimiter's name * Style/ClassCheck: prefer `is_a?` to `kind_of?` * Style/ClassVars: disable cop * Style/Encoding: remove coding comment * Style/RedundantParentheses: remove extra parentheses * Style/StringLiteralsInInterpolation: prefer singl quotes * Layout/AlignArguments: fix alignment * Layout/ClosingHeredocIndentation: align heredoc * Layout/EmptyLineAfterMagicComment: add empty line * Set RubyVersion for rubocop * Lint/UselessAssignment: disable cop * Style/EmptyLiteral: disable cop Causes test failures * Minor code-style fixes with --safe-auto-correct option * Disable the rest of the cops that cause warnings It would be easier to re-enable them in separate PRs * Add rubocop check to the default Rake task * Update to rubocop 1.32.0 * Rubocop updates for rack-protection and sinatra-contrib * Disable Style/SlicingWithRange cop * Make suggested updates Co-authored-by: Jordan Owens <jkowens@gmail.com>
62 lines
1.7 KiB
Ruby
62 lines
1.7 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'openssl'
|
|
|
|
module Rack
|
|
module Protection
|
|
module Encryptor
|
|
CIPHER = 'aes-256-gcm'
|
|
DELIMITER = '--'
|
|
|
|
def self.base64_encode(str)
|
|
[str].pack('m0')
|
|
end
|
|
|
|
def self.base64_decode(str)
|
|
str.unpack1('m0')
|
|
end
|
|
|
|
def self.encrypt_message(data, secret, auth_data = '')
|
|
raise ArgumentError, 'data cannot be nil' if data.nil?
|
|
|
|
cipher = OpenSSL::Cipher.new(CIPHER)
|
|
cipher.encrypt
|
|
cipher.key = secret[0, cipher.key_len]
|
|
|
|
# Rely on OpenSSL for the initialization vector
|
|
iv = cipher.random_iv
|
|
|
|
# This must be set to properly use AES GCM for the OpenSSL module
|
|
cipher.auth_data = auth_data
|
|
|
|
cipher_text = cipher.update(data)
|
|
cipher_text << cipher.final
|
|
|
|
"#{base64_encode cipher_text}#{DELIMITER}#{base64_encode iv}#{DELIMITER}#{base64_encode cipher.auth_tag}"
|
|
end
|
|
|
|
def self.decrypt_message(data, secret)
|
|
return unless data
|
|
|
|
cipher = OpenSSL::Cipher.new(CIPHER)
|
|
cipher_text, iv, auth_tag = data.split(DELIMITER, 3).map! { |v| base64_decode(v) }
|
|
|
|
# This check is from ActiveSupport::MessageEncryptor
|
|
# see: https://github.com/ruby/openssl/issues/63
|
|
return if auth_tag.nil? || auth_tag.bytes.length != 16
|
|
|
|
cipher.decrypt
|
|
cipher.key = secret[0, cipher.key_len]
|
|
cipher.iv = iv
|
|
cipher.auth_tag = auth_tag
|
|
cipher.auth_data = ''
|
|
|
|
decrypted_data = cipher.update(cipher_text)
|
|
decrypted_data << cipher.final
|
|
decrypted_data
|
|
rescue OpenSSL::Cipher::CipherError, TypeError, ArgumentError
|
|
nil
|
|
end
|
|
end
|
|
end
|
|
end
|