Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(PE-36344) Stop using fork of ntlm gem #705

Merged
merged 2 commits into from
Jul 20, 2023
Merged

(PE-36344) Stop using fork of ntlm gem #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0afae65
(PE-36344) Stop using fork of ntlm gem
donoghuc Jul 20, 2023
7bff91e
(PE-36344) Enable legacy algorithms for winrm
donoghuc Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions configs/components/rubygem-rubyntlm-fork.rb
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions configs/projects/_shared-pe-bolt-server.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@
proj.component('rubygem-net-scp')
proj.component('rubygem-net-ssh')
proj.component('rubygem-net-ssh-krb')
proj.component('rubygem-rubyntlm')
proj.component('rubygem-nori')
proj.component('rubygem-orchestrator_client')
proj.component('rubygem-public_suffix')
Expand Down
1 change: 1 addition & 0 deletions configs/projects/_shared-pe-bolt-server_with_ruby.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@
proj.component('rubygem-net-ssh')
proj.component('rubygem-net-ssh-krb')
proj.component('rubygem-nori')
proj.component('rubygem-rubyntlm')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, when I reverted the usage of the ntlm fork in pe-installer-runtime-main (d993409) I didn't see a dependency on 'rubygem-rubyntlm' added. Does something similar need to be done to pe-instlaler?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not now, when i was looking at this i realized for installer we actually use rubygems to do dependency resolution. This is not ideal because https://tickets.puppetlabs.com/browse/PE-36494 We will explicitly package that when we do that ticket but for now rubygems will find the latest rubyntmlm and we will be good to go.

proj.component('rubygem-orchestrator_client')
proj.component('rubygem-public_suffix')
proj.component('rubygem-paint')
Expand Down
2 changes: 0 additions & 2 deletions configs/projects/pe-bolt-server-runtime-2021.7.x.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,5 @@
proj.setting(:no_doc, true)

instance_eval File.read(File.join(File.dirname(__FILE__), '_shared-pe-bolt-server.rb'))
# TODO: Move ntml back to shared runtime when PE-36078 is done
proj.component('rubygem-rubyntlm')
proj.component 'rubygem-prime'
end
3 changes: 0 additions & 3 deletions configs/projects/pe-bolt-server-runtime-main.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
proj.setting(:openssl_version, '3.0')

instance_eval File.read(File.join(File.dirname(__FILE__), '_shared-pe-bolt-server_with_ruby.rb'))

# TODO: Work around PE-36078 by using forked non-optimal solution
proj.component('rubygem-rubyntlm-fork')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

whoops! I should have removed this when I added the proj.setting(:use_legacy_openssl_algos, true) in the bolt server, sorry.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, yeah i'll add it

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, lol, i hadn't noticed that Sean didn't include my update for :use_legacy_openssl_algos. Thanks, Cas!

proj.component 'rubygem-prime'
proj.component 'rubygem-rexml'
end
2 changes: 2 additions & 0 deletions configs/projects/pe-installer-runtime-main.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
ruby_base_version = proj.ruby_version.gsub(/(\d+)\.(\d+)\.(\d+)/, '\1.\2.0')
proj.setting(:gem_home, File.join(proj.libdir, 'ruby', 'gems', ruby_base_version))
proj.setting(:gem_install, "#{proj.host_gem} install --no-document --local --bindir=#{proj.ruby_bindir}")
# Enable legacy openssl agls for wirnm
proj.setting(:use_legacy_openssl_algos, true)

proj.setting(:artifactory_url, "https://artifactory.delivery.puppetlabs.net/artifactory")
proj.setting(:buildsources_url, "#{proj.artifactory_url}/generic/buildsources")
Expand Down
Loading