125 Commits

Author SHA1 Message Date
Rainer Gerhards
48684ceac5 improved error messages and corrected fingerprint format 2008-05-19 09:43:37 +02:00
Rainer Gerhards
edf41396ef regained netstream driver genericity; improved drivers
- made action logic pass optional auth params only if they are
  actually configured
- added new authMode and Fingerprint methods to ptcp netstream
  driver (keeping them once again generic)
- added diagnostics messages when invalid auth modes were
  configured
2008-05-17 11:19:12 +02:00
Rainer Gerhards
6ea98ec5ff added first rough ability to authenticate the server against its certificate
This is very experimental and needs some more work. It probably even
segfaults - but the base code is there and running. The rest is
refinement.

While working on this, I did these two bugfixes:
- bugfix: small mem leak in omfwd on exit (strmdriver name was not freed)
- bugfix: $ActionSendStreamDriver had no effect
2008-05-16 18:26:25 +02:00
Rainer Gerhards
29ebd4ab3e Merge branch 'master' into ietf-tls 2008-05-16 15:11:24 +02:00
Rainer Gerhards
770b709654 fixed potential uninitialzed var access (highly improbable) 2008-05-16 14:53:12 +02:00
Rainer Gerhards
ed96dda644 Merge branch 'beta'
Conflicts:

	ChangeLog
	rfc3195d.c
2008-05-16 13:46:09 +02:00
Rainer Gerhards
09afe64f29 added fromhost-ip properties and some bugfixes
- bugfix: TCP input modules did incorrectly set fromhost property
  (always blank)
- bugfix: imklog did not set fromhost property
- added "fromhost-ip" property
- added "RSYSLOG_DebugFormat" canned template
- bugfix: hostname and fromhost were swapped when a persisted message
  (in queued mode) was read in
2008-05-16 13:36:41 +02:00
Rainer Gerhards
ffa17a25d2 client provides x.509 and server prints fingerprint 2008-05-15 16:58:25 +02:00
Rainer Gerhards
e623b1a06b added TODO item 2008-05-15 11:57:18 +02:00
Rainer Gerhards
d8b191a1f3 bugfix: TLS server went into an endless loop in some situations.
Thanks to Michael Biebl for reporting the problem.
2008-05-15 07:58:01 +02:00
Rainer Gerhards
d594f83a89 server's X509 cert fingerprint is obtained by client on connect 2008-05-08 16:00:57 +02:00
Rainer Gerhards
3d74096021 added a bit of doc (at least something...) 2008-05-08 13:24:20 +02:00
Rainer Gerhards
f027201679 bugfix: gtls netstram driver did not specify threading model
(could possibly lead to "interesting effects" ;))
2008-05-08 10:17:03 +02:00
Rainer Gerhards
442dad3521 limited number of unavoidable compiler warnings when compiling with GnuTLS 2008-05-07 12:33:18 +02:00
Rainer Gerhards
346a9e6379 added missing includes (noticed under SuSe Linux) 2008-05-06 18:32:59 +02:00
Rainer Gerhards
02795031a3 final touches for 3.19.0 2008-05-06 10:58:06 +02:00
Rainer Gerhards
9e0af15a32 Merge branch 'tls' 2008-05-06 10:25:42 +02:00
Rainer Gerhards
fcbead3d4c trying to remove compiler warnings 2008-05-05 14:50:04 +02:00
Rainer Gerhards
7022e9019e support for different forwarding stream drivers added
they can now be set on an action-by-action basis
2008-05-05 14:19:12 +02:00
Rainer Gerhards
74ab20fa5c made default certificate file locations configurable
- added $DefaultNetstreamDriverCAFile config directive
- added $DefaultNetstreamDriverCertFile config directive
- added $DefaultNetstreamDriverKeyFile config directive
2008-05-05 12:59:06 +02:00
Rainer Gerhards
b9cbb0d696 made imgssapi work with new netstrm driver model
there were a couple of things where imgssapi was not compatible
with the new encapsulation. I did a somewhat dirty fix. The real
solution would be to turn gssapi functionality into a netstream
driver, which is too much for now (after all, we want to release
some time AND we need to have the code mature in practice
before we go for the next target...).
2008-05-05 11:45:41 +02:00
Rainer Gerhards
bad4228f84 Merge branch 'beta'
Conflicts:

	plugins/imklog/linux.c
	runtime/cfsysline.c
	runtime/ctok.c
	runtime/linkedlist.c
	runtime/sysvar.c
