From 94fbd3fac9177ef33fef6937ca9c4f24643c3204 Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Tue, 16 Jun 2015 15:46:12 +0200 Subject: [PATCH 1/9] Ignore invalid characters when reading the output of a process It should happend only when user try to use another binary and the code of VPCS, dynamips... Will detect it's not the correct binary. For example we detect this error after an user used SupperPutty instead of VPCS. Fix #235 --- gns3server/utils/asyncio.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gns3server/utils/asyncio.py b/gns3server/utils/asyncio.py index c84e0fbe..21d18a74 100644 --- a/gns3server/utils/asyncio.py +++ b/gns3server/utils/asyncio.py @@ -51,7 +51,10 @@ def subprocess_check_output(*args, cwd=None, env=None): output = yield from proc.stdout.read() if output is None: return "" - return output.decode("utf-8") + # If we received garbage we ignore invalid characters + # it should happend only when user try to use another binary + # and the code of VPCS, dynamips... Will detect it's not the correct binary + return output.decode("utf-8", errors="ignore") @asyncio.coroutine From d88c5648deea40efb9f26a1ab13b78cc9dd93e88 Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Tue, 16 Jun 2015 18:56:50 +0200 Subject: [PATCH 2/9] 1.3.5 --- CHANGELOG | 12 ++++++++++++ gns3server/version.py | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index cea6d503..97d0c48f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,17 @@ # Change Log +## 1.3.5 16/06/15 + +* Ignore invalid characters when reading the output of a process +* Turn on / off authentication +* Ensure no colored output on Windows +* Do not stop saving IOS router configs when there is an exception while a project is committed. +* Create a private config file if expected +* Distribute our own version of netifaces working with python 3 +* Fix crash if a private config exist in IOS but no private config file +* Basic Auth support +* Fix crash when virtualbox list of VMS return an empty line + ## 1.3.4 02/06/15 * Drop useless dependencie dateutil diff --git a/gns3server/version.py b/gns3server/version.py index 26313f06..b9ff6d80 100644 --- a/gns3server/version.py +++ b/gns3server/version.py @@ -23,5 +23,5 @@ # or negative for a release candidate or beta (after the base version # number has been incremented) -__version__ = "1.3.5dev1" -__version_info__ = (1, 3, 5, -99) +__version__ = "1.3.5" +__version_info__ = (1, 3, 5, 0) From 947a732bfb4a212091c46171853fcefeb1204185 Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Tue, 16 Jun 2015 19:14:09 +0200 Subject: [PATCH 3/9] Remove netifaces dependencies due to IOUVM --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 21c69b57..3ed9ec7d 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,8 @@ class PyTest(TestCommand): sys.exit(errcode) -dependencies = ["gns3-netifaces>=0.10.4.1", +dependencies = [ + #"gns3-netifaces>=0.10.4.1", "aiohttp>=0.14.4", "jsonschema>=2.4.0", "Jinja2>=2.7.3", From 0dae4b69308f3634074b078d2da1133d5f91545d Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Tue, 16 Jun 2015 19:01:34 +0200 Subject: [PATCH 4/9] 1.3.6dev1 --- gns3server/crash_report.py | 2 +- gns3server/version.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gns3server/crash_report.py b/gns3server/crash_report.py index 6b6752d5..03e7c6d3 100644 --- a/gns3server/crash_report.py +++ b/gns3server/crash_report.py @@ -51,7 +51,7 @@ class CrashReport: Report crash to a third party service """ - DSN = "sync+https://1d821222775c4cf3a66ee462e22780df:4f95f621d9b54d6a8afe0d92ed076969@app.getsentry.com/38482" + DSN = "sync+https://41286c30323843fd93a8f3f313c09dd0:eedbc6d7eed442a3bd5ab00d646a7fad@app.getsentry.com/38482" if hasattr(sys, "frozen"): cacert = os.path.join(os.getcwd(), "cacert.pem") if os.path.isfile(cacert): diff --git a/gns3server/version.py b/gns3server/version.py index b9ff6d80..6f2942ff 100644 --- a/gns3server/version.py +++ b/gns3server/version.py @@ -23,5 +23,5 @@ # or negative for a release candidate or beta (after the base version # number has been incremented) -__version__ = "1.3.5" -__version_info__ = (1, 3, 5, 0) +__version__ = "1.3.6dev1" +__version_info__ = (1, 3, 6, -99) From a2d4c2427d9f2db861de4f6cf7f20472a314aa92 Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Tue, 16 Jun 2015 21:56:44 +0200 Subject: [PATCH 5/9] 1.3.6 --- CHANGELOG | 4 ++++ gns3server/version.py | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 97d0c48f..d35f4e99 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,9 @@ # Change Log +## 1.3.6 16/06/2015 + +* Fix an issue with 1.4dev compatibility + ## 1.3.5 16/06/15 * Ignore invalid characters when reading the output of a process diff --git a/gns3server/version.py b/gns3server/version.py index 6f2942ff..3d5005ee 100644 --- a/gns3server/version.py +++ b/gns3server/version.py @@ -23,5 +23,5 @@ # or negative for a release candidate or beta (after the base version # number has been incremented) -__version__ = "1.3.6dev1" -__version_info__ = (1, 3, 6, -99) +__version__ = "1.3.6" +__version_info__ = (1, 3, 6, 0) From 3495035dbf568098fdadf5a2aa8d6cc87164c195 Mon Sep 17 00:00:00 2001 From: grossmj Date: Tue, 16 Jun 2015 14:39:20 -0600 Subject: [PATCH 6/9] Bump version to 1.3.7.dev1 --- gns3server/version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gns3server/version.py b/gns3server/version.py index 3d5005ee..ba53c373 100644 --- a/gns3server/version.py +++ b/gns3server/version.py @@ -23,5 +23,5 @@ # or negative for a release candidate or beta (after the base version # number has been incremented) -__version__ = "1.3.6" -__version_info__ = (1, 3, 6, 0) +__version__ = "1.3.7.dev1" +__version_info__ = (1, 3, 6, -99) From 7980ae9ab13f500a72ac6a16cc22067226ecd595 Mon Sep 17 00:00:00 2001 From: grossmj Date: Tue, 16 Jun 2015 15:00:25 -0600 Subject: [PATCH 7/9] Update version_info. --- gns3server/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gns3server/version.py b/gns3server/version.py index ba53c373..27cd04c3 100644 --- a/gns3server/version.py +++ b/gns3server/version.py @@ -24,4 +24,4 @@ # number has been incremented) __version__ = "1.3.7.dev1" -__version_info__ = (1, 3, 6, -99) +__version_info__ = (1, 3, 7, -99) From afa4ba9b551064713c8e7b2e4b62d858a621148a Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Wed, 17 Jun 2015 09:30:56 +0200 Subject: [PATCH 8/9] Crash report key for 1.3.7 --- gns3server/crash_report.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gns3server/crash_report.py b/gns3server/crash_report.py index 03e7c6d3..52448eeb 100644 --- a/gns3server/crash_report.py +++ b/gns3server/crash_report.py @@ -51,7 +51,7 @@ class CrashReport: Report crash to a third party service """ - DSN = "sync+https://41286c30323843fd93a8f3f313c09dd0:eedbc6d7eed442a3bd5ab00d646a7fad@app.getsentry.com/38482" + DSN = "sync+https://3d569add80c74d4faecf90836bcdc1b5:3b5aa0c47c1847bc8d019b5e52ebdd1a@app.getsentry.com/38482" if hasattr(sys, "frozen"): cacert = os.path.join(os.getcwd(), "cacert.pem") if os.path.isfile(cacert): From 4216c5d2ed15229ef2848c6db04373223078db20 Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Wed, 17 Jun 2015 14:08:22 +0200 Subject: [PATCH 9/9] Prevent install on Python 2 Fix #236 --- setup.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index 3ed9ec7d..531e549f 100644 --- a/setup.py +++ b/setup.py @@ -19,6 +19,10 @@ import sys from setuptools import setup, find_packages from setuptools.command.test import test as TestCommand +# we only support Python 3 version >= 3.3 +if sys.version_info < (3, 3): + raise SystemExit("Python 3.3 or higher is required") + class PyTest(TestCommand): @@ -35,13 +39,13 @@ class PyTest(TestCommand): dependencies = [ - #"gns3-netifaces>=0.10.4.1", - "aiohttp>=0.14.4", - "jsonschema>=2.4.0", - "Jinja2>=2.7.3", - "raven>=5.2.0"] + # "gns3-netifaces>=0.10.4.1", + "aiohttp>=0.14.4", + "jsonschema>=2.4.0", + "Jinja2>=2.7.3", + "raven>=5.2.0"] -#if not sys.platform.startswith("win"): +# if not sys.platform.startswith("win"): # dependencies.append("netifaces==0.10.4") if sys.version_info == (3, 3):