460 Commits

Author SHA1 Message Date
Michael Rash
4d2521bcd8 minor bug fix to not append --Server-port option in --rand-port mode
git-svn-id: file:///home/mbr/svn/fwknop/trunk@167 510a4753-2344-4c79-9c09-4d669213fbeb
2009-11-20 05:16:06 +00:00
Michael Rash
7401ef9644 minor bug fix to ensure that -R resolution work with --URL=http://www.cipherdyne.org/cgi/clientip.cgi
git-svn-id: file:///home/mbr/svn/fwknop/trunk@166 510a4753-2344-4c79-9c09-4d669213fbeb
2009-11-20 05:15:44 +00:00
Michael Rash
867990aa7d * (Legacy code) Bug fix to allow the --rand-port argument to function along
without an inappropriate check for the --Server-port arg.


git-svn-id: file:///home/mbr/svn/fwknop/trunk@165 510a4753-2344-4c79-9c09-4d669213fbeb
2009-11-20 04:52:32 +00:00
Michael Rash
fc8e8dd2dc (Legacy code) Applied patch from Jonthan Bennett to support the usage of
the http_proxy environmental variable for sending SPA packets through an
HTTP proxy.  The patch also adds support for specifying an HTTP proxy
user and password via the following syntax:

'http://username:password@proxy.com:port' or
'http://username:password@proxy.com'



git-svn-id: file:///home/mbr/svn/fwknop/trunk@164 510a4753-2344-4c79-9c09-4d669213fbeb
2009-11-02 05:05:30 +00:00
Damien Stuart
5cf8813eac Updated digest cache to store additional information including src ip, created, first_replay, last_replay, and replay count.
git-svn-id: file:///home/mbr/svn/fwknop/trunk@163 510a4753-2344-4c79-9c09-4d669213fbeb
2009-11-02 01:46:56 +00:00
Michael Rash
2145aeac5b added the latest http proxy fixes to the ChangeLog
git-svn-id: file:///home/mbr/svn/fwknop/trunk@162 510a4753-2344-4c79-9c09-4d669213fbeb
2009-10-28 03:52:14 +00:00
Michael Rash
9dfe63e858 added Daniel Lopez, and Jonathan Bennett's proxy fix
git-svn-id: file:///home/mbr/svn/fwknop/trunk@161 510a4753-2344-4c79-9c09-4d669213fbeb
2009-10-28 03:51:30 +00:00
Michael Rash
8614cc1f62 - Added --http-proxy argument to the fwknop C client.
- (Legacy code): Changed HTTP proxy handling to point an SPA packet to
an HTTP proxy with -D specifying the end point host and --HTTP-proxy
pointing to the proxy host.  This fix was suggested by Jonathan Bennett.


git-svn-id: file:///home/mbr/svn/fwknop/trunk@160 510a4753-2344-4c79-9c09-4d669213fbeb
2009-10-28 03:38:57 +00:00
Michael Rash
38590801e0 Added better --debug output for time differences on incoming SPA packets. This makes it
easier to tell when there are problems with time synchronization between the fwknop client
and fwknopd server systems.


git-svn-id: file:///home/mbr/svn/fwknop/trunk@159 510a4753-2344-4c79-9c09-4d669213fbeb
2009-10-25 15:48:02 +00:00
Michael Rash
8cd0864ab0 Added --List-mode so that identifying strings for tests can be printed on stdout. This is
useful to see what is available for --test-include regex's.


