commit haas-proxy for openSUSE:Factory
Hello community, here is the log from the commit of package haas-proxy for openSUSE:Factory checked in at 2018-09-07 15:42:13 Comparing /work/SRC/openSUSE:Factory/haas-proxy (Old) and /work/SRC/openSUSE:Factory/.haas-proxy.new (New) Package is "haas-proxy" Fri Sep 7 15:42:13 2018 rev:3 rq:633752 version:1.9 Changes: --- /work/SRC/openSUSE:Factory/haas-proxy/haas-proxy.changes2018-02-22 15:03:01.336760124 +0100 +++ /work/SRC/openSUSE:Factory/.haas-proxy.new/haas-proxy.changes 2018-09-07 15:43:49.43425 +0200 @@ -1,0 +2,8 @@ +Tue Aug 21 07:37:52 UTC 2018 - michal.hruse...@opensuse.org + +- update to version 1.9 + * improved logging + * better handling of some error states + * dynamic searching for sshpass + +--- Old: haas-proxy-1.6.tar.gz New: haas-proxy-1.9.tar.gz Other differences: -- ++ haas-proxy.spec ++ --- /var/tmp/diff_new_pack.jVrnEe/_old 2018-09-07 15:43:49.830251799 +0200 +++ /var/tmp/diff_new_pack.jVrnEe/_new 2018-09-07 15:43:49.834251794 +0200 @@ -16,12 +16,12 @@ # -%define hash 23f35089b0cccbdf2b4557f9bf6bab4b0bbdac57 +%define hash bbf8629d1d64840407eefc23d2b6c8835365347b Name: haas-proxy -Version:1.6 +Version:1.9 Release:0 Summary:Man in the middle proxy for honeypot as a service -License:GPL-2.0 +License:GPL-2.0-only Group: Productivity/Networking/Security URL:https://haas.nic.cz Source0: https://gitlab.labs.nic.cz/haas/proxy/raw/%{hash}/release/%{name}-%{version}.tar.gz ++ haas-proxy-1.6.tar.gz -> haas-proxy-1.9.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haas-proxy-1.6/PKG-INFO new/haas-proxy-1.9/PKG-INFO --- old/haas-proxy-1.6/PKG-INFO 2018-02-20 11:07:41.0 +0100 +++ new/haas-proxy-1.9/PKG-INFO 2018-07-30 09:26:55.0 +0200 @@ -1,11 +1,11 @@ Metadata-Version: 1.1 Name: haas-proxy -Version: 1.6 +Version: 1.9 Summary: Honeypot proxy is tool for redirectiong SSH session from local computer to server of HaaS with additional information. Home-page: https://haas.nic.cz Author: CZ.NIC Labs Author-email: h...@nic.cz -License: GPLv2 +License: GPLv3 Description-Content-Type: UNKNOWN Description: UNKNOWN Platform: UNKNOWN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haas-proxy-1.6/haas_proxy/log.py new/haas-proxy-1.9/haas_proxy/log.py --- old/haas-proxy-1.6/haas_proxy/log.py2017-12-27 11:13:23.0 +0100 +++ new/haas-proxy-1.9/haas_proxy/log.py2018-07-30 09:24:56.0 +0200 @@ -23,4 +23,6 @@ 'warning': logging.WARNING, 'debug': logging.DEBUG, }.get(level, logging.INFO), +format='%(asctime)s %(levelname)s %(name)s %(message)s', +datefmt='%Y-%m-%dT%H:%M:%S', ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haas-proxy-1.6/haas_proxy/proxy.py new/haas-proxy-1.9/haas_proxy/proxy.py --- old/haas-proxy-1.6/haas_proxy/proxy.py 2018-02-20 11:05:46.0 +0100 +++ new/haas-proxy-1.9/haas_proxy/proxy.py 2018-07-18 10:12:27.0 +0200 @@ -19,7 +19,7 @@ from twisted.python.compat import networkString from haas_proxy.balancer import Balancer -from haas_proxy.utils import force_text +from haas_proxy.utils import force_text, which class ProxyService(service.Service): @@ -44,6 +44,7 @@ """ Overridden SSHConnection for disabling logs a traceback about a failed direct-tcpip connections """ + # pylint: disable=invalid-name,inconsistent-return-statements def ssh_CHANNEL_OPEN(self, packet): # pylint: disable=unbalanced-tuple-unpacking @@ -52,14 +53,28 @@ if channel_type != b'direct-tcpip': return SSHConnectionTwisted.ssh_CHANNEL_OPEN(self, packet) -senderChannel, _ = struct.unpack('>3L', rest[:12]) log.err('channel open failed, direct-tcpip is not allowed') -reason = OPEN_CONNECT_FAILED -self.transport.sendPacket( -MSG_CHANNEL_OPEN_FAILURE, -struct.pack('>2L', senderChannel, reason) + -common.NS(networkString('unknown failure')) + common.NS(b'') -) +try: +senderChannel, _ = struct.unpack('>3L', rest[:12]) +except ValueError: +# Some bad packet, ignore it completely without responding. +pass +else: +self.transport.sendPacket( +MSG_CHANNEL_OPEN_FAILURE, +struct.pack('>2L', senderChannel, OPEN_CONNECT_FAILED) + +
commit haas-proxy for openSUSE:Factory
Hello community, here is the log from the commit of package haas-proxy for openSUSE:Factory checked in at 2018-02-22 15:02:57 Comparing /work/SRC/openSUSE:Factory/haas-proxy (Old) and /work/SRC/openSUSE:Factory/.haas-proxy.new (New) Package is "haas-proxy" Thu Feb 22 15:02:57 2018 rev:2 rq:578923 version:1.6 Changes: --- /work/SRC/openSUSE:Factory/haas-proxy/haas-proxy.changes2018-01-13 21:47:46.825702969 +0100 +++ /work/SRC/openSUSE:Factory/.haas-proxy.new/haas-proxy.changes 2018-02-22 15:03:01.336760124 +0100 @@ -1,0 +2,14 @@ +Wed Feb 21 19:42:06 UTC 2018 - michal.hruse...@opensuse.org + +- update to version 1.6 + * disable direct-tcpip traceback logs + * device token validation + +--- +Sat Jan 20 06:10:56 UTC 2018 - michal.hruse...@opensuse.org + +- update to version 1.4 + * support for load balanced honeypots +- switch to python3 + +--- Old: haas-proxy-1.3.tar.gz New: haas-proxy-1.6.tar.gz Other differences: -- ++ haas-proxy.spec ++ --- /var/tmp/diff_new_pack.hkRTCf/_old 2018-02-22 15:03:03.572679693 +0100 +++ /var/tmp/diff_new_pack.hkRTCf/_new 2018-02-22 15:03:03.576679549 +0100 @@ -1,7 +1,7 @@ # # spec file for package haas-proxy # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,25 +16,26 @@ # +%define hash 23f35089b0cccbdf2b4557f9bf6bab4b0bbdac57 Name: haas-proxy -Version:1.3 +Version:1.6 Release:0 Summary:Man in the middle proxy for honeypot as a service License:GPL-2.0 Group: Productivity/Networking/Security -Url:https://haas.nic.cz -%define hash c0363816618651bd6bc061321d2d7cf38e49e6f9 +URL:https://haas.nic.cz Source0: https://gitlab.labs.nic.cz/haas/proxy/raw/%{hash}/release/%{name}-%{version}.tar.gz Source1:haas-proxy.service Source2:haas-sysconfig -BuildRequires: python -BuildRequires: python-devel -BuildRequires: python-setuptools +BuildRequires: python3 +BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildRequires: systemd-rpm-macros -Requires: python-base -Requires: python-Twisted -Requires: python-pycrypto -Requires: python2-service_identity +Requires: python3-Twisted +Requires: python3-base +Requires: python3-cachetools +Requires: python3-pycrypto +Requires: python3-service_identity Requires: sshpass BuildArch: noarch %{?systemd_requires} @@ -48,10 +49,10 @@ %setup -q %build -python setup.py build +python3 setup.py build %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} +python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} install -Dm 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/haas-proxy rm -rf %{buildroot}%{_sysconfdir}/init.d install -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/haas-proxy.service @@ -73,7 +74,7 @@ %files %config(noreplace) %{_sysconfdir}/haas-proxy -%{python_sitelib}/* +%{python3_sitelib}/* %{_sbindir}/rchaas-proxy %{_unitdir}/haas-proxy.service ++ haas-proxy-1.3.tar.gz -> haas-proxy-1.6.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haas-proxy-1.3/PKG-INFO new/haas-proxy-1.6/PKG-INFO --- old/haas-proxy-1.3/PKG-INFO 2018-01-08 15:02:14.0 +0100 +++ new/haas-proxy-1.6/PKG-INFO 2018-02-20 11:07:41.0 +0100 @@ -1,11 +1,12 @@ Metadata-Version: 1.1 Name: haas-proxy -Version: 1.3 +Version: 1.6 Summary: Honeypot proxy is tool for redirectiong SSH session from local computer to server of HaaS with additional information. Home-page: https://haas.nic.cz Author: CZ.NIC Labs Author-email: h...@nic.cz License: GPLv2 +Description-Content-Type: UNKNOWN Description: UNKNOWN Platform: UNKNOWN Classifier: Programming Language :: Python :: 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/haas-proxy-1.3/README.md new/haas-proxy-1.6/README.md --- old/haas-proxy-1.3/README.md1970-01-01 01:00:00.0 +0100 +++ new/haas-proxy-1.6/README.md2017-06-16 14:24:32.0 +0200 @@ -0,0 +1,17 @@ +# Honeypot Proxy + +Honeypot proxy is tool for redirectiong SSH session from local computer +to server of HaaS with additional information. + +More information on https://haas.nic.cz + +## Development + +To prepare your dev envrionment run