dry-stack 0.0.81 → 0.0.82

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 758974f16669de0183b226fe54b60a63ff0f83dce670049922d86968b5d4d7ad
-  data.tar.gz: afeaef4ec662565cda18cd38deef6b7e55977ab8b96838622665d2ac0e4c88f4
+  metadata.gz: 52aef15bc22cb7ef0bdadb32c686998849894138d6f2a06ae5e5f2e6b5d59a9c
+  data.tar.gz: eac3ce3089cfa955adb72974b0f68ad685a22f5217637fc89874fec2dd6582e0
 SHA512:
-  metadata.gz: '09f0cbddbcc9ccc2465352bf5dd1365e0b0cb2a2f5788536b09e4018c7b4b5f9cb7677930540ab6e82c064724e1aa805c88c18a79e6a2e66bc27388f72b33ea0'
-  data.tar.gz: 4d1a5fe073d29742e48a8d26eef50620f37ff4f7a3d42b9c899d303824f64e472900ae9545d6b76d733cc0521b95ec9386afb78375820af91d5727a89fc2a2e7
+  metadata.gz: d57962ce0e295fe0bb8432b4f3eec4c15b68ba593a7e278f03a9b0d7632789ed3a3e7f7a25aff64b478806fecdc72b5d38506cb3fb2c99e0132315d3d4adb8b9
+  data.tar.gz: 658c93b70b9306d935ef6b5443b4bd25a3ccdc90c9239e38bae662ea3d423c1587f38d31e12c24b633048364ab0a1aa1f7516faa40c38613953a7fd3ebac1d41

data/lib/dry-stack/apache_specific_md5.rb

@@ -0,0 +1,76 @@
+require 'digest/md5'
+
+APR1_MAGIC = '$apr1$'
+ITOA64 = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+
+def to64(value, length)
+  result = ''
+  length.times do
+    result << ITOA64[value & 0x3f]
+    value >>= 6
+  end
+  result
+end
+
+def apr1_crypt(password, salt)
+  salt = salt[0, 8]
+  ctx = Digest::MD5.new
+  ctx.update(password + APR1_MAGIC + salt)
+  final = Digest::MD5.digest(password + salt + password)
+
+  password.length.times { |i| ctx.update(final[i % 16].chr) }
+
+  length = password.length
+  while length > 0
+    ctx.update(length & 1 != 0 ? "\0" : password[0].chr)
+    length >>= 1
+  end
+
+  final = ctx.digest
+
+  1000.times do |i|
+    ctx = Digest::MD5.new
+    ctx.update(i & 1 != 0 ? password : final)
+    ctx.update(salt) unless (i % 3).zero?
+    ctx.update(password) unless (i % 7).zero?
+    ctx.update(i & 1 != 0 ? final : password)
+    final = ctx.digest
+  end
+
+  hashed = final.bytes
+  result = [
+    to64((hashed[0] << 16) | (hashed[6] << 8) | hashed[12], 4),
+    to64((hashed[1] << 16) | (hashed[7] << 8) | hashed[13], 4),
+    to64((hashed[2] << 16) | (hashed[8] << 8) | hashed[14], 4),
+    to64((hashed[3] << 16) | (hashed[9] << 8) | hashed[15], 4),
+    to64((hashed[4] << 16) | (hashed[10] << 8) | hashed[5], 4),
+    to64(hashed[11], 2)
+  ].join
+
+  "#{APR1_MAGIC}#{salt}$#{result}"
+end
+
+def apr1_check(password, hashed_password)
+  parts = hashed_password.split('$')
+  return false if parts.length != 4 || parts[1] != 'apr1'
+
+  salt = parts[2]
+  apr1_crypt(password, salt) == hashed_password
+end
+
+# SELF TEST ============================================================================================================
+if File.expand_path($0) == File.expand_path(__FILE__)
+  # openssl passwd -apr1 -salt 8sFt66rZ admin
+  password = "admin"
+  salt = "976CP"
+
+  hashed_password = apr1_crypt(password, salt)
+  puts "APR1 Hashed Password: #{hashed_password}"
+
+  hashed_password2 = '$apr1$pkcC6Tmo$4HpuLoFryypSnXeJ1e02n/'
+  hashed_password3 = '$apr1$976PimCP$PU7TWdOsyivf.u35yYGsv0'
+
+  p apr1_check(password, hashed_password)
+  p apr1_check(password, hashed_password2)
+  p apr1_check(password, hashed_password3)
+end

data/lib/dry-stack/stack.rb

@@ -3,7 +3,7 @@ require 'yaml'
 require 'json'
 require 'optparse'
 require 'digest'
-require 'bcrypt'
+require_relative 'apache_specific_md5'
 
 # class TrueClass
 #   def encode_with(coder) = coder.represent_scalar('tag:yaml.org,2002:str', 'true')
@@ -150,8 +150,8 @@ module Dry
         service[:deploy][:labels] += @labels.map { "#{_1}=#{_2}" }
 
         if service[:basic_auth]
-          ba_user, ba_password = service[:basic_auth].split ':'
-          hashed_password = BCrypt::Password.create ba_password
+          ba_user, ba_password, salt = service[:basic_auth].split ':'
+          hashed_password = apr1_crypt ba_password, (salt || rand(36**8).to_s(36))
           service[:deploy][:labels] << "traefik.http.middlewares.%{service-name}_auth.basicauth.users=#{ba_user}:#{hashed_password.gsub('$','$$')}"
           service[:deploy][:labels] << "traefik.http.routers.%{service-name}.middlewares=%{service-name}_auth"
           service.delete :basic_auth

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.0.81'
+    VERSION = '0.0.82'
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.0.81
+  version: 0.0.82
 platform: ruby
 authors:
 - Artyom B
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-19 00:00:00.000000000 Z
+date: 2024-06-20 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bcrypt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +106,7 @@ files:
 - bin/stack1.drs
 - bin/stack2.drs
 - lib/dry-stack.rb
+- lib/dry-stack/apache_specific_md5.rb
 - lib/dry-stack/command_compose.rb
 - lib/dry-stack/command_line.rb
 - lib/dry-stack/command_swarm_deploy.rb