security 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0980117aec9bb1d85ec00fefc9ea234d0f66b7b80d3932e6f90c99d606ed6e96'
-  data.tar.gz: 0f49377f8092f1170da75ffda17f65c0213f77bdc1ed371c6993f4b016b4ca9d
+  metadata.gz: d010aca28c455caae65e0063ab5ee35336eace64fd8049012c66f77edc634f20
+  data.tar.gz: a46b316771d171579e241b7c875b99bdaaa0f0cc6e7f9312d1627767b90c3c9e
 SHA512:
-  metadata.gz: 5899c11de7a95d4babea7edfcdaaa469dbbec27edd2f746afbc276bda596c54f17641db99aed2e362acac66b842c313b29b2345526d4eb8edba228f61d2486f0
-  data.tar.gz: '08f05552094356cdbe5841deee2316f4ba7ab080026b4a7a77771ae00ae9f7c0920cc9a4946f1bb8c8d4b1523237e4131041a331c69c44f7a0fab32402b44a62'
+  metadata.gz: 106ba3c86bc5254bd1d589d1de99ea992b4cb12731761ff79faeed1cbe48f495451520b6ebbf91c50f6fb41b838ecd01de11eec9ca08d97e39c853cc457844e5
+  data.tar.gz: 636bfaf6e7a5b88eb38112008d3a46ed13da71cd13e8e16bb9891a24b5fbd8fca85dd58017f505d1c0df45264a1be3773f9bf15e973b688f0069135463407cf6

data/Gemfile

@@ -1,3 +1,10 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'rake', '~> 13.4'
+gem 'rspec'
+gem 'rubocop'
+gem 'simplecov'
 
 gemspec

data/Gemfile.lock

@@ -1,19 +1,68 @@
 PATH
   remote: .
   specs:
-    security (0.1.4)
+    security (0.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    rake (12.3.3)
+    ast (2.4.3)
+    diff-lcs (1.6.2)
+    json (2.21.2)
+    language_server-protocol (3.17.0.6)
+    lint_roller (1.1.0)
+    parallel (2.1.0)
+    parser (3.3.12.0)
+      ast (~> 2.4.1)
+      racc
+    prism (1.9.0)
+    racc (1.8.1)
+    rainbow (3.1.1)
+    rake (13.4.2)
+    regexp_parser (2.12.0)
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.8)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.7)
+    rubocop (1.89.0)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (>= 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.50.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.7)
+    ruby-progressbar (1.13.0)
+    simplecov (1.1.1)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
 
 PLATFORMS
   ruby
+  x86_64-linux
 
 DEPENDENCIES
-  rake (~> 12.3, >= 12.3.3)
+  rake (~> 13.4)
+  rspec
+  rubocop
   security!
+  simplecov
 
 BUNDLED WITH
