From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 2/3] allow SSH agent forwarding to be configured via WebUI
Date: Mon, 08 Apr 2019 16:35:00 +0000
Message-ID: <c76ee77c-a1ed-8f16-d160-2f5ff5438973@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3622231778610281918=="
List-Id: <development.lists.ipfire.org>

--===============3622231778610281918==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Fixes #11931

Signed-off-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
Cc: Michael Tremer <michael.tremer(a)ipfire.org>
---
 html/cgi-bin/remote.cgi | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/html/cgi-bin/remote.cgi b/html/cgi-bin/remote.cgi
index 1b3dfed70..10d94fe99 100644
--- a/html/cgi-bin/remote.cgi
+++ b/html/cgi-bin/remote.cgi
@@ -2,7 +2,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2007-2014  IPFire Team  <info(a)ipfire.org>                 =
    #
+# Copyright (C) 2007-2019  IPFire Team  <info(a)ipfire.org>                 =
    #
 #                                                                           =
  #
 # This program is free software: you can redistribute it and/or modify      =
  #
 # it under the terms of the GNU General Public License as published by      =
  #
@@ -105,6 +105,7 @@ else {
 # used
 	$remotesettings{'ENABLE_SSH_PASSWORDS'} =3D 'on' unless exists $remotesetti=
ngs{'ENABLE_SSH_PASSWORDS'};
 	$remotesettings{'ENABLE_SSH_KEYS'} =3D 'on' unless exists $remotesettings{'=
ENABLE_SSH_KEYS'};
+	$remotesettings{'SSH_AGENT_FORWARDING'} =3D 'off' unless exists $remotesett=
ings{'SSH_AGENT_FORWARDING'};
=20
 $checked{'ENABLE_SSH'}{'off'} =3D '';
 $checked{'ENABLE_SSH'}{'on'} =3D '';
@@ -121,6 +122,9 @@ $checked{'ENABLE_SSH_KEYS'}{$remotesettings{'ENABLE_SSH_K=
EYS'}} =3D "checked=3D'chec
 $checked{'SSH_PORT'}{'off'} =3D '';
 $checked{'SSH_PORT'}{'on'} =3D '';
 $checked{'SSH_PORT'}{$remotesettings{'SSH_PORT'}} =3D "checked=3D'checked'";
+$checked{'SSH_AGENT_FORWARDING'}{'off'} =3D '';
+$checked{'SSH_AGENT_FORWARDING'}{'on'} =3D '';
+$checked{'SSH_AGENT_FORWARDING'}{$remotesettings{'SSH_AGENT_FORWARDING'}} =
=3D "checked=3D'checked'";
=20
 &Header::openpage($Lang::tr{'remote access'}, 1, '');
=20
@@ -161,6 +165,11 @@ print <<END
 	<td><input type=3D'checkbox' name=3D'SSH_PORT' $checked{'SSH_PORT'}{'on'} /=
></td>
 	<td width=3D'100%' class=3D'base'>$Lang::tr{'ssh port'}</td>
 </tr>
+<tr>
+	<td>&nbsp;</td>
+	<td><input type=3D'checkbox' name=3D'SSH_AGENT_FORWARDING' $checked{'SSH_AG=
ENT_FORWARDING'}{'on'} /></td>
+	<td width=3D'100%' class=3D'base'>$Lang::tr{'ssh agent forwarding'}</td>
+</tr>
 <tr>
 	<td align=3D'right' colspan=3D'3'>
 	<input type=3D'submit' name=3D'ACTION' value=3D'$Lang::tr{'ssh tempstart15'=
}' />
--=20
2.16.4

--===============3622231778610281918==--