git-svn-id: file:///home/mbr/svn/fwknop/trunk@158 510a4753-2344-4c79-9c09-4d669213fbeb
2009-10-25 15:46:35 +00:00
Damien Stuart
7f95651fed Fixed minor typo in the POD synopsis (thanks Franck!).
git-svn-id: file:///home/mbr/svn/fwknop/trunk@157 510a4753-2344-4c79-9c09-4d669213fbeb
2009-10-19 23:52:36 +00:00
Michael Rash
b0edb8cafe updated to handle the fwknop-c version string '2.0.0-alpha' in HTTP tests
git-svn-id: file:///home/mbr/svn/fwknop/trunk@156 510a4753-2344-4c79-9c09-4d669213fbeb
2009-10-18 16:32:05 +00:00
Damien Stuart
34745aa8be Fixed missed MY_DBM_CLOSE call
git-svn-id: file:///home/mbr/svn/fwknop/trunk@155 510a4753-2344-4c79-9c09-4d669213fbeb
2009-10-18 14:35:28 +00:00
Damien Stuart
4b8e3e974b Changed digest cache to use gdbm directly wth fallback to ndbm (still not tested).
git-svn-id: file:///home/mbr/svn/fwknop/trunk@154 510a4753-2344-4c79-9c09-4d669213fbeb
2009-10-18 14:26:06 +00:00
Damien Stuart
8c1261ca39 Fixed memory leak issue in libfko when fko_new_with_data() was called with a bad key. Added autoconf checks for gdbm with fallback to ndbm for server builds. Added digest cache capability using gdbm (in ndbm compatibility mode) or ndbm for replay detection.
git-svn-id: file:///home/mbr/svn/fwknop/trunk@153 510a4753-2344-4c79-9c09-4d669213fbeb
2009-10-16 02:23:02 +00:00
Damien Stuart
8b4b55fa44 Added stubs and some handling for signals. SIGHUP induces the re-reading the configs and restarting the capture loop. SIGTERM and SIGINT simply trigger a graceful exit. Trimmed some more of the configuration options.
git-svn-id: file:///home/mbr/svn/fwknop/trunk@152 510a4753-2344-4c79-9c09-4d669213fbeb
2009-10-11 17:42:45 +00:00
Damien Stuart
e399f39c39 Updated sniffer to be able to handle the linux "any" interface.
git-svn-id: file:///home/mbr/svn/fwknop/trunk@151 510a4753-2344-4c79-9c09-4d669213fbeb
2009-09-28 00:33:09 +00:00
Damien Stuart
5a72c4fca7 Updates and enhancements to logging functions. Now log_msg writes only to stderr when running in foreground. Default log facility is LOG_DAEMON. Config file options of ENABLE_PACP_PROMISC, HOSTNAME, SYSLOG_IDENTITY, and SYSLOG_FACILITY are processed.
git-svn-id: file:///home/mbr/svn/fwknop/trunk@150 510a4753-2344-4c79-9c09-4d669213fbeb
2009-09-27 15:09:41 +00:00
Damien Stuart
8a94aa9412 Updated pid/lock file handling. Implemetned -K option.
git-svn-id: file:///home/mbr/svn/fwknop/trunk@149 510a4753-2344-4c79-9c09-4d669213fbeb
2009-09-24 03:13:33 +00:00
Damien Stuart
61c243f827 Added some more (stubbed-in) server code and functions. Minor doc tweak.
git-svn-id: file:///home/mbr/svn/fwknop/trunk@148 510a4753-2344-4c79-9c09-4d669213fbeb
2009-09-14 00:38:31 +00:00
Damien Stuart
8a06e36338 Removed the wipe_pw routine as it could result in segfaults when a static key is used.
git-svn-id: file:///home/mbr/svn/fwknop/trunk@147 510a4753-2344-4c79-9c09-4d669213fbeb
2009-09-14 00:37:13 +00:00
Damien Stuart
2bf25e62a7 Added perl/legacy distribution (fwknop-1.9.12). Renamed this distribution from fwknop-c to simply fwknop. Made the version 2.0.0-alpha.
git-svn-id: file:///home/mbr/svn/fwknop/trunk@143 510a4753-2344-4c79-9c09-4d669213fbeb
2009-09-11 00:43:24 +00:00
Damien Stuart
a07decf1d9 Added some more stuff to deal with byte order identification on Solaris 10 x86 systems.
git-svn-id: file:///home/mbr/svn/fwknop/trunk@142 510a4753-2344-4c79-9c09-4d669213fbeb
2009-09-09 01:38:03 +00:00
Damien Stuart
4fef98682b More tweaks to config file processing, including simple variable expansion.
git-svn-id: file:///home/mbr/svn/fwknop/trunk@141 510a4753-2344-4c79-9c09-4d669213fbeb
2009-09-06 02:38:30 +00:00
Damien Stuart
911361deff Minor manpage tweak
git-svn-id: file:///home/mbr/svn/fwknop/trunk@140 510a4753-2344-4c79-9c09-4d669213fbeb
2009-09-05 23:41:15 +00:00
Damien Stuart
0c87e7395f Added override config handling and updated the config_init routines to parse everything in the correct order (i.e. config file, override configs, then command-line).
git-svn-id: file:///home/mbr/svn/fwknop/trunk@139 510a4753-2344-4c79-9c09-4d669213fbeb
2009-09-05 17:32:15 +00:00
Damien Stuart
998fe8da0a Added more server command-line and config file processing code. Updated autoconf config for new checks and files.
git-svn-id: file:///home/mbr/svn/fwknop/trunk@138 510a4753-2344-4c79-9c09-4d669213fbeb
2009-09-05 02:54:42 +00:00
Damien Stuart
791eb4055b Added check for libpcap. More stubbing in on the server code side.
git-svn-id: file:///home/mbr/svn/fwknop/trunk@137 510a4753-2344-4c79-9c09-4d669213fbeb
2009-09-04 21:14:44 +00:00
Damien Stuart
f0fa45cec2 Added fwknop.man.asciidoc to docs and fwknop.8 man page to client (derived from fwknop.man.asciidoc).
git-svn-id: file:///home/mbr/svn/fwknop/trunk@136 510a4753-2344-4c79-9c09-4d669213fbeb
2009-09-03 03:25:35 +00:00
Damien Stuart
10c0aabe38 Fixed another minor typo in the doc
git-svn-id: file:///home/mbr/svn/fwknop/trunk@135 510a4753-2344-4c79-9c09-4d669213fbeb
2009-08-12 02:11:14 +00:00
Michael Rash
768606906e updated SPA over HTTP packets to always begin the a slash right after the GET string, updated to print SPA packets over HTTP to stderr in test/verbose mode
git-svn-id: file:///home/mbr/svn/fwknop/trunk@134 510a4753-2344-4c79-9c09-4d669213fbeb
2009-08-11 03:11:57 +00:00
Damien Stuart
1781e9e758 Updated ip,port format and value check.
git-svn-id: file:///home/mbr/svn/fwknop/trunk@133 510a4753-2344-4c79-9c09-4d669213fbeb
2009-08-11 02:04:51 +00:00
Damien Stuart
eaa179a6c1 Changed http_resolve_host code to make it work with or without trailing whitespace in returned content. Updated the IP address format and value checking code. Switched back to whatsmyip.com as default IP resolver.
git-svn-id: file:///home/mbr/svn/fwknop/trunk@132 510a4753-2344-4c79-9c09-4d669213fbeb
2009-08-11 01:40:47 +00:00
Damien Stuart
08aa1ef2e8 Updates to accommodate the Windows build.
git-svn-id: file:///home/mbr/svn/fwknop/trunk@131 510a4753-2344-4c79-9c09-4d669213fbeb
2009-08-09 17:14:08 +00:00
Damien Stuart
78fb936a55 Some minor refactoring of the TIME_OFFSET handling. Other minor code formatting tweaks.
git-svn-id: file:///home/mbr/svn/fwknop/trunk@130 510a4753-2344-4c79-9c09-4d669213fbeb
2009-08-09 16:33:02 +00:00
Damien Stuart
1da9ea0f6b Made the configure help message show --disable-xxx as the options for whether or not to build the server or client.
git-svn-id: file:///home/mbr/svn/fwknop/trunk@129 510a4753-2344-4c79-9c09-4d669213fbeb
2009-08-09 16:19:50 +00:00
Damien Stuart
5b3f6f07da Forgot to add the server dir.
git-svn-id: file:///home/mbr/svn/fwknop/trunk@128 510a4753-2344-4c79-9c09-4d669213fbeb
2009-08-09 15:45:45 +00:00
Damien Stuart
53b7fae8bb Major rearrangement. Renamed directories: "fko" to "lib", "src" to "client". Added "common" and "server" directories. Setup autoconf to allow disabling the server and/or client builds.
git-svn-id: file:///home/mbr/svn/fwknop/trunk@127 510a4753-2344-4c79-9c09-4d669213fbeb
2009-08-09 15:43:16 +00:00
Damien Stuart
078661e355 Fixed typo (actually a cut-and-paste remnant) in the doc.
git-svn-id: file:///home/mbr/svn/fwknop/trunk@126 510a4753-2344-4c79-9c09-4d669213fbeb
2009-08-02 21:27:46 +00:00
Damien Stuart
8d789eff4d Update the VS project file for the new SHA digest files and functions.
git-svn-id: file:///home/mbr/svn/fwknop/trunk@125 510a4753-2344-4c79-9c09-4d669213fbeb
2009-08-02 18:34:29 +00:00
Damien Stuart
f011889da0 Forgot to add the files for the updated SHA digests (oops).
git-svn-id: file:///home/mbr/svn/fwknop/trunk@124 510a4753-2344-4c79-9c09-4d669213fbeb
2009-08-02 18:30:58 +00:00
Damien Stuart
7f45031cef Added SHA384 and SHA512 digests. Tweaks for getting rid of windows warnings. Use recv instead of read on socket. Bumped version to 0.63 (libfko) and 0.23 (FKO perl module).
git-svn-id: file:///home/mbr/svn/fwknop/trunk@123 510a4753-2344-4c79-9c09-4d669213fbeb
2009-08-02 18:28:34 +00:00
Michael Rash
3029e01238 added the --resolve-ip-http and --user-agent command line args so the fwknop-c client can resolve the external network via http://www.cipherdyne.org/cgi/myip.cgi
git-svn-id: file:///home/mbr/svn/fwknop/trunk@121 510a4753-2344-4c79-9c09-4d669213fbeb
2009-07-27 05:33:21 +00:00
Michael Rash
9bc2b1539e bugfix to order HTTP request headers properly, updated the user agent for SPA over HTTP to use the options->http_user_agent variable (can be set from the command line)
git-svn-id: file:///home/mbr/svn/fwknop/trunk@120 510a4753-2344-4c79-9c09-4d669213fbeb
2009-07-27 05:27:54 +00:00
Michael Rash
868aa6ee37 Added the --source-ip argument to build SPA packets with 0.0.0.0 (the fwknopd server can wrap access controls around this)
git-svn-id: file:///home/mbr/svn/fwknop/trunk@119 510a4753-2344-4c79-9c09-4d669213fbeb
2009-07-26 17:28:22 +00:00
Michael Rash
a57baa20d0 minor doc updates
git-svn-id: file:///home/mbr/svn/fwknop/trunk@118 510a4753-2344-4c79-9c09-4d669213fbeb
2009-07-26 15:08:46 +00:00
Michael Rash
17ca88ad4c changed the minimum destination SPA port from 1024 to 10,000
git-svn-id: file:///home/mbr/svn/fwknop/trunk@117 510a4753-2344-4c79-9c09-4d669213fbeb
2009-07-23 04:35:04 +00:00
Michael Rash
f5849dc68c * Added the --show-last and --no-save command line options to show the
command line used for the previous fwknop invocation, and to have the
  fwknop client not save its command line arguments.
