trocla 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f7a0780a994967b2822530c7f6d0d705b76e35200e7829056d7d5ba1d78c754
-  data.tar.gz: ac7ca45af328553379edc3c4fe5e9f77c455a48078d9b4dec3c9499620ed855f
+  metadata.gz: 23d5e8dfd009afd3c57c7621398d319cb5ccc503a2d8af485c32d99593ecd5c3
+  data.tar.gz: a8390bafef25e87f0c21c2a2e5c5035fcbb54e7dd2eb2ce337142dae6412e0ac
 SHA512:
-  metadata.gz: 650c500e320f1b67171e54efff85f6b519c7d577f6fd4f08ea9ea5eb06228a59430db544307f74846c7a9050f09d6a942a8c427aa7564c095432edfe85e40319
-  data.tar.gz: 8acc3a03116b77adbc13534a4d25ecd06d3eef9f6a6e8142ffcdd9bcb5cefce034936c0cfd149a6172cc2eeed80a88a3fac02300175e1c4abfd74b3b7d2ca1ef
+  metadata.gz: bb1442e7ce601a9c057c3df1dfba3eef8d59c0bb09112b30258978beff97e3f65bb38b3908db8e4f54ec90681fb5a3b4a355341c621273b34a2c540266a4251c
+  data.tar.gz: d8bc6e8656184fe454b3716cf137f48d1e2aa46ffdf368b4af528363fde7f159b17d8c5ea729792b7eac34d10d1610f05da35d33a09381d78ba52e0c69eda8f1

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## to 0.8.0
+
+* Add Argon2 format - Fixes [#84](https://github.com/duritong/trocla/issues/84)
+* Add yescrypt format - Fixes [#81](https://github.com/duritong/trocla/issues/81) - not supported on Jruby
+
+## to 0.7.0
+
+* bump support for various dependencies and ruby versions
+* get rid off jeweler gem
+
 ## to 0.6.0
 
 * move away from sha1 since they are not supported anymore on all distributions

data/README.md

@@ -174,6 +174,17 @@ Password hashes for PostgreSQL servers. Since postgesql 10 you can use the sha25
 You are able to tune the [cost factor of bcrypt](https://github.com/codahale/bcrypt-ruby#cost-factors) by passing the option `cost`.
 Note: ruby bcrypt does not support a [cost > 31](https://github.com/codahale/bcrypt-ruby/blob/master/lib/bcrypt/password.rb#L45).
 
+### argon2
+
+You are able to tune argon2 options by passing the option `argon2` with what the [Argon2](https://github.com/technion/ruby-argon2?tab=readme-ov-file#usage) rubygem supports.
+
+### yescrypt
+
+You are able to tune the cost factor of yescrypt by passing the option `cost`.
+Note: yescrypt does not support a cost > 11
+
+**Important:** Since we are using [XCrypt](https://github.com/rkh/ruby-xcrypt) gem, which calls out to libxcrypt through FFI, you cannot use the yecrypt format on JRuby installations, aka. OpenVox Server installations. If you want to deliver yescrypt hashes in your Puppet manifests, you need to generate the yescrypt hash in a Ruby MRI installation, once the hash is in the trocla database a OpenVox Server can just fetch it.
+
 ### x509
 
 This format takes a set of additional options. Required are:
@@ -247,7 +258,6 @@ Output render options are:
 ## Installation
 
 * Debian has trocla within its sid-release: `apt-get install trocla`
-* For RHEL/CentOS 7 there is a [copr reporisotry](https://copr.fedoraproject.org/coprs/duritong/trocla/). Follow the help there to integrate the repository and install trocla.
 * Trocla is also distributed as gem: `gem install trocla`
 
 ## Configuration
@@ -420,6 +430,6 @@ See [Changelog](CHANGELOG.md)
 
 ## Copyright
 
-Copyright (c) 2011-2015 mh. See LICENSE.txt for
+Copyright (c) 2011-2026 mh. See LICENSE.txt for
 further details.
 

data/lib/trocla/formats/argon2.rb

@@ -0,0 +1,7 @@
+class Trocla::Formats::Argon2 < Trocla::Formats::Base
+  expensive true
+  require 'argon2'
+  def format(plain_password, options = {})
+    Argon2::Password.create(plain_password,options['argon2'] || {})
+  end
+end

data/lib/trocla/formats/yescrypt.rb

@@ -0,0 +1,9 @@
+class Trocla::Formats::Yescrypt < Trocla::Formats::Base
+  expensive true
+  require 'xcrypt' unless Object.const_defined?(:RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
+  def format(plain_password, options = {})
+    raise 'Not supported on Jruby' if Object.const_defined?(:RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
+    raise "Unsupported cost factor" if options['cost'] && options['cost'] > 11
+    XCrypt.yescrypt(plain_password, cost: options['cost'])
+  end
+end

data/lib/trocla/version.rb

@@ -1,20 +1,11 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 class Trocla
-  # VERSION
-  class VERSION
-    version = {}
-    File.read(File.join(File.dirname(__FILE__), '../', 'VERSION')).each_line do |line|
-      type, value = line.chomp.split(':')
-      next if type =~ /^\s+$/ || value =~ /^\s+$/
-
-      version[type] = value
-    end
-
-    MAJOR = version['major']
-    MINOR = version['minor']
-    PATCH = version['patch']
-    BUILD = version['build']
+  module VERSION
+    MAJOR = 0
+    MINOR = 8
+    PATCH = 0
+    BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trocla
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - mh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-30 00:00:00.000000000 Z
+date: 2026-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -16,167 +16,188 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: moneta
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: sshkey
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: base64
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 0.3.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: pstore
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '0.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: argon2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
+        version: '2.3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: xcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: rspec-pending_for
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.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
+  formats (plain, MD5, bcrypt) for later retrieval.
+email:
+- mh+trocla@immerda.ch
 executables:
 - trocla
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.md
+extra_rdoc_files: []
 files:
-- ".document"
-- ".github/workflows/ruby.yml"
-- ".rspec"
 - CHANGELOG.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
 - bin/trocla
-- ext/redhat/rubygem-trocla.spec
-- lib/VERSION
 - lib/trocla.rb
 - lib/trocla/default_config.yaml
 - lib/trocla/encryptions.rb
 - lib/trocla/encryptions/none.rb
 - lib/trocla/encryptions/ssl.rb
 - lib/trocla/formats.rb
+- lib/trocla/formats/argon2.rb
 - lib/trocla/formats/bcrypt.rb
 - lib/trocla/formats/md5crypt.rb
 - lib/trocla/formats/mysql.rb
@@ -189,6 +210,7 @@ files:
 - lib/trocla/formats/sshkey.rb
 - lib/trocla/formats/wireguard.rb
 - lib/trocla/formats/x509.rb
+- lib/trocla/formats/yescrypt.rb
 - lib/trocla/hooks.rb
 - lib/trocla/store.rb
 - lib/trocla/stores.rb
@@ -197,25 +219,13 @@ files:
 - lib/trocla/stores/vault.rb
 - lib/trocla/util.rb
 - lib/trocla/version.rb
-- spec/data/.keep
-- spec/fixtures/delete_test_hook.rb
-- spec/fixtures/set_test_hook.rb
-- spec/spec_helper.rb
-- spec/trocla/encryptions/none_spec.rb
-- spec/trocla/encryptions/ssl_spec.rb
-- spec/trocla/formats/pgsql_spec.rb
-- spec/trocla/formats/sshkey_spec.rb
-- spec/trocla/formats/x509_spec.rb
-- spec/trocla/hooks_spec.rb
-- spec/trocla/store/memory_spec.rb
-- spec/trocla/store/moneta_spec.rb
-- spec/trocla/util_spec.rb
-- spec/trocla_spec.rb
-- trocla.gemspec
 homepage: https://tech.immerda.ch/2011/12/trocla-get-hashed-passwords-out-of-puppet-manifests/
 licenses:
-- GPLv3
-metadata: {}
+- GPL-3.0-or-later
+metadata:
+  homepage_uri: https://tech.immerda.ch/2011/12/trocla-get-hashed-passwords-out-of-puppet-manifests/
+  source_code_uri: https://github.com/duritong/trocla
+  changelog_uri: https://github.com/duritong/trocla/blob/master/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -224,7 +234,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.document

@@ -1,4 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-LICENSE.txt

data/.github/workflows/ruby.yml

@@ -1,24 +0,0 @@
----
-name: Ruby
-on: [push, pull_request]
-jobs:
-  spec:
-    runs-on: ubuntu-latest
-    steps:
-      - name: check out repository
-        uses: actions/checkout@v3
-      - name: set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-          ruby-version: ${{ matrix.ruby }}
-      - name: install dependencies
-        run: bundle install
-      - name: install wireguard
-        run: sudo apt install -y wireguard
-      - name: run rspec
-        run: bundle exec rake spec
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: ['2.5','2.7', '3.0', '3.1','3.2','3.3','head','jruby','jruby-head']

data/.rspec

@@ -1 +0,0 @@
---color --format documentation

data/Gemfile

@@ -1,24 +0,0 @@
-source 'http://rubygems.org'
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
-
-gem 'highline', '~> 2.0.0'
-gem 'moneta', '~> 1.0'
-
-if defined?(RUBY_ENGINE) && (RUBY_ENGINE == 'jruby')
-  gem 'jruby-openssl'
-end
-gem 'bcrypt'
-gem 'sshkey'
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem 'rake'
-  gem 'addressable'
-  gem 'jeweler', '~> 2.0'
-  gem 'rdoc'
-  gem 'rspec'
-  gem 'rspec-pending_for'
-end

data/Rakefile

@@ -1,53 +0,0 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-
-require 'jeweler'
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
-require 'trocla'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "trocla"
-  gem.homepage = "https://tech.immerda.ch/2011/12/trocla-get-hashed-passwords-out-of-puppet-manifests/"
-  gem.license = "GPLv3"
-  gem.summary = "Trocla a simple password generator and storage" 
-  gem.description = "Trocla helps you to generate random passwords and to store them in various formats (plain, MD5, bcrypt) for later retrival."
-  gem.email = "mh+trocla@immerda.ch"
-  gem.authors = ["mh"]
-  gem.version = Trocla::VERSION::STRING
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
-
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :default => :spec
-
-gem 'rdoc'
-require 'rdoc/task'
-RDoc::Task.new do |rdoc|
-  version = Trocla::VERSION::STRING
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "trocla #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/ext/redhat/rubygem-trocla.spec

@@ -1,120 +0,0 @@
-# Generated from trocla-0.1.2.gem by gem2rpm -*- rpm-spec -*-
-%global gem_name trocla
-
-Name: rubygem-%{gem_name}
-Version: 0.3.0
-Release: 1%{?dist}
-Summary: Trocla a simple password generator and storage
-Group: Development/Languages
-License: GPLv3
-URL: https://tech.immerda.ch/2011/12/trocla-get-hashed-passwords-out-of-puppet-manifests/
-Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
-Requires: rubygem-moneta
-Requires: rubygem-bcrypt
-Requires: rubygem-highline
-BuildRequires: rubygem-moneta = 0.7.20
-BuildRequires: rubygem-bcrypt
-BuildRequires: rubygem-highline
-%if 0%{?rhel} >= 7
-BuildRequires: ruby(release)
-%endif
-BuildRequires: rubygems-devel
-BuildRequires: ruby
-# BuildRequires: rubygem(mocha)
-# BuildRequires: rubygem(rspec) => 2.4
-# BuildRequires: rubygem(rspec) < 3
-# BuildRequires: rubygem(jeweler) => 1.6
-# BuildRequires: rubygem(jeweler) < 2
-BuildArch: noarch
-
-%description
-Trocla helps you to generate random passwords and to store them in various
-formats (plain, MD5, bcrypt) for later retrival.
-
-
-%package doc
-Summary: Documentation for %{name}
-Group: Documentation
-Requires: %{name} = %{version}-%{release}
-BuildArch: noarch
-
-%description doc
-Documentation for %{name}.
-
-%prep
-gem unpack %{SOURCE0}
-
-%setup -q -D -T -n  %{gem_name}-%{version}
-
-gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
-
-%build
-# Create the gem as gem install only works on a gem file
-gem build %{gem_name}.gemspec
-
-# %%gem_install compiles any C extensions and installs the gem into ./%%gem_dir
-# by default, so that we can move it into the buildroot in %%install
-%gem_install
-
-%install
-mkdir -p %{buildroot}%{gem_dir}
-cp -a .%{gem_dir}/* \
-        %{buildroot}%{gem_dir}/
-
-
-mkdir -p %{buildroot}%{_bindir}
-mkdir -p %{buildroot}%{_sysconfdir}
-mkdir -p %{buildroot}/%{_sharedstatedir}/%{gem_name}
-touch %{buildroot}/%{_sharedstatedir}/%{gem_name}/%{gem_name}_data.yaml
-
-cp -pa .%{_bindir}/* \
-        %{buildroot}%{_bindir}/
-
-chmod a+x %{buildroot}%{gem_instdir}/bin/%{gem_name}
-
-cat <<EOF > %{buildroot}/%{_sysconfdir}/%{gem_name}rc.yaml
----
-store: :moneta
-store_options:
-  adapter: :YAML
-  adapter_options:
-    :file: '%{_sharedstatedir}/%{gem_name}/%{gem_name}_data.yaml'
-EOF
-
-# Run the test suite
-%check
-pushd .%{gem_instdir}
-
-popd
-
-%files
-%dir %{gem_instdir}
-%{_bindir}/trocla
-%{gem_instdir}/.rspec
-%exclude %{gem_instdir}/.travis.yml
-%exclude %{gem_instdir}/.rspec
-%exclude %{gem_instdir}/ext/redhat/%{name}.spec
-%license %{gem_instdir}/LICENSE.txt
-%{gem_instdir}/bin
-%{gem_libdir}
-%exclude %{gem_cache}
-%{gem_spec}
-%config(noreplace) %{_sysconfdir}/%{gem_name}rc.yaml
-%dir %attr(-, -, -) %{_sharedstatedir}/%{gem_name}
-%config(noreplace) %attr(660, root, root) %{_sharedstatedir}/%{gem_name}/%{gem_name}_data.yaml
-
-%files doc
-%doc %{gem_docdir}
-%doc %{gem_instdir}/.document
-%{gem_instdir}/Gemfile
-%doc %{gem_instdir}/README.md
-%doc %{gem_instdir}/CHANGELOG.md
-%{gem_instdir}/Rakefile
-%{gem_instdir}/spec
-%{gem_instdir}/trocla.gemspec
-
-%changelog
-* Mon Dec 21 2015 mh - 0.2.0-1
-- Release of v0.2.0
-* Sun Jun 21 2015 mh - 0.1.2-1
-- Initial package

data/lib/VERSION

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

data/spec/fixtures/delete_test_hook.rb

@@ -1,12 +0,0 @@
-class Trocla
-  module Hooks
-
-    def self.delete_test_hook(trocla, key, format, options)
-      self.delete_messages << "#{key}_#{format}"
-    end
-
-    def self.delete_messages
-      @delete_messages ||= []
-    end
-  end
-end

data/spec/fixtures/set_test_hook.rb

@@ -1,12 +0,0 @@
-class Trocla
-  module Hooks
-
-    def self.set_test_hook(trocla, key, format, options)
-      self.set_messages << "#{key}_#{format}"
-    end
-
-    def self.set_messages
-      @set_messages ||= []
-    end
-  end
-end