Commit 0d5a847f authored by Nick Mathewson's avatar Nick Mathewson 🐘
Browse files

Remove need for dirservers file: now, we note trusted dirservers in... 

Remove need for dirservers file: now, we note trusted dirservers in configuration options, and only need to remember addr:port and key digest for each one.


svn:r2479
parent 55634e4e

doc/TODO

+2 −2
Changes for doc/TODO: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ ARMA - arma claims 


      0.0.9pre2:

R       . bandwidth buckets for write as well as read.

N       - switch dirservers entries to config lines.

N       - add three default dirplaces if we parse the whole torrc and

        o switch dirservers entries to config lines.

        o add three default dirplaces if we parse the whole torrc and

          no dirplaces are specified.

N       - Handle rendezvousing with unverified nodes.

          - Specify: Stick rendezvous point's key in INTRODUCE cell.

src/config/Makefile.am

+2 −2
Changes for src/config/Makefile.am: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line 
confdir = $(sysconfdir)/tor



EXTRA_DIST = dirservers

EXTRA_DIST = 



conf_DATA = dirservers torrc.sample
 
conf_DATA = torrc.sample

src/config/torrc.sample.in

+8 −4
Changes for src/config/torrc.sample.in: 8 added lines, 4 removed lines.
Original line number Diff line number Diff line 
# Configuration file for a typical tor user



# List of routers. Tor nodes start out knowing about the directory

# servers, and from them they get a list of currently up nodes.

RouterFile @CONFDIR@/dirservers



# Replace this with "SocksPort 0" if you don't want clients to connect.

SocksPort 9050

SocksBindAddress 127.0.0.1 # accept connections only from localhost
@@ -37,6 +33,14 @@ AllowUnverifiedNodes middle,rendezvous 
# Uncomment this to start the process in the background

#RunAsDaemon 1



# The three trusted directory servers on the current Tor network.  The entries

# below are for moria1, moria2, and tor26 respectively.  Tor only trusts 

# directories signed with one of these three keys, and uses the given addresses

# to conntect to the trusted directory servers.

DirServer 18.244.0.188:9031 FFCB 46DB 1339 DA84 674C 70D7 CB58 6434 C437 0441

DirServer 18.244.0.188:9032 719B E45D E224 B607 C537 07D0 E214 3E2D 423E 74CF

DirServer 62.116.124.106:9030 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D



##################### Below is just for servers #####################



## NOTE: If you enable these, you should consider mailing your

src/or/config.c

+0 −119
Changes for src/or/config.c: 0 added lines, 119 removed lines.
Original line number Diff line number Diff line
@@ -282,124 +282,6 @@ static int config_assign(or_options_t *options, struct config_line_t *list) { 
  return 0;

}



const char default_dirservers_string[] =

"router moria1 18.244.0.188 9001 9021 9031\n"

"platform Tor 0.0.6rc1 on Linux moria.mit.edu i686\n"

"published 2004-04-25 21:54:28\n"

"bandwidth 800000 10000000\n"

"onion-key\n"

"-----BEGIN RSA PUBLIC KEY-----\n"

"MIGJAoGBANoIvHieyHUTzIacbnWOnyTyzGrLOdXqbcjz2GGMxyHEd5K1bO1ZBNHP\n"

"9i5qLQpN5viFk2K2rEGuG8tFgDEzSWZEtBqv3NVfUdiumdERWMBwlaQ0MVK4C+jf\n"

"y5gZ8KI3o9ZictgPS1AQF+Kk932/vIHTuRIUKb4ILTnQilNvID0NAgMBAAE=\n"

"-----END RSA PUBLIC KEY-----\n"

"signing-key\n"

"-----BEGIN RSA PUBLIC KEY-----\n"

"MIGJAoGBAMHa0ZC/jo2Q2DrwKYF/6ZbmZ27PFYG91u4gUzzmZ/VXLpZ8wNzEV3oW\n"

