security 0.0.1 → 0.1.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: '0980117aec9bb1d85ec00fefc9ea234d0f66b7b80d3932e6f90c99d606ed6e96'
+  data.tar.gz: 0f49377f8092f1170da75ffda17f65c0213f77bdc1ed371c6993f4b016b4ca9d
+SHA512:
+  metadata.gz: 5899c11de7a95d4babea7edfcdaaa469dbbec27edd2f746afbc276bda596c54f17641db99aed2e362acac66b842c313b29b2345526d4eb8edba228f61d2486f0
+  data.tar.gz: '08f05552094356cdbe5841deee2316f4ba7ab080026b4a7a77771ae00ae9f7c0920cc9a4946f1bb8c8d4b1523237e4131041a331c69c44f7a0fab32402b44a62'

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source "https://rubygems.org"
 
 gemspec

data/Gemfile.lock

@@ -1,18 +1,19 @@
 PATH
   remote: .
   specs:
-    security (0.0.1)
+    security (0.1.4)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    rake (0.9.2.2)
-    rspec (0.6.4)
+    rake (12.3.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  rake (~> 0.9.2)
-  rspec (~> 0.6.1)
+  rake (~> 12.3, >= 12.3.3)
   security!
+
+BUNDLED WITH
+   2.1.4

data/{LICENSE → LICENSE.md}

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Mattt Thompson (http://mattt.me/)
+Copyright (c) 2012 – 2021 Mattt (https://mat.tt/)
 
 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,24 +1,23 @@
 # Security
-**Library for interacting with the Mac OS X Keychain**
 
-> This library currently only implements the necessary commands for password management for [Cupertino](https://github.com/mattt/cupertino). As such, some methods are stubbed out to raise `NotImplementedError`.
+**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`.
 
 ## Usage
 
 ```ruby
-Security::Keychain::default_keychain.filename #=> "/Users/johnnyappleseed/Library/Keychains/login.keychain"
+Security::Keychain::default_keychain.filename #=> "/Users/jappleseed/Library/Keychains/login.keychain"
 
 Security::InternetPassword.find(server: "itunesconnect.apple.com").password #=> "p4ssw0rd"
 ```
 
-## Contact
-
-Mattt Thompson
+## License
 
-- http://github.com/mattt
-- http://twitter.com/mattt
-- m@mattt.me
+MIT
 
-## License
+## Contact
 
-Security is available under the MIT license. See the LICENSE file for more info.
+Mattt ([@mattt](https://twitter.com/mattt))

data/lib/security.rb

@@ -1,7 +1,4 @@
-module Security
-  VERSION = "0.0.1"
-end
-
+require 'security/version'
 require 'security/keychain'
 require 'security/certificate'
 require 'security/password'

data/lib/security/certificate.rb

@@ -16,4 +16,4 @@ module Security
       end
     end
   end
-end
+end

data/lib/security/keychain.rb

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 module Security
   class Keychain
     DOMAINS = [:user, :system, :common, :dynamic]
@@ -9,19 +11,19 @@ module Security
     end
 
     def info
-      system %{security show-keychain-info "#{@filename}"}
+      system %{security show-keychain-info #{@filename.shellescape}}
     end
 
     def lock
-      system %{security lock-keychain "#{@filename}"}
+      system %{security lock-keychain #{@filename.shellescape}}
     end
 
     def unlock(password)
-      system %{security unlock-keychain -p #{password} "#{@filename}"}
+      system %{security unlock-keychain -p #{password.shellescape} #{@filename.shellescape}}
     end
 
     def delete
-      system %{security delete-keychain "#{@filename}"}
+      system %{security delete-keychain #{@filename.shellescape}}
     end
 
     class << self
@@ -32,7 +34,7 @@ module Security
       def list(domain = :user)
         raise ArgumentError "Invalid domain #{domain}, expected one of: #{DOMAINS}" unless DOMAINS.include?(domain)
 
-        keychains_from_command('list-keychains', domain)
+        keychains_from_output(`security list-keychains -d #{domain}`)
       end
 
       def lock
@@ -40,22 +42,22 @@ module Security
       end
 
       def unlock(password)
-        system %{security unlock-keychain -p #{password}}
+        system %{security unlock-keychain -p #{password.shellescape}}
       end
 
       def default_keychain
-        keychains_from_command('default-keychain').first
+        keychains_from_output(`security default-keychain`).first
       end
 
       def login_keychain
-        keychains_from_command('login-keychain').first
+        keychains_from_output(`security login-keychain`).first
       end
 
       private
 
-      def keychains_from_command(command, *args)
-        `security #{[command, *args].compact.join(' ')}`.split(/\n/).collect{|line| new(line.strip.gsub(/^\"|\"$/, ""))}
+      def keychains_from_output(output)
+        output.split(/\n/).collect{|line| new(line.strip.gsub(/^\"|\"$/, ""))}
       end
-    end    
+    end
   end
 end

data/lib/security/password.rb

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 module Security
   class Password
     attr_reader :keychain, :attributes, :password
@@ -7,14 +9,14 @@ module Security
     def initialize(keychain, attributes, password)
       @keychain = Keychain.new(keychain)
       @attributes = attributes
-      @password = password 
+      @password = password
     end
 
     class << self
       private
 
       def password_from_output(output)
-        return nil if /^security\: / === output 
+        return nil if /^security\: / === output
 
         keychain, attributes, password = nil, {}, nil
         output.split(/\n/).each do |line|
@@ -33,22 +35,21 @@ module Security
 
       def flags_for_options(options = {})
         flags = options.dup
-        flags[:a] ||= options.delete(:account)
-        flags[:c] ||= options.delete(:creator)
-        flags[:C] ||= options.delete(:type)
-        flags[:D] ||= options.delete(:kind)
-        flags[:G] ||= options.delete(:value)
-        flags[:j] ||= options.delete(:comment)
-        flags[:s] ||= options.delete(:service) || options.delete(:server)
-
-        flags.delete_if{|k,v| v.nil?}.collect{|k, v| "-#{k} #{v}".strip}.join(" ")
+        flags[:a] ||= flags.delete(:account)
+        flags[:c] ||= flags.delete(:creator)
+        flags[:C] ||= flags.delete(:type)
+        flags[:D] ||= flags.delete(:kind)
+        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(" ")
       end
     end
   end
 
   class GenericPassword < Password
     class << self
-      def add(account, service, password, options = {})
+      def add(service, account, password, options = {})
         options[:a] = account
         options[:s] = service
         options[:w] = password
@@ -57,31 +58,34 @@ module Security
       end
 
       def find(options)
-        options[:g] = ''
-
-        password_from_output(`security 2>&1 find-generic-password #{flags_for_options(options)}`)
+        password_from_output(`security 2>&1 find-generic-password -g #{flags_for_options(options)}`)
       end
 
       def delete(options)
         system "security delete-generic-password #{flags_for_options(options)}"
       end
+
+      private
+
+      def flags_for_options(options = {})
+        options[:s] ||= options.delete(:service)
+        super(options)
+      end
     end
   end
 
   class InternetPassword < Password
     class << self
-      def add(account, server, password, options = {})
+      def add(server, account, password, options = {})
         options[:a] = account
         options[:s] = server
         options[:w] = password
-        
+
         system "security add-internet-password #{flags_for_options(options)}"
       end
 
       def find(options)
-        options[:g] = ''
-
-        password_from_output(`security 2>&1 find-internet-password #{flags_for_options(options)}`)
+        password_from_output(`security 2>&1 find-internet-password -g #{flags_for_options(options)}`)
       end
 
       def delete(options)
@@ -91,6 +95,7 @@ module Security
       private
 
       def flags_for_options(options = {})
+        options[:s] ||= options.delete(:server)
         options[:p] ||= options.delete(:path)
         options[:P] ||= options.delete(:port)
         options[:r] ||= options.delete(:protocol)

data/lib/security/version.rb

@@ -0,0 +1,3 @@
+module Security
+  VERSION = "0.1.4"
+end

data/security.gemspec

@@ -4,16 +4,15 @@ require "security"
 
 Gem::Specification.new do |s|
   s.name        = "security"
-  s.authors     = ["Mattt Thompson"]
-  s.email       = "m@mattt.me"
-  s.homepage    = "http://mattt.me"
+  s.authors     = ["Mattt"]
+  s.email       = "mattt@me.com"
+  s.homepage    = "https://mat.tt/"
   s.version     = Security::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.summary     = "Security"
-  s.description = "Library for interacting with the Mac OS X Keychain"
+  s.license     = "MIT"
+  s.summary     = "Interact with the macOS Keychain"
 
-  s.add_development_dependency "rspec", "~> 0.6.1"
-  s.add_development_dependency "rake",  "~> 0.9.2"
+  s.add_development_dependency 'rake', '~> 12.3', '>= 12.3.3'
 
   s.files         = Dir["./**/*"].reject { |file| file =~ /\.\/(bin|log|pkg|script|spec|test|vendor)/ }
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,82 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: security
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.1.4
 platform: ruby
 authors:
-- Mattt Thompson
+- Mattt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-21 00:00:00.000000000Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70220282679320 !ruby/object:Gem::Requirement
-    none: false
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.3'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 12.3.3
   type: :development
   prerelease: false
-  version_requirements: *70220282679320
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70220282678600 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
-  type: :development
-  prerelease: false
-  version_requirements: *70220282678600
-description: Library for interacting with the Mac OS X Keychain
-email: m@mattt.me
+        version: '12.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
+description: 
+email: mattt@me.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ./Gemfile
-- ./Gemfile.lock
-- ./lib/security/certificate.rb
-- ./lib/security/keychain.rb
-- ./lib/security/password.rb
-- ./lib/security.rb
-- ./LICENSE
-- ./Rakefile
-- ./README.md
-- ./security.gemspec
-homepage: http://mattt.me
-licenses: []
+- "./Gemfile"
+- "./Gemfile.lock"
+- "./LICENSE.md"
+- "./README.md"
+- "./Rakefile"
+- "./lib/security.rb"
+- "./lib/security/certificate.rb"
+- "./lib/security/keychain.rb"
+- "./lib/security/password.rb"
+- "./lib/security/version.rb"
+- "./security-0.1.3.gem"
+- "./security.gemspec"
+homepage: https://mat.tt/
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4232387281816222953
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4232387281816222953
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 3.1.2
 signing_key: 
-specification_version: 3
-summary: Security
+specification_version: 4
+summary: Interact with the macOS Keychain
 test_files: []