Commit Graph

5856 Commits

Author SHA1 Message Date
grossmj
c5f4e25756
Upgrade uvicorn, fastapi and sqlalchemy packages 2024-04-02 13:18:22 +07:00
grossmj
16bad6e0b5
Downgrade httpx_ws to v0.4.2 2024-03-24 18:37:31 +01:00
grossmj
8e661df981
Upgrade dev packages 2024-03-24 18:31:56 +01:00
grossmj
31c7fe88f1
Remove websocket.close() 2024-03-16 16:00:27 +01:00
Jeremy Grossmann
03b491f7b1
Merge pull request #2362 from GNS3/feature/use-bcrypt
Use bcrypt direcrtly instead of passlib
2024-03-08 01:33:41 +08:00
grossmj
fa41d9ba75
Use bcrypt directly instead of passlib 2024-03-07 18:17:17 +01:00
grossmj
a80aed5420
Development on 2.2.47.dev1 2024-03-05 01:07:16 +08:00
grossmj
e9827653ae
Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/crash_report.py
#	gns3server/static/web-ui/index.html
#	gns3server/version.py
#	tests/compute/docker/test_docker_vm.py
2024-03-05 01:05:46 +08:00
grossmj
9da8d1ec0f
Upgrade uvicorn, fastapi, python-multipart, sqlalchemy, aiosqlite and email-validator dependencies 2024-03-05 01:03:59 +08:00
grossmj
a53fd2e8b1
Upgrade sentry-sdk to version 1.40.6 2024-03-05 00:45:26 +08:00
grossmj
e8a7e80456
Release v2.2.46 2024-02-26 16:55:12 +08:00
grossmj
ab05784c33
Sync appliances 2024-02-26 16:45:37 +08:00
grossmj
6983e686ca
Bundle web-ui v2.2.46 2024-02-26 16:42:46 +08:00
grossmj
3631202ce5
Merge remote-tracking branch 'origin/2.2' into 2.2 2024-02-26 16:36:21 +08:00
grossmj
8d8a3247c4
Bundle web-ui v2.2.46 2024-02-26 16:35:47 +08:00
Jeremy Grossmann
d100a132d6
Merge pull request #2360 from GNS3/bugfix/3555
Fix export project
2024-02-26 16:27:39 +08:00
Jeremy Grossmann
52638a9a8d
Merge branch '2.2' into bugfix/3555 2024-02-26 16:22:15 +08:00
grossmj
9a5af82a28
Save empty directories when exporting a project 2024-02-24 19:02:16 +08:00
Jeremy Grossmann
14a618766d
Merge pull request #2359 from GNS3/bugfix/2357
Fix Docker VM hasn't access to all resources
2024-02-22 19:37:55 +08:00
grossmj
0137688ba7
Test busybox is installed 2024-02-22 13:05:48 +08:00
grossmj
84db3b9996
Fix not all Docker resources are copied to a writable location 2024-02-22 12:59:44 +08:00
grossmj
800920e3df
Merge branch '2.2' into 3.0
# Conflicts:
#	.github/workflows/testing.yml
#	gns3server/compute/docker/__init__.py
#	gns3server/compute/docker/docker_vm.py
#	gns3server/run.py
#	requirements.txt
#	setup.py
#	tests/compute/docker/test_docker_vm.py
2024-02-21 12:24:30 +08:00
grossmj
14917580ac
Downgrade to alembic v1.12.1 2024-02-15 18:42:05 +08:00
grossmj
4c65426e97
Revert "Downgrade platformdirs to v4.0.0"
This reverts commit fd85e49220.
2024-02-15 15:22:28 +08:00
grossmj
fd85e49220
Downgrade platformdirs to v4.0.0 2024-02-15 15:17:25 +08:00
Jeremy Grossmann
0a08031d85
Merge pull request #2355 from GNS3/refactor/busybox
Install Docker resources in writable location
2024-02-14 16:18:25 +08:00
grossmj
1a53c9aabf
Backport from v3: install Docker resources in a writable location at runtime. 2024-02-14 16:13:45 +08:00
grossmj
1f5085608c
Use Docker API v1.24 to get version. 2024-02-14 15:40:19 +08:00
Jeremy Grossmann
16f72b4d3d
Merge pull request #2347 from SpikefishSolutions/DeadTelnetConsoleFix
Address the telnet console death bug.
2024-02-09 20:33:16 +11:00
grossmj
3ced41633f
Upgrade dependencies 2024-02-09 17:07:35 +11:00
Jeremy Grossmann
4fa10be5aa
Merge pull request #2353 from GNS3/feature/drop-python-3.6
Drop Python 3.6 support
2024-02-09 17:01:40 +11:00
grossmj
f050fc7e00
Change runtime checks for Python version 2024-02-09 16:49:58 +11:00
grossmj
c93aafc9af
Fix aiohttp dependency for Python 3.7 2024-02-09 16:45:46 +11:00
grossmj
93520b4d6c
Do not test with Python 3.6 2024-02-09 16:34:44 +11:00
grossmj
1fb0260ae6
Drop support for Python 3.6 2024-02-09 16:28:23 +11:00
grossmj
91fd543321
Upgrade dependencies 2024-02-09 16:15:19 +11:00
John Fleming
763ef24108 Address the telnet console bug. Add wait_for for drain() call. If we're stuck on drain then the buffer isn't getting emptied. 5 seconds after drain() blocks, exception will be thrown and client will be removed from connection table and will no longer be a problem. 2024-02-02 22:09:31 -05:00
grossmj
17aabd6cda
Merge branch 'master' into 2.2 2024-01-28 20:04:19 +11:00
grossmj
d94adf4c8f
Merge remote-tracking branch 'origin/master' 2024-01-28 19:56:40 +11:00
Jeremy Grossmann
4dd9cf2da2
Merge pull request #2340 from spikefishjohn/patch-3
Update telnet_server.py
2024-01-28 19:56:26 +11:00
grossmj
d6f8069739
Remove files from 2.2 doc 2024-01-28 13:03:06 +11:00
grossmj
0037f31553
Merge branch '2.2' into 3.0
# Conflicts:
#	CHANGELOG
#	docs/api/notifications/link.updated.json
#	docs/api/notifications/log.warning.json
#	docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodes.rst
#	docs/api/v2/compute/ethernet_switch/projectsprojectidethernetswitchnodesnodeid.rst
#	docs/api/v2/compute/iou/projectsprojectidiounodes.rst
#	docs/api/v2/compute/project/projects.rst
#	docs/api/v2/compute/qemu/projectsprojectidqemunodes.rst
#	docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeid.rst
#	docs/api/v2/compute/qemu/projectsprojectidqemunodesnodeidstart.rst
#	docs/api/v2/controller/link/projectsprojectidlinks.rst
#	docs/api/v2/controller/link/projectsprojectidlinkslinkid.rst
#	docs/api/v2/controller/link/projectsprojectidlinkslinkidstartcapture.rst
#	docs/api/v2/controller/project/projects.rst
#	docs/api/v2/controller/project/projectsprojectidduplicate.rst
#	docs/controller_notifications.rst
#	docs/curl.rst
#	docs/gns3_file.json
#	docs/project_notifications.rst
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/controller/project.py
#	gns3server/crash_report.py
#	gns3server/schemas/ethernet_hub.py
#	gns3server/schemas/ethernet_switch.py
#	gns3server/static/web-ui/3rdpartylicenses.txt
#	gns3server/static/web-ui/index.html
#	gns3server/utils/asyncio/telnet_server.py
#	gns3server/version.py
#	gns3server/web/web_server.py
#	requirements.txt
#	tests/controller/test_project.py
#	tests/controller/test_topology.py
#	tests/handlers/api/controller/test_project.py
2024-01-28 12:30:43 +11:00
grossmj
e2a3d391d8
Merge remote-tracking branch 'origin/2.2' into 2.2 2024-01-28 12:14:28 +11:00
John Fleming
6c5f54fe57
Update telnet_server.py
Maybe use the correct object name this time for the socket objects.
2024-01-28 12:14:07 +11:00
John Fleming
082fbee1bd
Update telnet_server.py
Set tcp keepalive timers to 60 seconds. Seems to default to 2 hours on ubuntu 22. Most firewalls will age out an idle tcp session at 1 hour.

Will not address telnet console failing after a tcp session has failed (TimeoutError).
2024-01-28 12:14:07 +11:00
Xatrekak
6d97feaced
Fixed updating system and GNS3. 2024-01-28 12:14:01 +11:00
Dustin
8d35089661
Update welcome.py
Fixed an issue where the shell option in dialog failed to drop you back to bash.
2024-01-28 12:13:55 +11:00
Dustin
6455f62447
Update remote-install.sh
Removed an extra slash at the end when setting the user home directory. This was causing unexpected behavior for other scrips as ~ was aliased to /opt/gns3/ instead of the expected  /opt/gns3.

This caused an extra / to appear in commands unexpectedly.
2024-01-28 12:13:55 +11:00
grossmj
2fb3b1ebab
Use Python 3.8 to publish API doc 2024-01-28 12:13:46 +11:00
grossmj
58399a9fa8
Upgrade sentry-sdk, psutil and distro dependencies 2024-01-28 12:13:12 +11:00