"nt+I61048fBiC1frT1/DZ351n2bLSk9zJbB6jyGZJn0380FPRX3+cXyXS0Gq8Ril\n"

"xkhMQf5XuNFUb8UmYPSOH4WErjvYjKvU+gfjbK/82Jo9SuHpYz+BAgMBAAE=\n"

"-----END RSA PUBLIC KEY-----\n"

"reject 0.0.0.0/255.0.0.0:*\n"

"reject 169.254.0.0/255.255.0.0:*\n"

"reject 127.0.0.0/255.0.0.0:*\n"

"reject 192.168.0.0/255.255.0.0:*\n"

"reject 10.0.0.0/255.0.0.0:*\n"

"reject 172.16.0.0/255.240.0.0:*\n"

"accept *:20-22\n"

"accept *:53\n"

"accept *:79-80\n"

"accept *:110\n"

"accept *:143\n"

"accept *:443\n"

"accept *:873\n"

"accept *:993\n"

"accept *:995\n"

"accept *:1024-65535\n"

"reject *:*\n"

"router-signature\n"

"-----BEGIN SIGNATURE-----\n"

"o1eAoRHDAEAXsnh5wN++vIwrupd+DbAJ2p3wxHDrmqxTpygzxxCnyQyhMfX03ua2\n"

"4iplyNlwyFwzWcw0sk31otlO2HBYXT1V9G0YxGtKMOeOBMHjfGbUjGvEALHzWi4z\n"

"8DXGJp13zgnUyP4ZA6xaGROwcT6oB5e7UlztvvpGxTg=\n"

"-----END SIGNATURE-----\n"

"\n"

"router moria2 18.244.0.188 9002 9022 9032\n"

"platform Tor 0.0.6rc1 on Linux moria.mit.edu i686\n"

"published 2004-04-25 21:54:30\n"

"bandwidth 800000 10000000\n"

"onion-key\n"

"-----BEGIN RSA PUBLIC KEY-----\n"

"MIGJAoGBAM4Cc/npgYC54XrYLC+grVxJp7PDmNO2DRRJOxKttBBtvLpnR1UaueTi\n"

"kyknT5kmlx+ihgZF/jmye//2dDUp2+kK/kSkpRV4xnDLXZmed+sNSQxqmm9TtZQ9\n"

"/hjpxhp5J9HmUTYhntBs+4E4CUKokmrI6oRLoln4SA39AX9QLPcnAgMBAAE=\n"

"-----END RSA PUBLIC KEY-----\n"

"signing-key\n"

"-----BEGIN RSA PUBLIC KEY-----\n"

"MIGJAoGBAOcrht/y5rkaahfX7sMe2qnpqoPibsjTSJaDvsUtaNP/Bq0MgNDGOR48\n"

"rtwfqTRff275Edkp/UYw3G3vSgKCJr76/bqOHCmkiZrnPV1zxNfrK18gNw2Cxre0\n"

"nTA+fD8JQqpPtb8b0SnG9kwy75eS//sRu7TErie2PzGMxrf9LH0LAgMBAAE=\n"

"-----END RSA PUBLIC KEY-----\n"

"reject 0.0.0.0/255.0.0.0:*\n"

"reject 169.254.0.0/255.255.0.0:*\n"

"reject 127.0.0.0/255.0.0.0:*\n"

"reject 192.168.0.0/255.255.0.0:*\n"

"reject 10.0.0.0/255.0.0.0:*\n"

"reject 172.16.0.0/255.240.0.0:*\n"

"accept *:20-22\n"

"accept *:53\n"

"accept *:79-80\n"

"accept *:110\n"

"accept *:143\n"

"accept *:443\n"

"accept *:873\n"

"accept *:993\n"

"accept *:995\n"

"accept *:1024-65535\n"

"reject *:*\n"

"router-signature\n"

"-----BEGIN SIGNATURE-----\n"

"RKROLwP1ExjTZeg6wuN0pzYqed9IJUd5lAe9hp4ritbnmJAgS6qfww6jgx61CfUR\n"

