From 51bbe8e248cf7c1455890df4ab009541b9a375da Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Fri, 5 Apr 2019 22:03:34 +0200 Subject: [PATCH] app-admin/rsyslog: bump to v8.1903.0 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Thomas Deutschmann --- app-admin/rsyslog/Manifest | 2 + .../rsyslog-8.1903.0-add-missing-tests.patch | 736 ++++++++++++++++++ app-admin/rsyslog/rsyslog-8.1903.0.ebuild | 461 +++++++++++ 3 files changed, 1199 insertions(+) create mode 100644 app-admin/rsyslog/files/rsyslog-8.1903.0-add-missing-tests.patch create mode 100644 app-admin/rsyslog/rsyslog-8.1903.0.ebuild diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest index a875f5958450..724cd893dde1 100644 --- a/app-admin/rsyslog/Manifest +++ b/app-admin/rsyslog/Manifest @@ -1,8 +1,10 @@ DIST rsyslog-8.1901.0.tar.gz 2750872 BLAKE2B 8bc07bd0c73cf309b5fb853e3bc66e555dee4284d0c8ede5b73420db7b42758f5fcfbc7ca90b618cc27e7067795f2725f5ed96f59170f3d2690a0653f2b69847 SHA512 2b8b2d40d3df4c47dba765d70fc716dc127ce776b31f217f78a3e1c2bf820e41799a5069d7f41f04ce39baead286ecd42fb353492873e3795aff704d686d67cb +DIST rsyslog-8.1903.0.tar.gz 2786605 BLAKE2B 2c60450b5f5a54f3d4fe4f9f51c81145cdebb1b0e1dd4b76f2ad23803c8bb417affbdcc9b4a0d8ccb65b0e98f5cb5cf187ce219be3e44e44c5bd253cae5f95dc SHA512 0f698c264a4afba56467b341c094be7357fba08a6ee7a24bb1b053c06da04e83eb1832ee46b68ea21f8f4de841cd97aaadc46e78bb4adfe23604c9fe95103fa9 DIST rsyslog-8.38.0.tar.gz 2721798 BLAKE2B 578bc9eefce4893a9c1eb54ee7360cd9fa51b3c87ffe07a0fd5b122987f991835f603417243084de0b59286e993ad1c84237e61c44bc18457b3660668421101b SHA512 9dc3bdc4ef01c2af433478e182704694cb50849d811d476a03e4ce03b3c5aecfb506e7f1c1e51fadcd63da60b067d8011b92b8c9354a688fe66f7b6ffd8f9254 DIST rsyslog-8.39.0.tar.gz 2721560 BLAKE2B 0680cb31d0a07e5676a5c5626e46fa174b8df08ceec49b514624ff8ffeb750bbf199f73af1d89b9dfad121a292084d75b0a1218fb33138f1d7a149fd730cb3d9 SHA512 f46ead433f703df4af6ddc4bbb178ea145d7d2a35ee7749c32b9889f299ba20c83ed76c246530608198e84fef1f2bf10097344c31d5df38b9e0ae47cf4bee479 DIST rsyslog-8.40.0.tar.gz 2726022 BLAKE2B 33f7f2018200a20b01dbfabeeab592aa09d530edd313bb13f16c47cf3f67aebd9c465af3f1e468ca3d352cd83e4f4eee567c6fd54bbaee1723bee56f4631b440 SHA512 3d5d4f92e37ad9bf3767d5d7fc87fcb7956656f676a9495c78abd12fe9072ec8763b50543b198308a71d5d919721fb9b84b6725dd83a9d9b8a1639d81382c0dd DIST rsyslog-doc-8.1901.0.tar.gz 7768575 BLAKE2B 40bc8b038fd0210d0cac01704624d87c2a73701a7494e5970423adf14948e46d1cff6df5894a82e6664d891d0c2760a5a0154bc42fb410ecf6dd25f3166e17b8 SHA512 afcc592ce4bf0dbe048786627d87b783f1c99e7711c44ffcc41cde67b2b2fef55c944b5c90e7272a84bbec95b78c0174df634b02baad2ac5819b3611efc1cb98 +DIST rsyslog-doc-8.1903.0.tar.gz 7816457 BLAKE2B 0628a5e7f0a2c8229470f6b05c22fa0d01de12eace4f895e17a47e7003bf078be5f3b2df15cd13a4cf53384d285b558b0936308cb58e7c7e71796ca99447da3e SHA512 b42f950499798fd2bbf9e2ac2da074781955cc552628edcd928f25943b6b80d5f2e1a2eab3b8fb0fa2f6278f2b4366f096c3e976a91223e545b4306479ca4f5d DIST rsyslog-doc-8.38.0.tar.gz 7662314 BLAKE2B 57a121950a3f6630e4736a1ff998e93b543389107d146ddb148ecd2702bb208d21a7f4d77f2fd958f2a56e092341fc6a24ed1cc80a910cb1adb54c65b5b2da04 SHA512 e28a09ae2fcddc711d2cfd31207c9862192598e49964a47b41fc8fa3ae5b1e08b7e2589fb5af859d58d4bf028574eb56cac6514401aa56cb482fa1166863e6a5 DIST rsyslog-doc-8.39.0.tar.gz 7674833 BLAKE2B 1526e0637c3ab9846f447dcea48efbfd17aa517c2fc875c46ac190428db6aa2a0f81f8aaed6e5b0b6991a5c13f45bc818be76c0fe4444c0eb45628ebf48b4956 SHA512 a6d09d384616a264fdf6e09fa0f61bd82a42340bac426d93119e11158f293dd58f894623aca30f2137e51bf701531f07938d014c9b8ec97d0a796447de3089de DIST rsyslog-doc-8.40.0.tar.gz 7709769 BLAKE2B cda3bbd005120e7100bb36cf4c0f99d3a037525c5451ead5957f4dfe06eaceeba8fb2e266f53203bee6fae97898774ee17862a52ca1dae99aeb3534bbfadcd60 SHA512 2e2f37336948984a8cf0e098eb46e61fe4de6366d63a98204ecd558f4e21b7c1f222659f7bdecdd22e0a61d34c442b4734dbe72a72e8716c768a900b954d473f diff --git a/app-admin/rsyslog/files/rsyslog-8.1903.0-add-missing-tests.patch b/app-admin/rsyslog/files/rsyslog-8.1903.0-add-missing-tests.patch new file mode 100644 index 000000000000..da9c79c68293 --- /dev/null +++ b/app-admin/rsyslog/files/rsyslog-8.1903.0-add-missing-tests.patch @@ -0,0 +1,736 @@ +--- /dev/null ++++ b/tests/omhttp-auth-vg.sh +@@ -0,0 +1,3 @@ ++#!/bin/bash ++export USE_VALGRIND="YES" ++source ${srcdir:=.}/omhttp-auth.sh +--- /dev/null ++++ b/tests/omhttp-auth.sh +@@ -0,0 +1,45 @@ ++#!/bin/bash ++# This file is part of the rsyslog project, released under ASL 2.0 ++ ++# Starting actual testbench ++. ${srcdir:=.}/diag.sh init ++ ++export NUMMESSAGES=100 ++ ++port="$(get_free_port)" ++omhttp_start_server $port --userpwd="bob:bobbackwards" ++ ++generate_conf ++add_conf ' ++template(name="tpl" type="string" ++ string="{\"msgnum\":\"%msg:F,58:2%\"}") ++ ++module(load="../contrib/omhttp/.libs/omhttp") ++ ++if $msg contains "msgnum:" then ++ action( ++ # Payload ++ name="my_http_action" ++ type="omhttp" ++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'" ++ template="tpl" ++ ++ server="localhost" ++ serverport="'$port'" ++ restpath="my/endpoint" ++ batch="off" ++ ++ # Auth ++ usehttps="off" ++ uid="bob" ++ pwd="bobbackwards" ++ ) ++' ++startup ++injectmsg ++shutdown_when_empty ++wait_shutdown ++omhttp_get_data $port my/endpoint ++omhttp_stop_server ++seq_check ++exit_test +--- /dev/null ++++ b/tests/omhttp-basic-vg.sh +@@ -0,0 +1,3 @@ ++#!/bin/bash ++export USE_VALGRIND="YES" ++source ${srcdir:=.}/omhttp-basic.sh +--- /dev/null ++++ b/tests/omhttp-basic.sh +@@ -0,0 +1,43 @@ ++#!/bin/bash ++# This file is part of the rsyslog project, released under ASL 2.0 ++ ++# Starting actual testbench ++. ${srcdir:=.}/diag.sh init ++ ++export NUMMESSAGES=10000 ++ ++port="$(get_free_port)" ++omhttp_start_server $port ++ ++generate_conf ++add_conf ' ++template(name="tpl" type="string" ++ string="{\"msgnum\":\"%msg:F,58:2%\"}") ++ ++module(load="../contrib/omhttp/.libs/omhttp") ++ ++if $msg contains "msgnum:" then ++ action( ++ # Payload ++ name="my_http_action" ++ type="omhttp" ++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'" ++ template="tpl" ++ ++ server="localhost" ++ serverport="'$port'" ++ restpath="my/endpoint" ++ batch="off" ++ ++ # Auth ++ usehttps="off" ++ ) ++' ++startup ++injectmsg ++shutdown_when_empty ++wait_shutdown ++omhttp_get_data $port my/endpoint ++omhttp_stop_server ++seq_check ++exit_test +--- /dev/null ++++ b/tests/omhttp-batch-fail-with-400.sh +@@ -0,0 +1,52 @@ ++#!/bin/bash ++# This file is part of the rsyslog project, released under ASL 2.0 ++ ++# Starting actual testbench ++. ${srcdir:=.}/diag.sh init ++ ++port="$(get_free_port)" ++omhttp_start_server $port --fail-with-400-after 1000 ++ ++generate_conf ++add_conf ' ++module(load="../contrib/omhttp/.libs/omhttp") ++ ++main_queue(queue.dequeueBatchSize="2048") ++ ++template(name="tpl" type="string" ++ string="{\"msgnum\":\"%msg:F,58:2%\"}") ++ ++# Wrap message as a single batch for retry ++template(name="tpl_retry" type="string" string="[%msg%]") ++ ++ ++ruleset(name="ruleset_omhttp") { ++ action( ++ name="action_omhttp" ++ type="omhttp" ++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'" ++ template="tpl" ++ ++ server="localhost" ++ serverport="'$port'" ++ restpath="my/endpoint" ++ batch="off" ++ ++ retry="on" ++ ++ # Auth ++ usehttps="off" ++ ) & stop ++} ++ ++if $msg contains "msgnum:" then ++ call ruleset_omhttp ++' ++startup ++injectmsg 0 10000 ++shutdown_when_empty ++wait_shutdown ++omhttp_get_data $port my/endpoint ++omhttp_stop_server ++seq_check 0 999 ++exit_test +--- /dev/null ++++ b/tests/omhttp-batch-jsonarray-compress-vg.sh +@@ -0,0 +1,3 @@ ++#!/bin/bash ++export USE_VALGRIND="YES" ++source ${srcdir:=.}/omhttp-batch-jsonarray-compress.sh +--- /dev/null ++++ b/tests/omhttp-batch-jsonarray-compress.sh +@@ -0,0 +1,48 @@ ++#!/bin/bash ++# This file is part of the rsyslog project, released under ASL 2.0 ++ ++# Starting actual testbench ++. ${srcdir:=.}/diag.sh init ++ ++export NUMMESSAGES=50000 ++ ++port="$(get_free_port)" ++omhttp_start_server $port --decompress ++ ++generate_conf ++add_conf ' ++template(name="tpl" type="string" ++ string="{\"msgnum\":\"%msg:F,58:2%\"}") ++ ++module(load="../contrib/omhttp/.libs/omhttp") ++ ++main_queue(queue.dequeueBatchSize="2048") ++ ++if $msg contains "msgnum:" then ++ action( ++ # Payload ++ name="my_http_action" ++ type="omhttp" ++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'" ++ template="tpl" ++ ++ server="localhost" ++ serverport="'$port'" ++ restpath="my/endpoint" ++ batch="on" ++ batch.format="jsonarray" ++ batch.maxsize="1000" ++ compress="on" ++ ++ # Auth ++ usehttps="off" ++ ) ++' ++startup ++injectmsg ++shutdown_when_empty ++wait_shutdown ++omhttp_get_data $port my/endpoint jsonarray ++omhttp_stop_server ++seq_check ++exit_test +--- /dev/null ++++ b/tests/omhttp-batch-jsonarray-retry-vg.sh +@@ -0,0 +1,3 @@ ++#!/bin/bash ++export USE_VALGRIND="YES" ++source ${srcdir:=.}/omhttp-batch-jsonarray-retry.sh +--- /dev/null ++++ b/tests/omhttp-batch-jsonarray-retry.sh +@@ -0,0 +1,78 @@ ++#!/bin/bash ++# This file is part of the rsyslog project, released under ASL 2.0 ++ ++# Starting actual testbench ++. ${srcdir:=.}/diag.sh init ++ ++export NUMMESSAGES=50000 ++ ++port="$(get_free_port)" ++omhttp_start_server $port --fail-every 100 ++ ++generate_conf ++add_conf ' ++module(load="../contrib/omhttp/.libs/omhttp") ++ ++main_queue(queue.dequeueBatchSize="2048") ++ ++template(name="tpl" type="string" ++ string="{\"msgnum\":\"%msg:F,58:2%\"}") ++ ++# Echo message as-is for retry ++template(name="tpl_echo" type="string" string="%msg%") ++ ++ruleset(name="ruleset_omhttp_retry") { ++ action( ++ name="action_omhttp" ++ type="omhttp" ++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'" ++ template="tpl_echo" ++ ++ server="localhost" ++ serverport="'$port'" ++ restpath="my/endpoint" ++ batch="on" ++ batch.maxsize="100" ++ batch.format="jsonarray" ++ ++ retry="on" ++ retry.ruleset="ruleset_omhttp_retry" ++ ++ # Auth ++ usehttps="off" ++ ) & stop ++} ++ ++ruleset(name="ruleset_omhttp") { ++ action( ++ name="action_omhttp" ++ type="omhttp" ++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'" ++ template="tpl" ++ ++ server="localhost" ++ serverport="'$port'" ++ restpath="my/endpoint" ++ batch="on" ++ batch.maxsize="100" ++ batch.format="jsonarray" ++ ++ retry="on" ++ retry.ruleset="ruleset_omhttp_retry" ++ ++ # Auth ++ usehttps="off" ++ ) & stop ++} ++ ++if $msg contains "msgnum:" then ++ call ruleset_omhttp ++' ++startup ++injectmsg ++shutdown_when_empty ++wait_shutdown ++omhttp_get_data $port my/endpoint jsonarray ++omhttp_stop_server ++seq_check ++exit_test +--- /dev/null ++++ b/tests/omhttp-batch-jsonarray-vg.sh +@@ -0,0 +1,3 @@ ++#!/bin/bash ++export USE_VALGRIND="YES" ++source ${srcdir:=.}/omhttp-batch-jsonarray.sh +--- /dev/null ++++ b/tests/omhttp-batch-jsonarray.sh +@@ -0,0 +1,47 @@ ++#!/bin/bash ++# This file is part of the rsyslog project, released under ASL 2.0 ++ ++# Starting actual testbench ++. ${srcdir:=.}/diag.sh init ++ ++export NUMMESSAGES=50000 ++ ++port="$(get_free_port)" ++omhttp_start_server $port ++ ++generate_conf ++add_conf ' ++template(name="tpl" type="string" ++ string="{\"msgnum\":\"%msg:F,58:2%\"}") ++ ++module(load="../contrib/omhttp/.libs/omhttp") ++ ++main_queue(queue.dequeueBatchSize="2048") ++ ++if $msg contains "msgnum:" then ++ action( ++ # Payload ++ name="my_http_action" ++ type="omhttp" ++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'" ++ template="tpl" ++ ++ server="localhost" ++ serverport="'$port'" ++ restpath="my/endpoint" ++ batch="on" ++ batch.format="jsonarray" ++ batch.maxsize="1000" ++ ++ # Auth ++ usehttps="off" ++ ) ++' ++startup ++injectmsg ++shutdown_when_empty ++wait_shutdown ++omhttp_get_data $port my/endpoint jsonarray ++omhttp_stop_server ++seq_check ++exit_test +--- /dev/null ++++ b/tests/omhttp-batch-kafkarest-retry-vg.sh +@@ -0,0 +1,3 @@ ++#!/bin/bash ++export USE_VALGRIND="YES" ++source ${srcdir:=.}/omhttp-batch-kafkarest-retry.sh +--- /dev/null ++++ b/tests/omhttp-batch-kafkarest-retry.sh +@@ -0,0 +1,78 @@ ++#!/bin/bash ++# This file is part of the rsyslog project, released under ASL 2.0 ++ ++# Starting actual testbench ++. ${srcdir:=.}/diag.sh init ++ ++export NUMMESSAGES=50000 ++ ++port="$(get_free_port)" ++omhttp_start_server $port --fail-every 100 ++ ++generate_conf ++add_conf ' ++module(load="../contrib/omhttp/.libs/omhttp") ++ ++main_queue(queue.dequeueBatchSize="2048") ++ ++template(name="tpl" type="string" ++ string="{\"msgnum\":\"%msg:F,58:2%\"}") ++ ++# Echo message as-is for retry ++template(name="tpl_echo" type="string" string="%msg%") ++ ++ruleset(name="ruleset_omhttp_retry") { ++ action( ++ name="action_omhttp" ++ type="omhttp" ++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'" ++ template="tpl_echo" ++ ++ server="localhost" ++ serverport="'$port'" ++ restpath="my/endpoint" ++ batch="on" ++ batch.maxsize="100" ++ batch.format="kafkarest" ++ ++ retry="on" ++ retry.ruleset="ruleset_omhttp_retry" ++ ++ # Auth ++ usehttps="off" ++ ) & stop ++} ++ ++ruleset(name="ruleset_omhttp") { ++ action( ++ name="action_omhttp" ++ type="omhttp" ++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'" ++ template="tpl" ++ ++ server="localhost" ++ serverport="'$port'" ++ restpath="my/endpoint" ++ batch="on" ++ batch.maxsize="100" ++ batch.format="kafkarest" ++ ++ retry="on" ++ retry.ruleset="ruleset_omhttp_retry" ++ ++ # Auth ++ usehttps="off" ++ ) & stop ++} ++ ++if $msg contains "msgnum:" then ++ call ruleset_omhttp ++' ++startup ++injectmsg ++shutdown_when_empty ++wait_shutdown ++omhttp_get_data $port my/endpoint kafkarest ++omhttp_stop_server ++seq_check ++exit_test +--- /dev/null ++++ b/tests/omhttp-batch-kafkarest.sh +@@ -0,0 +1,47 @@ ++#!/bin/bash ++# This file is part of the rsyslog project, released under ASL 2.0 ++ ++# Starting actual testbench ++. ${srcdir:=.}/diag.sh init ++ ++export NUMMESSAGES=50000 ++ ++port="$(get_free_port)" ++omhttp_start_server $port ++ ++generate_conf ++add_conf ' ++template(name="tpl" type="string" ++ string="{\"msgnum\":\"%msg:F,58:2%\"}") ++ ++module(load="../contrib/omhttp/.libs/omhttp") ++ ++main_queue(queue.dequeueBatchSize="2048") ++ ++if $msg contains "msgnum:" then ++ action( ++ # Payload ++ name="my_http_action" ++ type="omhttp" ++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'" ++ template="tpl" ++ ++ server="localhost" ++ serverport="'$port'" ++ restpath="my/endpoint" ++ batch="on" ++ batch.format="kafkarest" ++ batch.maxsize="100" ++ ++ # Auth ++ usehttps="off" ++ ) ++' ++startup ++injectmsg ++shutdown_when_empty ++wait_shutdown ++omhttp_get_data $port my/endpoint kafkarest ++omhttp_stop_server ++seq_check ++exit_test +--- /dev/null ++++ b/tests/omhttp-batch-newline.sh +@@ -0,0 +1,47 @@ ++#!/bin/bash ++# This file is part of the rsyslog project, released under ASL 2.0 ++ ++# Starting actual testbench ++. ${srcdir:=.}/diag.sh init ++ ++export NUMMESSAGES=50000 ++ ++port="$(get_free_port)" ++omhttp_start_server $port ++ ++generate_conf ++add_conf ' ++template(name="tpl" type="string" ++ string="{\"msgnum\":\"%msg:F,58:2%\"}") ++ ++module(load="../contrib/omhttp/.libs/omhttp") ++ ++main_queue(queue.dequeueBatchSize="2048") ++ ++if $msg contains "msgnum:" then ++ action( ++ # Payload ++ name="my_http_action" ++ type="omhttp" ++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'" ++ template="tpl" ++ ++ server="localhost" ++ serverport="'$port'" ++ restpath="my/endpoint" ++ batch="on" ++ batch.format="newline" ++ batch.maxsize="100" ++ ++ # Auth ++ usehttps="off" ++ ) ++' ++startup ++injectmsg ++shutdown_when_empty ++wait_shutdown ++omhttp_get_data $port my/endpoint newline ++omhttp_stop_server ++seq_check ++exit_test +--- /dev/null ++++ b/tests/omhttp-retry-vg.sh +@@ -0,0 +1,3 @@ ++#!/bin/bash ++export USE_VALGRIND="YES" ++source ${srcdir:=.}/omhttp-retry.sh +--- /dev/null ++++ b/tests/omhttp-retry.sh +@@ -0,0 +1,46 @@ ++#!/bin/bash ++# This file is part of the rsyslog project, released under ASL 2.0 ++ ++# Starting actual testbench ++. ${srcdir:=.}/diag.sh init ++ ++export NUMMESSAGES=10000 ++ ++port="$(get_free_port)" ++omhttp_start_server $port --fail-every 1000 ++ ++generate_conf ++add_conf ' ++module(load="../contrib/omhttp/.libs/omhttp") ++ ++main_queue(queue.dequeueBatchSize="2048") ++ ++template(name="tpl" type="string" ++ string="{\"msgnum\":\"%msg:F,58:2%\"}") ++ ++if $msg contains "msgnum:" then ++ action( ++ # Payload ++ action.resumeRetryCount="-1" ++ name="my_http_action" ++ type="omhttp" ++ errorfile="'$RSYSLOG_DYNNAME/omhttp.error.log'" ++ template="tpl" ++ ++ server="localhost" ++ serverport="'$port'" ++ restpath="my/endpoint" ++ batch="off" ++ ++ # Auth ++ usehttps="off" ++ ) ++' ++startup ++injectmsg ++shutdown_when_empty ++wait_shutdown ++omhttp_get_data $port my/endpoint ++omhttp_stop_server ++seq_check ++exit_test +--- /dev/null ++++ b/tests/omhttp_server.py +@@ -0,0 +1,130 @@ ++#!/usr/bin/env python ++ ++import argparse ++import json ++import os ++import zlib ++import base64 ++ ++try: ++ from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer # Python 2 ++except ImportError: ++ from http.server import BaseHTTPRequestHandler, HTTPServer # Python 3 ++ ++# Keep track of data received at each path ++data = {} ++ ++metadata = {'posts': 0, 'fail_after': 0, 'fail_every': -1, 'decompress': False, 'userpwd': ''} ++ ++ ++class MyHandler(BaseHTTPRequestHandler): ++ """ ++ POST'd data is kept in the data global dict. ++ Keys are the path, values are the raw received data. ++ Two post requests to :/post/endpoint means data looks like... ++ {"/post/endpoint": ["{\"msgnum\":\"00001\"}", "{\"msgnum\":\"00001\"}"]} ++ ++ GET requests return all data posted to that endpoint as a json list. ++ Note that rsyslog usually sends escaped json data, so some parsing may be needed. ++ A get request for :/post/endpoint responds with... ++ ["{\"msgnum\":\"00001\"}", "{\"msgnum\":\"00001\"}"] ++ """ ++ ++ def validate_auth(self): ++ # header format for basic authentication ++ # 'Authorization: Basic ' ++ if 'Authorization' not in self.headers: ++ self.send_response(401) ++ self.end_headers() ++ self.wfile.write('missing "Authorization" header') ++ return False ++ ++ auth_header = self.headers['Authorization'] ++ _, b64userpwd = auth_header.split() ++ userpwd = base64.b64decode(b64userpwd) ++ if userpwd != metadata['userpwd']: ++ self.send_response(401) ++ self.end_headers() ++ self.wfile.write('invalid auth: {0}'.format(userpwd)) ++ return False ++ ++ return True ++ ++ def do_POST(self): ++ metadata['posts'] += 1 ++ ++ if metadata['userpwd']: ++ if not self.validate_auth(): ++ return ++ ++ if metadata['fail_with_400_after'] != -1 and metadata['posts'] > metadata['fail_with_400_after']: ++ self.send_response(400) ++ self.end_headers() ++ self.wfile.write('BAD REQUEST') ++ return ++ ++ if metadata['posts'] > 1 and metadata['fail_every'] != -1 and metadata['posts'] % metadata['fail_every'] == 0: ++ self.send_response(500) ++ self.end_headers() ++ self.wfile.write('INTERNAL ERROR') ++ return ++ ++ content_length = int(self.headers['Content-Length']) ++ raw_data = self.rfile.read(content_length) ++ ++ if metadata['decompress']: ++ post_data = zlib.decompress(raw_data, 31) ++ else: ++ post_data = raw_data ++ ++ if self.path not in data: ++ data[self.path] = [] ++ data[self.path].append(post_data) ++ ++ res = json.dumps({'msg': 'ok'}) ++ ++ self.send_response(200) ++ self.send_header('Content-Type', 'application/json') ++ self.send_header('Content-Length', len(res)) ++ self.end_headers() ++ ++ self.wfile.write(res) ++ return ++ ++ def do_GET(self): ++ if self.path in data: ++ result = data[self.path] ++ else: ++ result = [] ++ ++ res = json.dumps(result) ++ ++ self.send_response(200) ++ self.send_header('Content-Type', 'application/json') ++ self.send_header('Content-Length', len(res)) ++ self.end_headers() ++ ++ self.wfile.write(res) ++ return ++ ++ ++if __name__ == '__main__': ++ parser = argparse.ArgumentParser(description='Archive and delete core app log files') ++ parser.add_argument('-p', '--port', action='store', type=int, default=8080, help='port') ++ parser.add_argument('-i', '--interface', action='store', type=str, default='localhost', help='port') ++ parser.add_argument('--fail-after', action='store', type=int, default=0, help='start failing after n posts') ++ parser.add_argument('--fail-every', action='store', type=int, default=-1, help='fail every n posts') ++ parser.add_argument('--fail-with-400-after', action='store', type=int, default=-1, help='fail with 400 after n posts') ++ parser.add_argument('--decompress', action='store_true', default=False, help='decompress posted data') ++ parser.add_argument('--userpwd', action='store', default='', help='only accept this user:password combination') ++ args = parser.parse_args() ++ metadata['fail_after'] = args.fail_after ++ metadata['fail_every'] = args.fail_every ++ metadata['fail_with_400_after'] = args.fail_with_400_after ++ metadata['decompress'] = args.decompress ++ metadata['userpwd'] = args.userpwd ++ server = HTTPServer((args.interface, args.port), MyHandler) ++ pid = os.getpid() ++ print('starting omhttp test server at {interface}:{port} with pid {pid}' ++ .format(interface=args.interface, port=args.port, pid=pid)) ++ server.serve_forever() diff --git a/app-admin/rsyslog/rsyslog-8.1903.0.ebuild b/app-admin/rsyslog/rsyslog-8.1903.0.ebuild new file mode 100644 index 000000000000..341d02321a0a --- /dev/null +++ b/app-admin/rsyslog/rsyslog-8.1903.0.ebuild @@ -0,0 +1,461 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) + +inherit autotools eutils linux-info python-any-r1 systemd + +DESCRIPTION="An enhanced multi-threaded syslogd with database support and more" +HOMEPAGE="https://www.rsyslog.com/" + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git" + + DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git" + + inherit git-r3 +else + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" + + SRC_URI=" + https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz + doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz ) + " +fi + +LICENSE="GPL-3 LGPL-3 Apache-2.0" +SLOT="0" +IUSE="curl dbi debug doc elasticsearch +gcrypt grok gnutls jemalloc kafka kerberos kubernetes libressl mdblookup" +IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres" +IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/libfastjson-0.99.8:= + >=dev-libs/libestr-0.1.9 + >=sys-libs/zlib-1.2.5 + curl? ( >=net-misc/curl-7.35.0 ) + dbi? ( >=dev-db/libdbi-0.8.3 ) + elasticsearch? ( >=net-misc/curl-7.35.0 ) + gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) + grok? ( >=dev-libs/grok-0.9.2 ) + jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) + kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) + kerberos? ( virtual/krb5 ) + kubernetes? ( >=net-misc/curl-7.35.0 ) + mdblookup? ( dev-libs/libmaxminddb:= ) + mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) + mysql? ( virtual/libmysqlclient:= ) + normalize? ( + >=dev-libs/libee-0.4.0 + >=dev-libs/liblognorm-2.0.3:= + ) + clickhouse? ( >=net-misc/curl-7.35.0 ) + omhttpfs? ( >=net-misc/curl-7.35.0 ) + omudpspoof? ( >=net-libs/libnet-1.1.6 ) + postgres? ( >=dev-db/postgresql-8.4.20:= ) + rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) + redis? ( >=dev-libs/hiredis-0.11.0:= ) + relp? ( >=dev-libs/librelp-1.2.17:= ) + rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) + rfc5424hmac? ( + !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) + libressl? ( dev-libs/libressl:= ) + ) + snmp? ( >=net-analyzer/net-snmp-5.7.2 ) + ssl? ( + gnutls? ( >=net-libs/gnutls-2.12.23:0= ) + openssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + ) + systemd? ( >=sys-apps/systemd-234 ) + uuid? ( sys-apps/util-linux:0= ) + xxhash? ( dev-libs/xxhash:= ) + zeromq? ( + >=net-libs/czmq-3.0.2 + )" +DEPEND="${RDEPEND} + >=sys-devel/autoconf-archive-2015.02.24 + virtual/pkgconfig + elibc_musl? ( sys-libs/queue-standalone ) + test? ( + >=dev-libs/liblogging-1.0.1[stdlog] + jemalloc? ( /dev/null + chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" + + cat > "${T}/${PF}.$$" <<- _EOF + cn = Portage automated CA + ca + cert_signing_key + expiration_days = 3650 + _EOF + + certtool --generate-self-signed \ + --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ + --outfile "${CERTDIR}/${PN}_ca.cert.pem" \ + --template "${T}/${PF}.$$" &>/dev/null + chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem" + + # Create the server certificate + echo + einfon "Please type the Common Name of the SERVER you wish to create a certificate for: " + read -r CN + + einfo "Creating private key and certificate for server ${CN}..." + certtool --generate-privkey \ + --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null + chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" + + cat > "${T}/${PF}.$$" <<- _EOF + cn = ${CN} + tls_www_server + dns_name = ${CN} + expiration_days = 3650 + _EOF + + certtool --generate-certificate \ + --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ + --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ + --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ + --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ + --template "${T}/${PF}.$$" &>/dev/null + chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" + + else + einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation." + fi + + # Create a client certificate + echo + einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: " + read -r CN + + einfo "Creating private key and certificate for client ${CN}..." + certtool --generate-privkey \ + --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null + chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem" + + cat > "${T}/${PF}.$$" <<- _EOF + cn = ${CN} + tls_www_client + dns_name = ${CN} + expiration_days = 3650 + _EOF + + certtool --generate-certificate \ + --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \ + --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \ + --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \ + --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \ + --template "${T}/${PF}.$$" &>/dev/null + chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem" + + rm -f "${T}/${PF}.$$" + + echo + einfo "Here is the documentation on how to encrypt your log traffic:" + einfo " https://www.rsyslog.com/doc/rsyslog_tls.html" +} -- 2.26.2