Skip to content

Commit a2e5b95

Browse files
committed
fix certificate padding
1 parent f17b795 commit a2e5b95

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

controllers/connection.rb

+3
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@ def self.exapand_lndconnect(*params)
9696
certificate = params['cert'].tr('-_', '+/')
9797
macaroon = Base64.urlsafe_decode64(params['macaroon'])
9898

99+
padding_needed = 4 - (certificate.length % 4)
100+
certificate += '=' * padding_needed
101+
99102
certificate = "-----BEGIN CERTIFICATE-----\n#{certificate.gsub(/(.{64})/, "\\1\n")}\n-----END CERTIFICATE-----\n"
100103

101104
{

spec/controllers/connection_spec.rb

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
expect(described_class.expand(
99
'lndconnect://127.0.0.1:10001?cert=MIICJzCCAc2gAwIBAgIRAImZs0ieSBjBcMtpD8oQ_okwCgYIKoZIzj0EAwIwMTEfMB0GA1UEChMWbG5kIGF1dG9nZW5lcmF0ZWQgY2VydDEOMAwGA1UEAxMFYWxpY2UwHhcNMjMwMzEyMjM0NDEyWhcNMjQwNTA2MjM0NDEyWjAxMR8wHQYDVQQKExZsbmQgYXV0b2dlbmVyYXRlZCBjZXJ0MQ4wDAYDVQQDEwVhbGljZTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABL8ZHtjXzSy7Qs9SL0wECTsAwyX8xplEox1DQUMnB6mfu5dXxzuTqoyCL1FuwjthqfZNO3hX2O-o5pyHxGkqYA2jgcUwgcIwDgYDVR0PAQH_BAQDAgKkMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA8GA1UdEwEB_wQFMAMBAf8wHQYDVR0OBBYEFFXs5yUhjbRfmlYGGEYPlzquQdslMGsGA1UdEQRkMGKCBWFsaWNlgglsb2NhbGhvc3SCBWFsaWNlgg5wb2xhci1uMS1hbGljZYIEdW5peIIKdW5peHBhY2tldIIHYnVmY29ubocEfwAAAYcQAAAAAAAAAAAAAAAAAAAAAYcErBgABjAKBggqhkjOPQQDAgNIADBFAiBvz_hKoN0JltWgjzBHYHpB4fM2tqPge9j1m1tt0ye8PgIhAJkGw-5chEuH5bVFLBQjo5SUAW_sGX9i0aSqcSJBEERQ&macaroon=AgEDbG5kAvgBAwoQZfbno2BCpVfn-g6USaC3JRIBMBoWCgdhZGRyZXNzEgRyZWFkEgV3cml0ZRoTCgRpbmZvEgRyZWFkEgV3cml0ZRoXCghpbnZvaWNlcxIEcmVhZBIFd3JpdGUaIQoIbWFjYXJvb24SCGdlbmVyYXRlEgRyZWFkEgV3cml0ZRoWCgdtZXNzYWdlEgRyZWFkEgV3cml0ZRoXCghvZmZjaGFpbhIEcmVhZBIFd3JpdGUaFgoHb25jaGFpbhIEcmVhZBIFd3JpdGUaFAoFcGVlcnMSBHJlYWQSBXdyaXRlGhgKBnNpZ25lchIIZ2VuZXJhdGUSBHJlYWQAAAYg61atst43JqOPEZKGrLszr6q8eWVvQfxgr1inv45ukJ4'
1010
).keys.sort).to eq(%i[address certificate connect host macaroon port])
11+
12+
expect(described_class.expand(
13+
'lndconnect://127.0.0.1:10002?cert=MIICHDCCAcKgAwIBAgIQc6IrnOuT-D7hJKoyvfEJ5TAKBggqhkjOPQQDAjAvMR8wHQYDVQQKExZsbmQgYXV0b2dlbmVyYXRlZCBjZXJ0MQwwCgYDVQQDEwNib2IwHhcNMjMwMzI1MTQ1NjU4WhcNMjQwNTE5MTQ1NjU4WjAvMR8wHQYDVQQKExZsbmQgYXV0b2dlbmVyYXRlZCBjZXJ0MQwwCgYDVQQDEwNib2IwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARPbXFiakJz1m2-q8SBgbj5W4FUlQri8PWiPtEzaPFFlyRPzZE6PVwbjnVPSaPMb_bC3KUVx5Id3hc3Hh5OKDDdo4G_MIG8MA4GA1UdDwEB_wQEAwICpDATBgNVHSUEDDAKBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH_MB0GA1UdDgQWBBSePsb2Il_zqUeXsKAyt6RKJI3UBjBlBgNVHREEXjBcggNib2KCCWxvY2FsaG9zdIIDYm9iggxwb2xhci1uMS1ib2KCBHVuaXiCCnVuaXhwYWNrZXSCB2J1ZmNvbm6HBH8AAAGHEAAAAAAAAAAAAAAAAAAAAAGHBMCoIAMwCgYIKoZIzj0EAwIDSAAwRQIhANnrAUAbXF3HKN6FFLkvixbcDAMXujH2QD1w22V6vJFQAiAv8sY_96GrpRF-kQC9Y9iIZWdHfDfhfzgXh3tdkPpqLQ&macaroon=AgEDbG5kAvgBAwoQZjAOcyRGBSs8v9wLJ3Xv6BIBMBoWCgdhZGRyZXNzEgRyZWFkEgV3cml0ZRoTCgRpbmZvEgRyZWFkEgV3cml0ZRoXCghpbnZvaWNlcxIEcmVhZBIFd3JpdGUaIQoIbWFjYXJvb24SCGdlbmVyYXRlEgRyZWFkEgV3cml0ZRoWCgdtZXNzYWdlEgRyZWFkEgV3cml0ZRoXCghvZmZjaGFpbhIEcmVhZBIFd3JpdGUaFgoHb25jaGFpbhIEcmVhZBIFd3JpdGUaFAoFcGVlcnMSBHJlYWQSBXdyaXRlGhgKBnNpZ25lchIIZ2VuZXJhdGUSBHJlYWQAAAYgDZdbNEdhKl3abn3akDSo1dQn86sVOTxta3yIn6Q0ICk'
14+
)[:certificate]).to include('ZWdHfDfhfzgXh3tdkPpqLQ==')
1115
end
1216
end
1317
end

0 commit comments

Comments
 (0)