1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-25 01:38:08 +00:00
Commit Graph

5551 Commits

Author SHA1 Message Date
grossmj
c11b3c3911 Fix tests after merge 2023-09-06 23:42:50 +07:00
grossmj
1ec056c1a6 Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/controller/__init__.py
#	gns3server/controller/appliance_manager.py
#	gns3server/web/route.py
#	requirements.txt
#	tests/compute/docker/test_docker_vm.py
2023-09-06 23:30:00 +07:00
Jeremy Grossmann
285b19d97f
Merge pull request #2272 from GNS3/fix/2271
Correctly install built-in appliances
2023-09-06 23:16:34 +07:00
grossmj
709aa46074 Fix issue with controller config saved before checking current version with previous one 2023-09-06 16:48:24 +07:00
grossmj
0c12849d0d Use controller vars file to store version and appliance etag 2023-09-06 16:28:46 +07:00
grossmj
8aa9d1aae6 Upgrade dependencies and fix user group tests 2023-09-03 17:58:51 +07:00
grossmj
66047b3431 Fix OAuth2PasswordBearer token URL 2023-09-03 17:31:05 +07:00
grossmj
6ec97a704f Put user, groups, roles and ACL under /access 2023-09-02 19:10:02 +07:00
grossmj
a358369606 Move notifications under controller router 2023-09-02 18:57:53 +07:00
grossmj
5155aea923 Upgrade dependencies 2023-09-02 18:49:16 +07:00
Jeremy Grossmann
b0c4fc17ad
Merge pull request #2275 from GNS3/rbac-new-implementation
New RBAC implementation
2023-09-02 18:47:35 +07:00
grossmj
e72b07bf5c Prepare resource pools table for future development 2023-09-02 18:42:40 +07:00
grossmj
170f476733 Add more built-in roles 2023-09-02 18:15:00 +07:00
grossmj
0077fd98aa Add required privileges to all endpoints 2023-09-02 17:54:24 +07:00
grossmj
f3a4ad49f4 Check for group ACEs to find user privileges 2023-08-28 18:14:34 +10:00
grossmj
3e0592520b Handle ACE propagate and allowed 2023-08-28 12:06:01 +10:00
Jeremy Grossmann
d3d0cc039d
Merge pull request #2277 from GNS3/fix/2276
Prevent X11 socket file to be modified by Docker container
2023-08-27 19:53:50 +10:00
grossmj
c2783d355f Fix test_create_vnc test 2023-08-27 18:41:25 +10:00
grossmj
d6e1ee5dbb Prevent X11 socket file to be modified by Docker container 2023-08-27 18:30:37 +10:00
grossmj
57197c3d1c Comment unused code 2023-08-27 18:23:10 +10:00
grossmj
60ce1172e0 Use an ACL table to check for privileges 2023-08-27 18:20:42 +10:00
grossmj
6bd855b3c5 New database schema for better RBAC 2023-08-21 21:32:23 +10:00
grossmj
74cb3be910 Merge remote-tracking branch 'origin/3.0' into 3.0 2023-08-19 12:29:53 +10:00
grossmj
425ad845fc Speed up tests 2023-08-19 12:29:25 +10:00
grossmj
1ce0c13fc9 Better mocking in Docker tests 2023-08-18 12:20:54 +10:00
grossmj
e9e2dc2ca7 Fix validation issues and improve exceptions logs 2023-08-17 17:36:50 +10:00
grossmj
a69feb3682 Use an older version of platformdirs 2023-08-12 19:15:29 +10:00
grossmj
090d1c8c84 Only use platformdirs with Python >= '3.7' 2023-08-12 19:04:14 +10:00
grossmj
df2f96828e Use the user data dir to store built-in appliances 2023-08-12 18:48:43 +10:00
grossmj
6a614fbd78 Downgrade jsonschema 2023-08-12 17:51:24 +10:00
grossmj
2d7438446c Upgrade dependencies 2023-08-12 17:47:48 +10:00
grossmj
77d4eabadc Catch ConnectionResetError exception when client disconnects 2023-08-12 17:31:58 +10:00
grossmj
ca48efa5be Upgrade SQLAlchemy to v2.0.18 and fix async_timeout warning 2023-08-11 22:52:29 +10:00
grossmj
b0657b39ef Upgrade dependencies 2023-08-11 18:54:05 +10:00
grossmj
cefa459721 Fix command line issue with certfile and certkey 2023-08-11 18:34:16 +10:00
grossmj
66dd8bdadb Merge branch '2.2' into 3.0 2023-08-11 18:14:16 +10:00
grossmj
bbb0a407e0 Upgrade to PyQt 5.15.9 and pywin32 2023-08-11 18:13:41 +10:00
Jeremy Grossmann
96ce5eac8d
Merge pull request #2270 from GNS3/packaging-migration
Packaging migration
2023-08-11 18:09:31 +10:00
grossmj
2f2aabeb5a Fix tests when running Python 3.7 2023-08-11 17:58:00 +10:00
grossmj
d9eb61efc4 Fix tests with asyncio_patch 2023-08-11 17:37:11 +10:00
grossmj
1fd8444d22 Add tests for install_busybox() 2023-08-11 17:32:05 +10:00
grossmj
f3b6825e40 Test if busybox is not dynamically linked 2023-08-11 14:10:25 +10:00
grossmj
719458764f Fix tests 2023-08-10 23:23:11 +10:00
grossmj
483db91851 Use dev for optional development dependencies 2023-08-10 23:16:57 +10:00
grossmj
f3d43aeb39 Fix testing.yml 2023-08-10 22:52:35 +10:00
grossmj
1cb433c5bc New packaging relying only pyproject.toml 2023-08-10 22:44:37 +10:00
grossmj
17f71f970e Add truststore inject_into_ssl 2023-08-10 15:01:49 +10:00
grossmj
fe90d2b146 Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/controller/__init__.py
#	gns3server/controller/appliance_manager.py
#	gns3server/crash_report.py
#	gns3server/run.py
#	gns3server/static/web-ui/index.html
#	gns3server/utils/images.py
#	gns3server/version.py
#	requirements.txt
#	scripts/update-bundled-web-ui.sh
2023-08-10 15:00:22 +10:00
grossmj
35e1519073 Development on v2.2.43.dev1 2023-08-09 22:15:15 +10:00
grossmj
08139ebdd1 Release v2.2.42 2023-08-09 21:11:57 +10:00