-
Notifications
You must be signed in to change notification settings - Fork 115
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
7 changed files
with
262 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ FROM ubuntu:22.04 | |
| LABEL maintainer="Chef Software, Inc. <[email protected]>" | ||
|
|
||
| ARG CHANNEL=stable | ||
| ARG VERSION=24.2.1058 | ||
| ARG VERSION=24.4.1064 | ||
| ENV DEBIAN_FRONTEND=noninteractive \ | ||
| GEM_HOME=/root/.chefdk/gem/ruby/3.0.0 \ | ||
| PATH=/opt/chef-workstation/bin:/opt/chef-workstation/embedded/bin:/root/.chefdk/gem/ruby/3.0.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 24.4.1064 | ||
| 24.5.1065 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,211 @@ | ||
| #!/opt/chef-workstation/embedded/bin/ruby | ||
|
|
||
| require "openssl" | ||
| require "digest/md5" | ||
| require "optparse" | ||
| require "ostruct" | ||
|
|
||
| class CHashDir | ||
| include Enumerable | ||
|
|
||
| def initialize(dirpath) | ||
| @dirpath = dirpath | ||
| @fingerprint_cache = @cert_cache = @crl_cache = nil | ||
| end | ||
|
|
||
| def hash_dir(silent = false) | ||
| # ToDo: Should lock the directory... | ||
| @silent = silent | ||
| @fingerprint_cache = {} | ||
| @cert_cache = {} | ||
| @crl_cache = {} | ||
| do_hash_dir | ||
| end | ||
|
|
||
| def get_certs(name = nil) | ||
| if name | ||
| @cert_cache[hash_name(name)] | ||
| else | ||
| @cert_cache.values.flatten | ||
| end | ||
| end | ||
|
|
||
| def get_crls(name = nil) | ||
| if name | ||
| @crl_cache[hash_name(name)] | ||
| else | ||
| @crl_cache.values.flatten | ||
| end | ||
| end | ||
|
|
||
| def delete_crl(crl) | ||
| File.unlink(crl_filename(crl)) | ||
| hash_dir(true) | ||
| end | ||
|
|
||
| def add_crl(crl) | ||
| File.open(crl_filename(crl), "w") do |f| | ||
| f << crl.to_pem | ||
| end | ||
| hash_dir(true) | ||
| end | ||
|
|
||
| def load_pem_file(filepath) | ||
| str = File.read(filepath) | ||
| begin | ||
| OpenSSL::X509::Certificate.new(str) | ||
| rescue | ||
| begin | ||
| OpenSSL::X509::CRL.new(str) | ||
| rescue | ||
| begin | ||
| OpenSSL::X509::Request.new(str) | ||
| rescue | ||
| nil | ||
| end | ||
| end | ||
| end | ||
| end | ||
|
|
||
| private | ||
|
|
||
| def crl_filename(crl) | ||
| path(hash_name(crl.issuer)) + ".pem" | ||
| end | ||
|
|
||
| def do_hash_dir | ||
| Dir.chdir(@dirpath) do | ||
| delete_symlink | ||
| Dir.glob("*.pem") do |pemfile| | ||
| cert = load_pem_file(pemfile) | ||
| case cert | ||
| when OpenSSL::X509::Certificate | ||
| link_hash_cert(pemfile, cert) | ||
| when OpenSSL::X509::CRL | ||
| link_hash_crl(pemfile, cert) | ||
| else | ||
| STDERR.puts("WARNING: #{pemfile} does not contain a certificate or CRL: skipping") unless @silent | ||
| end | ||
| end | ||
| end | ||
| rescue Errno::ENOENT | ||
| STDERR.puts("Cannot chdir into #{@dirpath}") | ||
| end | ||
|
|
||
| def delete_symlink | ||
| Dir.entries(".").each do |entry| | ||
| next unless /^[\da-f]+\.r{0,1}\d+$/ =~ entry | ||
|
|
||
| File.unlink(entry) if FileTest.symlink?(entry) | ||
| end | ||
| end | ||
|
|
||
| def link_hash_cert(org_filename, cert) | ||
| name_hash = hash_name(cert.subject) | ||
| fingerprint = fingerprint(cert.to_der) | ||
| filepath = link_hash(org_filename, name_hash, fingerprint) { |idx| | ||
| "#{name_hash}.#{idx}" | ||
| } | ||
| unless filepath | ||
| unless @silent | ||
| STDERR.puts("WARNING: Skipping duplicate certificate #{org_filename}") | ||
| end | ||
| else | ||
| (@cert_cache[name_hash] ||= []) << path(filepath) | ||
| end | ||
| end | ||
|
|
||
| def link_hash_crl(org_filename, crl) | ||
| name_hash = hash_name(crl.issuer) | ||
| fingerprint = fingerprint(crl.to_der) | ||
| filepath = link_hash(org_filename, name_hash, fingerprint) { |idx| | ||
| "#{name_hash}.r#{idx}" | ||
| } | ||
| unless filepath | ||
| unless @silent | ||
| STDERR.puts("WARNING: Skipping duplicate CRL #{org_filename}") | ||
| end | ||
| else | ||
| (@crl_cache[name_hash] ||= []) << path(filepath) | ||
| end | ||
| end | ||
|
|
||
| def link_hash(org_filename, name, fingerprint) | ||
| idx = 0 | ||
| filepath = nil | ||
| loop do | ||
| filepath = yield(idx) | ||
| break unless FileTest.symlink?(filepath) || FileTest.exist?(filepath) | ||
| if @fingerprint_cache[filepath] == fingerprint | ||
| return false | ||
| end | ||
|
|
||
| idx += 1 | ||
| end | ||
| STDOUT.puts("#{org_filename} => #{filepath}") unless @silent | ||
| symlink(org_filename, filepath) | ||
| @fingerprint_cache[filepath] = fingerprint | ||
| filepath | ||
| end | ||
|
|
||
| def symlink(from, to) | ||
| File.symlink(from, to) | ||
| rescue | ||
| File.open(to, "w") do |f| | ||
| f << File.read(from) | ||
| end | ||
| end | ||
|
|
||
| def path(filename) | ||
| File.join(@dirpath, filename) | ||
| end | ||
|
|
||
| def hash_name(name) | ||
| sprintf("%x", name.hash) | ||
| end | ||
|
|
||
| def fingerprint(der) | ||
| Digest::MD5.hexdigest(der).upcase | ||
| end | ||
| end | ||
|
|
||
| options = OpenStruct.new | ||
| options.help = false | ||
| options.dirs = [] | ||
|
|
||
| opt_parser = OptionParser.new do |opts| | ||
| opts.banner = "Usage: #{File.basename($PROGRAM_NAME)} [options] [dir1 dir2 ...]" | ||
|
|
||
| opts.on("-h", "--help", "Show this help message") do | ||
| options.help = true | ||
| end | ||
|
|
||
| opts.on("-d", "--dirs DIRS", Array, "List of directories") do |dirs| | ||
| options.dirs += dirs | ||
| end | ||
| end | ||
|
|
||
| def parse_args!(opt_parser, options) | ||
| begin | ||
| opt_parser.parse! | ||
| rescue OptionParser::InvalidOption, OptionParser::MissingArgument | ||
| puts $!.to_s | ||
| puts | ||
| puts opt_parser | ||
| exit | ||
| end | ||
|
|
||
| if options.help || options.dirs.empty? | ||
| puts opt_parser | ||
| exit | ||
| end | ||
| end | ||
|
|
||
| if $0 == __FILE__ | ||
| parse_args!(opt_parser, options) | ||
|
|
||
| dirlist = options.dirs | ||
| dirlist.each do |dir| | ||
| CHashDir.new(dir).hash_dir | ||
| end | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| # | ||
| # Copyright:: Copyright (c) Chef Software Inc. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
|
|
||
| name "c_rehash_ruby" | ||
| default_version "main" | ||
| license "Apache-2.0" | ||
| license_file "LICENSE" | ||
|
|
||
| source path: File.join("#{project.files_path}", "../../components/rehash") | ||
|
|
||
| build do | ||
| # Copy the file from the source to the bin directory | ||
| copy "#{project_dir}/c_rehash.rb", "#{install_dir}/embedded/bin/c_rehash_ruby" | ||
| # Set the executable permission for the script | ||
| command("chmod +x #{install_dir}/embedded/bin/c_rehash_ruby") | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters