[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipcop-cvs
Subject:    [IPCop-cvs] ipcop/html/cgi-bin vpnmain.cgi,1.10.2.109,1.10.2.110
From:       Franck Bourdonnec <franck78 () users ! sourceforge ! net>
Date:       2007-04-18 1:16:45
Message-ID: E1Hdymw-0005yP-0r () mail ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/ipcop/ipcop/html/cgi-bin
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv8812

Modified Files:
      Tag: IPCOP_v1_4_0
	vpnmain.cgi 
Log Message:
Fix regular expression matching the IP only in the LOCAL/REMOTE ID.
ok, the fields are not checked 0-255, but goal is only basic syntax check.



Index: vpnmain.cgi
===================================================================
RCS file: /cvsroot/ipcop/ipcop/html/cgi-bin/vpnmain.cgi,v
retrieving revision 1.10.2.109
retrieving revision 1.10.2.110
diff -C2 -d -r1.10.2.109 -r1.10.2.110
*** vpnmain.cgi	19 Mar 2007 17:07:30 -0000	1.10.2.109
--- vpnmain.cgi	18 Apr 2007 01:16:43 -0000	1.10.2.110
***************
*** 1355,1362 ****
  	}
  
! 	# Allow nothing or a string (DN,FDQN,) beginning with @
  	# with no comma but slashes between RID eg @O=FR/C=Paris/OU=myhome/CN=franck
! 	if ( ($cgiparams{'LOCAL_ID'} !~ /^(|[\w.-]*@[\w. =*\/-]+|\d\.\d\.\d\.\d)$/) ||
! 	    ($cgiparams{'REMOTE_ID'} !~ /^(|[\w.-]*@[\w. =*\/-]+|\d\.\d\.\d\.\d)$/) ||
  	    (($cgiparams{'REMOTE_ID'} eq $cgiparams{'LOCAL_ID'}) && ($cgiparams{'LOCAL_ID'} ne ''))
  	   ) {
--- 1355,1362 ----
  	}
  
! 	# Allow nothing or an IP or a string (DN,FDQN,) beginning with @
  	# with no comma but slashes between RID eg @O=FR/C=Paris/OU=myhome/CN=franck
! 	if ( ($cgiparams{'LOCAL_ID'} !~ /^(|[\w.-]*@[\w. =*\/-]+|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/) ||
! 	    ($cgiparams{'REMOTE_ID'} !~ /^(|[\w.-]*@[\w. =*\/-]+|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/) ||
  	    (($cgiparams{'REMOTE_ID'} eq $cgiparams{'LOCAL_ID'}) && ($cgiparams{'LOCAL_ID'} ne ''))
  	   ) {
***************
*** 1365,1369 ****
  	    'FQDN: @ipcop.org<br />' .
  	    'USER_FQDN: franck@ipcop.org<br />' .
! 	    'IPV4_ADDR: @123.123.123.123';
  	    goto VPNCONF_ERROR;
  	}
--- 1365,1369 ----
  	    'FQDN: @ipcop.org<br />' .
  	    'USER_FQDN: franck@ipcop.org<br />' .
! 	    'IPV4_ADDR: 123.123.123.123';
  	    goto VPNCONF_ERROR;
  	}


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
IPCop-cvs mailing list
IPCop-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-cvs
[prev in list] [next in list] [prev in thread] [next in thread]