trocla 0.0.8 → 0.0.9

data/README.md

@@ -125,6 +125,16 @@ to address.
 
 Simply build and install the gem. 
 
+## Update & Changes
+
+### to 0.0.8
+
+1. be sure to update as well the moneta gem, trocla now uses the official moneta releases and supports current avaiable versions.
+1. Options for moneta's backends have changed. For example, if you are using the yaml-backend you will likely need to change the adapter option `:path:` to `:file:` to match moneta's new API.
+1. **IMPORTANT:** If you are using the yaml backend you need to migrate the current data *before* using the new trocla version! You can migrate the datastore by using the following two sed commands: `sed -i 's/^\s\{3\}/ /' /PATH/TO/trocla_data.yaml` && `sed -i '/^\s\{2\}value\:/d' /PATH/TO/trocla_data.yaml`.
+1. **SECURITY:** Previous versions of trocla used quite a simple random generator. Especially in combination with the puppet `fqdn_rand` function, you likely have very predictable random passwords and I recommend you to regenerate all randomly generated passwords! Now!
+1. We now support reading passwords from files, which means that you can now also easily add multi-line passwords. Have a look at the documentation above.
+
 ## Contributing to trocla
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/bin/trocla

@@ -55,8 +55,8 @@ end
 def set(options)
   if options.delete(:ask_password)
     require 'highline/import'
-    password = ask("Enter your password: ") { |q| q.echo = "x" }
-    pwd2 = ask("Repeat password: ") { |q| q.echo = "x" }
+    password = ask("Enter your password: ") { |q| q.echo = "x" }.to_s
+    pwd2 = ask("Repeat password: ") { |q| q.echo = "x" }.to_s
     unless password == pwd2
       STDERR.puts "Passwords did not match, exiting!"
       exit 1
@@ -64,10 +64,11 @@ def set(options)
   else
     password = options.delete(:password) || STDIN.read.chomp
   end
+  format = options.delete(:trocla_format)
   Trocla.new(options.delete(:config_file)).set_password(
     options.delete(:trocla_key),
-    options.delete(:trocla_format),
-    password
+    format,
+    Trocla::Formats[format].format(password, options.delete(:other_options).shift.to_s)
   )
   ""
 end

data/lib/VERSION

@@ -1,4 +1,4 @@
 major:0
 minor:0
-patch:8
+patch:9
 build:

data/lib/trocla/formats/ssha.rb

@@ -0,0 +1,9 @@
+# salted crypt
+require 'base64'
+require 'digest'
+class Trocla::Formats::Ssha
+  def format(plain_password,options={})
+     salt = options['salt'] || Trocla::Util.salt(16)
+     "{SSHA}"+Base64.encode64("#{Digest::SHA1.digest("#{plain_password}#{salt}")}#{salt}").chomp
+  end
+end

data/trocla.gemspec

@@ -4,15 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{trocla}
-  s.version = "0.0.8"
+  s.name = "trocla"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mh"]
-  s.date = %q{2013-01-14}
-  s.default_executable = %q{trocla}
-  s.description = %q{Trocla helps you to generate random passwords and to store them in various formats (plain, MD5, bcrypt) for later retrival.}
-  s.email = %q{mh+trocla@immerda.ch}
+  s.date = "2013-10-03"
+  s.description = "Trocla helps you to generate random passwords and to store them in various formats (plain, MD5, bcrypt) for later retrival."
+  s.email = "mh+trocla@immerda.ch"
   s.executables = ["trocla"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -39,6 +38,7 @@ Gem::Specification.new do |s|
     "lib/trocla/formats/plain.rb",
     "lib/trocla/formats/sha256crypt.rb",
     "lib/trocla/formats/sha512crypt.rb",
+    "lib/trocla/formats/ssha.rb",
     "lib/trocla/util.rb",
     "lib/trocla/version.rb",
     "spec/data/.keep",
@@ -47,11 +47,11 @@ Gem::Specification.new do |s|
     "spec/trocla_spec.rb",
     "trocla.gemspec"
   ]
-  s.homepage = %q{https://tech.immerda.ch/2011/12/trocla-get-hashed-passwords-out-of-puppet-manifests/}
+  s.homepage = "https://tech.immerda.ch/2011/12/trocla-get-hashed-passwords-out-of-puppet-manifests/"
   s.licenses = ["GPLv3"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Trocla a simple password generator and storage}
+  s.rubygems_version = "1.8.25"
+  s.summary = "Trocla a simple password generator and storage"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

metadata

@@ -1,168 +1,170 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: trocla
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 0.0.9
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 8
-  version: 0.0.8
 platform: ruby
-authors: 
+authors:
 - mh
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-14 00:00:00 +01:00
-default_executable: trocla
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
+date: 2013-10-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: moneta
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 7
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.7.2
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  name: highline
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.2
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: bcrypt-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 2
-        - 4
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.4.0
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
   type: :development
-  name: rdoc
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 3
-        - 8
-        version: "3.8"
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.8'
   type: :development
-  name: mocha
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.8'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: bundler
   prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 2
-        - 3
+      - !ruby/object:Gem::Version
         version: 1.2.3
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
   type: :development
-  name: jeweler
   prerelease: false
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.3
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.6.4
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+- !ruby/object:Gem::Dependency
   name: rcov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id009
-description: Trocla helps you to generate random passwords and to store them in various formats (plain, MD5, bcrypt) for later retrival.
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Trocla helps you to generate random passwords and to store them in various
+  formats (plain, MD5, bcrypt) for later retrival.
 email: mh+trocla@immerda.ch
-executables: 
+executables:
 - trocla
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.md
-files: 
+files:
 - .document
 - .rspec
 - .travis.yml
@@ -183,6 +185,7 @@ files:
 - lib/trocla/formats/plain.rb
 - lib/trocla/formats/sha256crypt.rb
 - lib/trocla/formats/sha512crypt.rb
+- lib/trocla/formats/ssha.rb
 - lib/trocla/util.rb
 - lib/trocla/version.rb
 - spec/data/.keep
@@ -190,39 +193,32 @@ files:
 - spec/trocla/util_spec.rb
 - spec/trocla_spec.rb
 - trocla.gemspec
-has_rdoc: true
 homepage: https://tech.immerda.ch/2011/12/trocla-get-hashed-passwords-out-of-puppet-manifests/
-licenses: 
+licenses:
 - GPLv3
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -851903621501958623
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Trocla a simple password generator and storage
 test_files: []
-