-   2.1.4
+   2.6.9

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2012 – 2021 Mattt (https://mat.tt/)
+Copyright (c) 2012 – 2021 The Fastlane Community Contributors
 
 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,14 +1,19 @@
 # Security
 
+[![Build Status][build status badge]][build status]
+[![Gem](https://img.shields.io/gem/v/security.svg?style=flat)](https://rubygems.org/gems/security)
+[![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/fastlane-community/security/blob/main/LICENSE.md)
+
 **A library for interacting with the macOS Keychain**
 
-> This library implements only the commands necessary for password management in
-> [Cupertino](https://github.com/mattt/cupertino).
-> As such, some methods are stubbed out to raise `NotImplementedError`.
+> This library provides only a subset of `security` subcommands,
+> and is not intended for general use.
 
 ## Usage
 
 ```ruby
+require 'security'
+
 Security::Keychain::default_keychain.filename #=> "/Users/jappleseed/Library/Keychains/login.keychain"
 
 Security::InternetPassword.find(server: "itunesconnect.apple.com").password #=> "p4ssw0rd"
@@ -18,6 +23,5 @@ Security::InternetPassword.find(server: "itunesconnect.apple.com").password #=>
 
 MIT
 
-## Contact
-
-Mattt ([@mattt](https://twitter.com/mattt))
+[build status]: https://github.com/mattt/Security/actions?query=workflow%3ACI
+[build status badge]: https://github.com/mattt/Security/workflows/CI/badge.svg

data/Rakefile

@@ -1,10 +1,10 @@
-require "bundler"
-Bundler.setup
+# frozen_string_literal: true
 
-gemspec = eval(File.read("security.gemspec"))
+require 'bundler'
+Bundler.setup
 
-task :build => "#{gemspec.full_name}.gem"
+require 'bundler/gem_tasks'
 
-file "#{gemspec.full_name}.gem" => gemspec.files + ["security.gemspec"] do
-  system "gem build security.gemspec"
+task :default do
+  system 'rake -T'
 end

data/lib/security/certificate.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 module Security
+  # :nodoc:
   class Certificate
     private_class_method :new
 

data/lib/security/keychain.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 require 'shellwords'
 
 module Security
+  # :nodoc:
   class Keychain
-    DOMAINS = [:user, :system, :common, :dynamic]
+    DOMAINS = %i[user system common dynamic].freeze
 
     attr_reader :filename
 
@@ -11,19 +14,19 @@ module Security
     end
 
     def info
-      system %{security show-keychain-info #{@filename.shellescape}}
+      system %(security show-keychain-info #{@filename.shellescape})
     end
 
     def lock
-      system %{security lock-keychain #{@filename.shellescape}}
+      system %(security lock-keychain #{@filename.shellescape})
     end
 
     def unlock(password)
-      system %{security unlock-keychain -p #{password.shellescape} #{@filename.shellescape}}
+      system %(security unlock-keychain -p #{password.shellescape} #{@filename.shellescape})
     end
 
     def delete
-      system %{security delete-keychain #{@filename.shellescape}}
+      system %(security delete-keychain #{@filename.shellescape})
     end
 
     class << self
@@ -38,11 +41,11 @@ module Security
       end
 
       def lock
-        system %{security lock-keychain -a}
+        system %(security lock-keychain -a)
       end
 
       def unlock(password)
-        system %{security unlock-keychain -p #{password.shellescape}}
+        system %(security unlock-keychain -p #{password.shellescape})
       end
 
       def default_keychain
@@ -56,7 +59,7 @@ module Security
       private
 
       def keychains_from_output(output)
-        output.split(/\n/).collect{|line| new(line.strip.gsub(/^\"|\"$/, ""))}
+        output.split("\n").collect { |line| new(line.strip.gsub(/^"|"$/, '')) }
       end
     end
   end

data/lib/security/password.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 require 'shellwords'
 
 module Security
+  # :nodoc:
   class Password
     attr_reader :keychain, :attributes, :password
 
@@ -16,17 +19,23 @@ module Security
       private
 
       def password_from_output(output)
-        return nil if /^security\: / === output
+        return nil if output.match?(/^security: /)
 
-        keychain, attributes, password = nil, {}, nil
-        output.split(/\n/).each do |line|
+        keychain = nil
+        attributes = {}
+        password = nil
+        output.split("\n").each do |line|
           case line
-          when /^keychain\: \"(.+)\"/
-            keychain = $1
-          when /\"(\w{4})\".+\=\"(.+)\"/
-            attributes[$1] = $2
-          when /^password\: \"(.+)\"/
-            password = $1
+          when /^keychain: "(.+)"/
+            keychain = Regexp.last_match(1)
+          when /"(\w{4})".+="(.+)"/
+            attributes[Regexp.last_match(1)] = Regexp.last_match(2)
+          when /"(\w{4})"<blob>=0x([[:xdigit:]]+)/
+            attributes[Regexp.last_match(1)] = decode_hex_blob(Regexp.last_match(2))
+          when /^password: "(.+)"/
+            password = Regexp.last_match(1)
+          when /^password: 0x([[:xdigit:]]+)/
+            password = decode_hex_blob(Regexp.last_match(1))
           end
         end
 
@@ -42,11 +51,16 @@ module Security
         flags[:G] ||= flags.delete(:value)
         flags[:j] ||= flags.delete(:comment)
 
-        flags.delete_if{|k,v| v.nil?}.collect{|k, v| "-#{k} #{v.shellescape}".strip}.join(" ")
+        flags.delete_if { |_k, v| v.nil? }.collect { |k, v| "-#{k} #{v.shellescape}".strip }.join(' ')
+      end
+
+      def decode_hex_blob(string)
+        [string].pack('H*').force_encoding('UTF-8')
       end
     end
   end
 
+  # :nodoc:
   class GenericPassword < Password
     class << self
       def add(service, account, password, options = {})
@@ -69,11 +83,12 @@ module Security
 
       def flags_for_options(options = {})
         options[:s] ||= options.delete(:service)
-        super(options)
+        super
       end
     end
   end
 
+  # :nodoc:
   class InternetPassword < Password
     class << self
       def add(server, account, password, options = {})
@@ -99,7 +114,7 @@ module Security
         options[:p] ||= options.delete(:path)
         options[:P] ||= options.delete(:port)
         options[:r] ||= options.delete(:protocol)
-        super(options)
+        super
       end
     end
   end

data/lib/security/version.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# :nodoc:
 module Security
-  VERSION = "0.1.4"
+  VERSION = '0.2.0'
 end

data/lib/security.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'security/version'
 require 'security/keychain'
 require 'security/certificate'

data/security.gemspec

@@ -1,21 +1,21 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "security"
+# frozen_string_literal: true
+
+require_relative 'lib/security/version'
 
 Gem::Specification.new do |s|
-  s.name        = "security"
-  s.authors     = ["Mattt"]
-  s.email       = "mattt@me.com"
-  s.homepage    = "https://mat.tt/"
+  s.name        = 'security'
+  s.authors     = ['Josh Holtz', 'Mattt', 'iBotPeaches']
+  s.email       = 'me@joshholtz.com'
+  s.homepage    = 'https://github.com/fastlane-community/security'
   s.version     = Security::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.license     = "MIT"
-  s.summary     = "Interact with the macOS Keychain"
+  s.license     = 'MIT'
+  s.summary     = 'Interact with the macOS Keychain'
 
-  s.add_development_dependency 'rake', '~> 12.3', '>= 12.3.3'
+  s.files         = Dir['./**/*'].grep_v(%r{\./(bin|log|pkg|script|spec|test|vendor)})
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
+  s.required_ruby_version = '>= 3.0.0'
 
-  s.files         = Dir["./**/*"].reject { |file| file =~ /\.\/(bin|log|pkg|script|spec|test|vendor)/ }
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,37 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: security
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
+- Josh Holtz
 - Mattt
-autorequire: 
+- iBotPeaches
 bindir: bin
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.3.3
-description: 
-email: mattt@me.com
+date: 1980-01-02 00:00:00.000000000 Z
+dependencies: []
+email: me@joshholtz.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -46,13 +26,12 @@ files:
 - "./lib/security/keychain.rb"
 - "./lib/security/password.rb"
 - "./lib/security/version.rb"
-- "./security-0.1.3.gem"
 - "./security.gemspec"
-homepage: https://mat.tt/
+homepage: https://github.com/fastlane-community/security
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -60,15 +39,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Interact with the macOS Keychain
 test_files: []