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

[global.tmpl] Add custom CA and endpoint for RU #1216

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

[global.tmpl] Add custom CA and endpoint for RU #1216

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
528cc87
[global.tmpl] Add custom CA and endpoint for RU
soltzen Mar 17, 2022
01c3bda
fixup! [global.tmpl] Add custom CA and endpoint for RU
soltzen Mar 20, 2022
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
13 changes: 11 additions & 2 deletions embeddedconfig/global.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,6 @@ featureoptions:
"IR": *FrankfurtReplicaRust

# Here follows options per-country

"DE": &FrankfurtBase
proxypeerinfohashes: *GlobalProxyInfohashes
metadatabaseurls: *AllReplicaBaseUrls
Expand Down Expand Up @@ -275,8 +274,18 @@ featureoptions:
<<: *FrankfurtBase
staticpeeraddrs: [&IranReplicaPeer "81.12.39.55:42069"]
"RU":
<<: *FrankfurtBase
proxypeerinfohashes: *GlobalProxyInfohashes
metadatabaseurls: *AllReplicaBaseUrls
# Taken from https://github.com/getlantern/replica-infrastructure-metrics/blob/5df25dd/hetzner/ansible/hosts-ru
replicarustendpoint: http://92.223.103.136:8080/
trackers: *GlobalTrackers
webseedbaseurls: *AllReplicaBaseUrls
staticpeeraddrs: [&RussiaReplicaPeers "94.242.59.118:42069"]
# Generated like this:
# - Checkout this branch in replica-rust: https://github.com/getlantern/replica-rust/commit/78be85984c7e91de08a08bea97837568b8cb1f79
# - Run `just make-ca-cert keys/out/lantern-ca`
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't love having to use a new tool just when this project already uses make.

Copy link
Contributor

Choose a reason for hiding this comment

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

Also, I don't see a justfile in here(?)

Copy link
Contributor

Choose a reason for hiding this comment

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

Plus, we're using go:generate already too, and this seems like it might be a good use for that which doesn't require any external tools.

Copy link
Contributor Author

@soltzen soltzen Mar 18, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Not in this project, no. In replica-rust. I'll amend.

replica-rust had no command runners before (and doesn't use go).

EDIT: amended

# - Replace new lines with literal \n: `awk '{printf "%s\\n", $0}' lantern-ca.crt.pem`
customca: "-----BEGIN CERTIFICATE-----\nMIID7DCCA5OgAwIBAgIUMao3101UqbvxjBevAk5q+N41Q6gwCgYIKoZIzj0EAwIw\ngYIxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTELMAkGA1UEBwwCVVMxEDAOBgNV\nBAoMB0xhbnRlcm4xEDAOBgNVBAsMB0xhbnRlcm4xEDAOBgNVBAMMB0xhbnRlcm4x\nIzAhBgkqhkiG9w0BCQEWFGFmaXNrQGdldGxhbnRlcm4ub3JnMB4XDTIyMDMxNzE2\nMDgzOVoXDTMyMDMxNDE2MDgzOVowgYQxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJD\nQTELMAkGA1UEBwwCVVMxEDAOBgNVBAoMB0xhbnRlcm4xEDAOBgNVBAsMB0xhbnRl\ncm4xEjAQBgNVBAMMCWxvY2FsaG9zdDEjMCEGCSqGSIb3DQEJARYUYWZpc2tAZ2V0\nbGFudGVybi5vcmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC95d6T\ngaTflL53R5WXroSkZltF0Wmb6uRsbmOoLPbyiqIwnoeHnevDtzNvZlkPewCsgSH/\nU2ez5HuUAFDstu1S2rfSfQyXNqsY7i0rXX219F4okSQBg+pj78T8Y4D4aDH9NUf/\n5xD6jVIErw1mrIIojekh3HmDNcCXl1AOmQ0YPakZG8BPpm0oolWEPdYqdiaydPZk\nur7hQWUqzdZZRC6X9RvoRs7au3YBYGtyPIzovX0/8vZBzb/WQhAU2Q+SumsK7gZJ\nuZdoXL3I2gPjm7KD0JClAY3c592yZA8xJQKMWzNnoxbpf+fV8E5K9KAo7z7DMYg3\nyhnjfn4EbrPtKCoOkLP+AMbC0Df9ADA9h+2/qVMXrKlx1MlUtGomZX9b4keJvJlx\niueqINEY20My3REu3Fmy0pls1roGegy0PjA1B+6bEr9KC+KzBmyF0atzf4uF8bLd\nYtS4M3c09Blqari4PzAaA8dZuT7eB8oyKz6n/ubS38vfh0lnR+Qy+PksrZgiv3IX\njr2xN20CFnJbrSDQ8yGk9ZpaftZNpLNi3nyykZJDLdY9l5aFgaEjGpXE5cQCikeu\n/dtLo/4gBUQRLKgt14zKYgbDJGUi4/kqssqithLx3JRORLDGOGGC65Y/r5pIseJy\nl2+ogu2kIWf/RaZrFwtcTMV/ADPUGDg1Fl7ktwIDAQABoxgwFjAUBgNVHREEDTAL\ngglsb2NhbGhvc3QwCgYIKoZIzj0EAwIDRwAwRAIgBUYtZWKn5Gr44nk8UDWlWDNN\nzImCiog055BgEv36PNoCIFqE6qrC2Koc0eNzaiAI93IveEMn2JxFGsCQVitF2NBR\n-----END CERTIFICATE-----\n"
Copy link
Contributor

Choose a reason for hiding this comment

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

Doesn't yaml have a nice customca: | syntax or something where you can dump this inline without preprocessing to fit it in a string?

Copy link
Contributor Author

@soltzen soltzen Mar 21, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

It does, but all the rest of the certs in this file do it like this to be handled in our own library, so I didn't wanna be an outlier. I just included the command since none of them included it.

"CN":
proxypeerinfohashes: *GlobalProxyInfohashes
metadatabaseurls:
Expand Down