onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-22 03:07:20 +01:00
Code Issues Releases Wiki Activity

2051005 ] install to localhost fails with pam_thinkfinger

Browse Source
This commit is contained in:
Vadim Kurland 2008-08-15 05:49:30 +00:00
parent db56d1a73c
commit 04da684784
4 changed files with 53 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
doc/ChangeLog
View File

@ -1,3 +1,16 @@
2008-08-14 Vadim Kurland <vadim@vk.crocodile.org>
* SSHUnx.cpp (SSHUnx::SSHUnx): fixed bug #2051005: "install to
localhost fails with pam_thinkfinger". Built-in installer
recognizes password prompt produced by pam_thinkfinger module that
accepts both password or asks user to swipe finger against
fingerprint reader device. Note that installer is likely to not
work with fingerprint authentication because it will not wait once
it gets to the point where pam_thinkfinger module asks for the
password or fingerprint and will try to enter password. However
with this change password prompt from pam_thinkfiger is recognized
and password authentication becomes possible.
2008-08-13 Vadim Kurland <vadim@vk.crocodile.org>
* NATCompiler_ipt.cpp (NATCompiler_ipt::getInterfaceVarName):

1
src/gui/SSHSession.h
View File

@ -120,6 +120,7 @@ class SSHSession : public QObject {
QString pwd_prompt;
QString putty_pwd_prompt;
QString ssh_pwd_prompt;
QString thinkfinger_pwd_prompt;
QString ssoft_prompt1;
QString ssoft_prompt2;
QString ssoft_config_prompt;

16
src/gui/SSHUnx.cpp
View File

@ -52,6 +52,7 @@ SSHUnx::SSHUnx(QWidget *_par,
normal_prompt="> ";
enable_prompt="# ";
pwd_prompt="'s password: ";
thinkfinger_pwd_prompt="Password or swipe finger:";
epwd_prompt="Password: ";
ssh_pwd_prompt="'s password: ";
ssoft_config_prompt="> ";
@ -137,12 +138,13 @@ void SSHUnx::stateMachine()
{
case NONE:
{
if ( cmpPrompt(stdoutBuffer,ssh_pwd_prompt) ||
cmpPrompt(stdoutBuffer,putty_pwd_prompt) ||
stdoutBuffer.lastIndexOf(passphrase_prompt,-1)!=-1 ||
if ( cmpPrompt(stdoutBuffer, ssh_pwd_prompt) ||
cmpPrompt(stdoutBuffer, putty_pwd_prompt) ||
cmpPrompt(stdoutBuffer, thinkfinger_pwd_prompt) ||
stdoutBuffer.lastIndexOf(passphrase_prompt, -1)!=-1 ||
cmpPrompt(stdoutBuffer,sudo_pwd_prompt) ||
cmpPrompt(stderrBuffer,sudo_pwd_prompt) )
cmpPrompt(stdoutBuffer, sudo_pwd_prompt) ||
cmpPrompt(stderrBuffer, sudo_pwd_prompt) )
{
stdoutBuffer="";
proc->write( pwd.toAscii() );
@ -212,8 +214,8 @@ void SSHUnx::stateMachine()
/* in this state we may need to enter sudo password */
case PUSHING_CONFIG:
push_files:
if ( cmpPrompt(stdoutBuffer,sudo_pwd_prompt) ||
cmpPrompt(stderrBuffer,sudo_pwd_prompt) )
if ( cmpPrompt(stdoutBuffer, sudo_pwd_prompt) ||
cmpPrompt(stderrBuffer, sudo_pwd_prompt) )
{
stdoutBuffer="";
proc->write( pwd.toAscii() );

33
test/ipt/objects-for-regression-tests.fwb
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE FWObjectDatabase SYSTEM "fwbuilder.dtd">
<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="10" lastModified="1218679117" id="root">
<FWObjectDatabase xmlns="http://www.fwbuilder.org/1.0/" version="10" lastModified="1218778321" id="root">
<Library id="sysid99" name="Deleted Objects" ro="False">
<ICMP6Service id="idE0C27650" name="ipv6 dest unreachable" comment="No route to destination" code="0" type="1"/>
<IPv4 id="id41D295E2" name="firewall30:ppp.200*:ip" address="192.168.1.1" netmask="255.255.255.0"/>
@ -594,6 +594,9 @@
<ObjectRef ref="id43BB80919745"/>
<ObjectRef ref="id43BB817C9745"/>
<IPv4 id="id30492X26784" name="firewall20-ipv6:ppp*:ip" address="192.168.1.1" netmask="255.255.255.0"/>
<ObjectRef ref="id43869E8D18346"/>
<ObjectRef ref="id4387287A18346"/>
<ObjectRef ref="sysid0"/>
</Library>
<Library id="syslib001" name="User" comment="User defined objects" color="#d2ffd0">
<ObjectGroup id="stdid01_1" name="Objects">
@ -716,6 +719,10 @@
<ObjectRef ref="id48416A7216880"/>
<ObjectRef ref="id48416A7116880"/>
</ObjectGroup>
<ObjectGroup id="id30841X361" name="DNS objects compile time" comment="a group of run-time dns objects">
<ObjectRef ref="id43869E8C18346"/>
<ObjectRef ref="id4387287918346"/>
</ObjectGroup>
</ObjectGroup>
<ObjectGroup id="stdid02_1" name="Hosts">
<Host id="id3A84EECE" name="DHCP-Servers (multicast)" comment="multicast address which is _not_ local link multicast&#10;">
@ -17525,7 +17532,7 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT%
<Option name="verify_interfaces">False</Option>
</FirewallOptions>
</Firewall>
<Firewall id="id43867C1018346" name="firewall33" comment="testing DNSName object" host_OS="linux24" lastCompiled="1215360262" lastInstalled="1142003872" lastModified="1205119254" platform="iptables" ro="False" version="">
<Firewall id="id43867C1018346" name="firewall33" comment="testing DNSName object" host_OS="linux24" lastCompiled="1215360262" lastInstalled="1142003872" lastModified="1218778321" platform="iptables" ro="False" version="">
<NAT id="id43867C4818346" name="NAT" ipv6_rule_set="False" top_rule_set="True">
<NATRule id="id43867C4918346" disabled="False" position="0">
<OSrc neg="False">
@ -17883,7 +17890,27 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT%
<Option name="stateless">False</Option>
</PolicyRuleOptions>
</PolicyRule>
<PolicyRule id="id43867C3C18346" action="Deny" direction="Both" disabled="False" log="True" position="13">
<PolicyRule id="id44703X361" action="Accept" direction="Both" disabled="False" group="" log="False" position="13">
<Src neg="False">
<ObjectRef ref="sysid0"/>
</Src>
<Dst neg="False">
<ObjectRef ref="id30841X361"/>
</Dst>
<Srv neg="False">
<ServiceRef ref="sysid1"/>
</Srv>
<Itf neg="False">
<ObjectRef ref="sysid0"/>
</Itf>
<When neg="False">
<IntervalRef ref="sysid2"/>
</When>
<PolicyRuleOptions>
<Option name="stateless">False</Option>
</PolicyRuleOptions>
</PolicyRule>
<PolicyRule id="id43867C3C18346" action="Deny" direction="Both" disabled="False" log="True" position="14">
<Src neg="False">
<ObjectRef ref="sysid0"/>
</Src>