"6SElhOLE7Q77jAdoL45Ji5pn/Y+Q+E+5lJm1E/ed9ha+YsOPaOc7z6GQ7E4mihCL\n"

"gI1vsw92+P1Ty4RHj6fyD9DhbV19nh2Qs+pvGJOS2FY=\n"

"-----END SIGNATURE-----\n"

"\n"

"router tor26 62.116.124.106 9001 9050 9030\n"

"platform Tor 0.0.6 on Linux seppia i686\n"

"published 2004-05-06 21:33:23\n"

"bandwidth 500000 10000000\n"

"onion-key\n"

"-----BEGIN RSA PUBLIC KEY-----\n"

"MIGJAoGBAMEHdDnpj3ik1AF1xe/VqjoguH2DbANifYqXXfempu0fS+tU9FGo6dU/\n"

"fnVHAZwL9Ek9k2rMzumShi1RduK9p035R/Gk+PBBcLfvwYJ/Nat+ZO/L8jn/3bZe\n"

"ieQd9CKj2LjNGKpRNry37vkwMGIOIlegwK+2us8aXJ7sIvlNts0TAgMBAAE=\n"

"-----END RSA PUBLIC KEY-----\n"

"signing-key\n"

"-----BEGIN RSA PUBLIC KEY-----\n"

"MIGJAoGBAMQgV2gXLbXgesWgeAsj8P1Uvm/zibrFXqwDq27lLKNgWGYGX2ax3LyT\n"

"3nzI1Y5oLs4kPKTsMM5ft9aokwf417lKoCRlZc9ptfRbgxDx90c9GtWVmkrmDvCK\n"

"ae59TMoXIiGfZiwWT6KKq5Zm9/Fu2Il3B2vHGkKJYKixmiBJRKp/AgMBAAE=\n"

"-----END RSA PUBLIC KEY-----\n"

"accept 62.245.184.24:25\n"

"accept 62.116.124.106:6666-6670\n"

"accept *:48099\n"

"reject *:*\n"

"router-signature\n"

"-----BEGIN SIGNATURE-----\n"

"qh/xRoqfLNFzPaB8VdpbdMAwRyuk5qjx4LeLVQ2pDwTZ55PqmG99+VKUNte2WTTD\n"

"7dZEA7um2rueohGe4nYmvbhJWr20/I0ZxmWDRDvFy0b5nwzDMGvLvDw95Zu/XJQ2\n"

"md32NE3y9VZCfbCN+GlvETX3fdR3Svzcm8Kzesg2/s4=\n"

"-----END SIGNATURE-----\n"

;



int config_assign_default_dirservers(void) {

  if(router_load_routerlist_from_string(default_dirservers_string, 1) < 0) {

    log_fn(LOG_WARN,"Bug: the default dirservers internal string is corrupt.");

    return -1;

  }



  return 0;

}



static void add_default_trusted_dirservers(void) {

  /* moria1 */

  parse_dir_server_line("18.244.0.188:9031 "
@@ -894,7 +776,6 @@ int getconfig(int argc, char **argv, or_options_t *options) { 
    }

  }



  

  clear_trusted_dir_servers();

  if (!options->DirServers) {

    add_default_trusted_dirservers();

src/or/connection.c

+2 −1
Changes for src/or/connection.c: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -738,7 +738,8 @@ int connection_handle_read(connection_t *conn) { 
       /* it's a directory server and connecting failed: forget about this router */

       /* XXX I suspect pollerr may make Windows not get to this point. :( */

       router_mark_as_down(conn->identity_digest);

       if(conn->purpose == DIR_PURPOSE_FETCH_DIR && !all_directory_servers_down()) {

       if(conn->purpose == DIR_PURPOSE_FETCH_DIR && 

          !all_trusted_directory_servers_down()) {

         log_fn(LOG_INFO,"Giving up on dirserver %s; trying another.", conn->address);

         directory_get_from_dirserver(DIR_PURPOSE_FETCH_DIR, NULL, 0);

       }