* Bug fix to force libfko to recalculate the random data embedded in the
  the SPA packet after a random port is acquired via --rand-port or
  --nat-rand-port.  This is a precaution so that an attacker cannot guess
  some of the internal SPA data based on the destination port number.


git-svn-id: file:///home/mbr/svn/fwknop/trunk@116 510a4753-2344-4c79-9c09-4d669213fbeb
2009-07-23 04:17:04 +00:00
Michael Rash
70db22064e * Got forward and local NAT modes working with the --nat-access,
--nat-local, --nat-port, and --nat-randport options.  All NAT modes
  are now passing the fwknop test suite.
* Added the --server-command option to build an SPA packet with a command
  for the server to execute.
* Added the --fw-timeout option for client side timeouts to be specified.
* Added the --time-offset-plus and --time-offset-minus options to allow
  the user to influence the timestamp associated with an SPA packet.
* Added the --rand-port option so that the SPA packet destination port can
  be randomized.


git-svn-id: file:///home/mbr/svn/fwknop/trunk@115 510a4753-2344-4c79-9c09-4d669213fbeb
2009-07-21 05:18:28 +00:00
Damien Stuart
3a77e0fefa Fixed some formatting errors in the POD.
git-svn-id: file:///home/mbr/svn/fwknop/trunk@114 510a4753-2344-4c79-9c09-4d669213fbeb
2009-07-19 20:48:19 +00:00