Changeset 7a8d667 for fedkit

Timestamp:

Sep 19, 2008 6:25:54 PM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02

Children:

01073f7

Parents:

9d207bd

Message:

reconfigure sshd_config explicitly

Location:

fedkit

Files:

• fed-tun.pl (modified) (4 diffs)
• fed-tun.ucb.pl (modified) (2 diffs)

fedkit/fed-tun.pl

@@ -21 +21 @@
 use Sys::Hostname;
 use IO::File;
+use File::Copy;
 
 my $IFCONFIG = "/sbin/ifconfig";
@@ -29 +30 @@
 my $ROUTE_GET = "/sbin/route get";  # XXX:  works on FreeBSD, but should
                                     #       should be 'ip route get' for Linux
+my $sshd_config = "/etc/ssh/sshd_config";    # Probably should be a param
 
 # Ports that are forwarded between testbeds
@@ -71 +73 @@
 my $remote_config_file;         # Config file for the other side
 
-if ($#ARGV != 0 && !getopts('df:r', \%opts)) {
+if ($#ARGV != 0 && !getopts('df:rn', \%opts)) {
     die "$usage";
 }
@@ -132 +134 @@
     }
 
-    @ssh_port_fwds = () if ($opts{'type'} eq 'experiment');
+    # -n just starts the ssh tap tunnel
+    @ssh_port_fwds = () if ($opts{'type'} eq 'experiment' || $opts{'n'});
 
     print "ssh_port_fwds = ", join("\n",@ssh_port_fwds), "\n" if ($debug);
 }
+
+# Both sides need to have GatewayPorts to be set.  Copy the existing
+# sshd_config, making sure GatewayPorts is set to yes, replace the original,
+# and restart sshd.
+my $ports_on = 0;
+
+my $conf = new IO::File($sshd_config) || die "Can't open $sshd_config: $!\n";
+my $new_conf = new IO::File(">/tmp/sshd_config") || 
+    die "Can't open new ssh_config: $!\n";
+
+while(<$conf>) {
+    s/^\s*GatewayPorts.*/GatewayPorts yes/ && do {
+        print $new_conf $_ unless $ports_on++;
+        next;
+    };
+    print $new_conf $_;
+}
+print $new_conf "GatewayPorts yes\n" unless $ports_on;
+$conf->close();
+$new_conf->close();
+
+copy("/tmp/sshd_config", $sshd_config) || 
+    die "Cannot replace $sshd_config: $!\n";
+
+system("/etc/rc.d/sshd restart");
 
 # Need these to make the Ethernet tap and bridge to work...

fedkit/fed-tun.ucb.pl

@@ -30 +30 @@
 my $ROUTE_GET = "/sbin/route get";  # XXX:  works on FreeBSD, but should
                                     #       should be 'ip route get' for Linux
+my $sshd_config = "/etc/ssh/sshd_config";    # Probably should be a param
 
 # Ports that are forwarded between testbeds
@@ -131 +132 @@
 }
 
+# Both sides need to have GatewayPorts to be set.  Copy the existing
+# sshd_config, making sure GatewayPorts is set to yes, replace the original,
+# and restart sshd.
+my $ports_on = 0;
+
+my $conf = new IO::File($sshd_config) || die "Can't open $sshd_config: $!\n";
+my $new_conf = new IO::File(">/tmp/sshd_config") || 
+    die "Can't open new ssh_config: $!\n";
+
+while(<$conf>) {
+    s/^\s*GatewayPorts.*/GatewayPorts yes/ && do {
+        print $new_conf $_ unless $ports_on++;
+        next;
+    };
+    print $new_conf $_;
+}
+print $new_conf "GatewayPorts yes\n" unless $ports_on;
+$conf->close();
+$new_conf->close();
+
+copy("/tmp/sshd_config", $sshd_config) || 
+    die "Cannot replace $sshd_config: $!\n";
+
+system("/etc/rc.d/sshd restart");
+
+
 # Need these to make the Ethernet tap and bridge to work...