[tor-commits] [pluggable-transports/snowflake] 12/31: Add support for specifying bridge list file

[gitolite role <git@xxxxxxxxxxxxxxxxxxxxx>]

This is an automated email from the git hooks/post-receive script.

shelikhoo pushed a commit to branch main
in repository pluggable-transports/snowflake.

commit 02c6f764c9f94cbbc7ef482d6db43fcb0e794996
Author: Shelikhoo <xiaokangwang@xxxxxxxxxxx>
AuthorDate: Wed Apr 13 14:19:27 2022 +0100

    Add support for specifying bridge list file
---
 broker/broker.go | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/broker/broker.go b/broker/broker.go
index d9e8dea..476bc81 100644
--- a/broker/broker.go
+++ b/broker/broker.go
@@ -176,6 +176,7 @@ func main() {
 	var addr string
 	var geoipDatabase string
 	var geoip6Database string
+	var bridgeListFilePath, allowedRelayPattern string
 	var disableTLS bool
 	var certFilename, keyFilename string
 	var disableGeoip bool
@@ -190,6 +191,8 @@ func main() {
 	flag.StringVar(&addr, "addr", ":443", "address to listen on")
 	flag.StringVar(&geoipDatabase, "geoipdb", "/usr/share/tor/geoip", "path to correctly formatted geoip database mapping IPv4 address ranges to country codes")
 	flag.StringVar(&geoip6Database, "geoip6db", "/usr/share/tor/geoip6", "path to correctly formatted geoip database mapping IPv6 address ranges to country codes")
+	flag.StringVar(&bridgeListFilePath, "bridge-list-path", "", "file path for bridgeListFile")
+	flag.StringVar(&allowedRelayPattern, "allowed-relay-pattern", "", "allowed pattern for relay host name")
 	flag.BoolVar(&disableTLS, "disable-tls", false, "don't use HTTPS")
 	flag.BoolVar(&disableGeoip, "disable-geoip", false, "don't use geoip for stats collection")
 	flag.StringVar(&metricsFilename, "metrics-log", "", "path to metrics logging output")
@@ -222,6 +225,17 @@ func main() {
 
 	ctx := NewBrokerContext(metricsLogger)
 
+	if bridgeListFilePath != "" {
+		bridgeListFile, err := os.Open(bridgeListFilePath)
+		if err != nil {
+			log.Fatal(err.Error())
+		}
+		err = ctx.InstallBridgeListProfile(bridgeListFile, allowedRelayPattern)
+		if err != nil {
+			log.Fatal(err.Error())
+		}
+	}
+
 	if !disableGeoip {
 		err = ctx.metrics.LoadGeoipDatabases(geoipDatabase, geoip6Database)
 		if err != nil {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits