Skip to content

Add CertFP support. #90

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

Open
Unit193 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add CertFP support. #90

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
595a2df
Add CertFP support.
Unit193 May 17, 2024
9b8ef0c
Merge branch 'ruby-rbot:master' into certfp
Unit193 Aug 12, 2025
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
5 changes: 5 additions & 0 deletions lib/rbot/ircbot.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,10 @@ def initialize(botclass, params = {})
:default => false, :requires_restart => true,
:desc => "Verify the SSL connection?",
:wizard => true)
Config.register Config::StringValue.new('server.ssl_cert',
:requires_restart => true,
:desc => "The cert file used to authenticate to the server.",
:wizard => true)
Config.register Config::StringValue.new('server.ssl_ca_file',
:default => default_ssl_ca_file, :requires_restart => true,
:desc => "The CA file used to verify the SSL connection.",
Expand Down Expand Up @@ -496,6 +500,7 @@ def $stderr.write(*args)
@socket = Irc::Socket.new(@config['server.list'], @config['server.bindhost'],
:ssl => @config['server.ssl'],
:ssl_verify => @config['server.ssl_verify'],
:ssl_cert => @config['server.ssl_cert'],
:ssl_ca_file => @config['server.ssl_ca_file'],
:ssl_ca_path => @config['server.ssl_ca_path'],
:penalty_pct => @config['send.penalty_pct'])
Expand Down
6 changes: 6 additions & 0 deletions lib/rbot/ircsocket.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,7 @@ def initialize(server_list, host, opts={})
@lines_received = 0
@ssl = opts[:ssl]
@ssl_verify = opts[:ssl_verify]
@ssl_cert = opts[:ssl_cert]
@ssl_ca_file = opts[:ssl_ca_file]
@ssl_ca_path = opts[:ssl_ca_path]
@penalty_pct = opts[:penalty_pct] || 100
Expand Down Expand Up @@ -341,6 +342,11 @@ def connect
else
ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
end
if @ssl_cert and not @ssl_cert.empty?
client_cert = OpenSSL::X509::Certificate.new(File.read(@ssl_cert))
client_key = OpenSSL::PKey.read(File.read(@ssl_cert))
ssl_context.add_certificate(client_cert, client_key)
end
sock = OpenSSL::SSL::SSLSocket.new(sock, ssl_context)
sock.sync_close = true
sock.connect
Expand Down