2008-05-02 12:40:48 +02:00
Rainer Gerhards
da88900143 added $InputTCPServerStreamDriverMode config directive 2008-04-30 18:53:21 +02:00
Rainer Gerhards
1c2268faa8 restructured netstrm driver layer
the new structure prevents repetitive loads and unloads of
driver files; it also has less overhead
The "select" and regular driver are now contained in a single
file.
2008-04-30 17:41:17 +02:00
Rainer Gerhards
c370fc6305 server handshake now works with nonblocking sockets 2008-04-30 16:35:35 +02:00
Rainer Gerhards
b0d63ea8f2 made plain tcp syslog via TLS work on the server
... but so far only in blocking mode
2008-04-30 14:51:45 +02:00
Rainer Gerhards
055d4ffc2a fixed problem with module unload sequence 2008-04-29 15:36:22 +02:00
Rainer Gerhards
1cce2e35b0 removed loadbale module leak
- moved netstrms, netstrm and nssel into a single loadble module
  because they belong together
- fixed "loadbale module leak"
2008-04-29 12:21:52 +02:00
Rainer Gerhards
94acfb1c5f ability to load proper select netstrm driver 2008-04-29 10:02:59 +02:00
Rainer Gerhards
a3ff7eaf85 added $ActionSendStreamDriverMode config directive 2008-04-28 14:21:58 +02:00
Rainer Gerhards
10e06c833a added $DefaultNetstreamDriver config directive 2008-04-28 12:16:18 +02:00
Rainer Gerhards
434e404a6c Merge branch 'klogd-bug' 2008-04-28 09:24:05 +02:00
Rainer Gerhards
76e4eb29d4 fixed memory leaks 2008-04-28 08:09:21 +02:00
Rainer Gerhards
75cf92117c made gtls server driver work in plain tcp mode 2008-04-25 12:54:59 +02:00
Rainer Gerhards
af30c9f8f2 added select() driver for GnuTls 2008-04-24 20:10:24 +02:00
Rainer Gerhards
898d69037d added missing copyright statements
(thanks to Michael Biebl for noticing)
2008-04-24 19:28:42 +02:00
Rainer Gerhards
af50a76c3f made this compile with the new abstracted socket server calls
undid some invalid changes during merge plus did a few wrappers.
Compiles, but does not yet work.
2008-04-24 17:59:43 +02:00
Rainer Gerhards
4b05bef636 Merge branch 'sock-abstract' into tls
Conflicts:

	runtime/Makefile.am
	runtime/netstrm.c
	runtime/nsd.h
	runtime/nsd_ptcp.c
	runtime/rsyslog.h
2008-04-24 17:43:45 +02:00
Rainer Gerhards
a7040a9623 some cleanup 2008-04-24 11:03:34 +02:00
Rainer Gerhards
0e19d501bb fixed newly introduced memory leaks 2008-04-24 10:54:51 +02:00
Rainer Gerhards
bf3d2c1b39 message reception via TCP work again
... at least in some cases ;) I assume there are still a couple
of bugs inside the code. But at least we have something from
where we can continue to work on.
2008-04-24 09:57:43 +02:00
Rainer Gerhards
721b9ee252 client functionality works again (with the new socket abstraction) 2008-04-23 17:48:13 +02:00
Rainer Gerhards
50fe2ec2ea removed listener array from inidividual netstrm (mostly finished) 2008-04-23 16:31:35 +02:00
Rainer Gerhards
1892fc75f9 added new netstrms class
netstrms is at the top layer of the socket abstraction
2008-04-23 15:07:19 +02:00
Rainer Gerhards
2be459c4d7 objects for receive-side socket abstraction specified
The objects for receiver-side socket abstraction have now be
specified. The project as whole does not yet compile and
definitely not run, but I'd like to commit some milestones along
this way.
2008-04-23 09:59:01 +02:00
Rainer Gerhards
d3b135ba9f improved TLS session closure 2008-04-18 18:52:51 +02:00
Rainer Gerhards
2069ab114e first working TLS-enabled plain TCP sender
implemented a first working version of a TLS-enabled plain TCP
sender (but, of course, the implementation is insecure as it is)
2008-04-18 18:29:02 +02:00
Rainer Gerhards
032b9c1f64 Merge branch 'master' into tls 2008-04-18 14:38:17 +02:00
Rainer Gerhards
08a4fc4ae5 bugfix: a recent change effectively disabled error messages 2008-04-18 14:35:27 +02:00
Rainer Gerhards
fd6c3bc36a set stage for TLS client implementation 2008-04-18 14:25:29 +02:00