X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fportforwarder%2Ftemplates%2Fauthorized_keys.erb;h=c230bbc9c1c0c563f5d0fb78347c71ce687b91c0;hb=607b40b133d356887da035d04f677d19e641706f;hp=94ad031c8671751b82a30452b10e239bb9493c0d;hpb=c465add9c8a60f17d8ad7db0443af391f87c7f14;p=mirror%2Fdsa-puppet.git

diff --git a/modules/portforwarder/templates/authorized_keys.erb b/modules/portforwarder/templates/authorized_keys.erb
index 94ad031c8..c230bbc9c 100644
--- a/modules/portforwarder/templates/authorized_keys.erb
+++ b/modules/portforwarder/templates/authorized_keys.erb
@@ -1,22 +1,38 @@
 <%=
+def getportforwarderkey(host)
+	key = nil
+	begin
+		facts = YAML.load(File.open("/var/lib/puppet/yaml/facts/#{host}.yaml").read)
+		return facts.values['portforwarder_key']
+	rescue Exception => e
+	end
+	return key
+end
+
+
 lines = []
 config = YAML.load(File.open('/etc/puppet/modules/portforwarder/misc/config.yaml').read)
 config.each_pair do |sourcehost, services|
+	allowed_ports = []
+
+	##lines << "# sourcehost is #{sourcehost}"
 	services.each do |service|
-		next if service['target_host'] != hostname
+		##lines << "# targethost is #{service['target_host']}, my hostname #{hostname}, fqdn is #{fqdn}"
+		next if service['target_host'] != fqdn
+		allowed_ports << service['target_port'] if service['target_port']
+	end
 
-		sshkey = nil
+	if allowed_ports.length > 0
+		sshkey = getportforwarderkey(sourcehost)
 		remote_ip = keyinfo[sourcehost][0]['ipHostNumber'].join(',')
-		forward_to_port = service['target_port']
-		local_bind = '127.0.0.2'
+		local_bind = '127.101.%d.%d'%[ (sourcehost.hash / 256 % 256), sourcehost.hash % 256 ]
 
-		lines << "# from #{sourcehost} on local port #{service['source_bind_port']}"
-		if remote_ip.nil? or forward_to_port.nil? or local_bind.nil?
-		#if sshkey.nil? or remote_ip.nil? or forward_to_port.nil? or local_bind.nil?
+		lines << "# from #{sourcehost}"
+		if sshkey.nil? or remote_ip.nil? or local_bind.nil?
 			lines << "# insufficient config values"
 		else
-			#lines << "from=\"#{remote_ip}\",command=\"/bin/nc -s #{local_bind} 127.0.0.1 #{forward_to_port}\",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding #{sshkey}"
-			lines << "#from=\"#{remote_ip}\",command=\"/bin/nc -s #{local_bind} 127.0.0.1 #{forward_to_port}\",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding <sshkey here>"
+			command = "/usr/bin/portforwarder-ssh-wrap #{sourcehost} #{local_bind} #{allowed_ports.join(' ')}"
+			lines << "from=\"#{remote_ip}\",command=\"#{command}\",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding #{sshkey}"
 		end
 	end
 end