1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 11:18:11 +00:00
Commit Graph

4187 Commits

Author SHA1 Message Date
Jeremy Grossmann
da626d334f
Merge branch '3.0' into iou-user-loader-libraries 2022-07-20 16:44:48 +02:00
grossmj
7f5ad8e225 Ignore image detection for IOU user libraries in image directory 2022-07-20 16:39:24 +02:00
grossmj
037c659f9b Don't show optional token param in API docs 2022-07-20 00:29:42 +02:00
John Fleming
7277d526e3
Update compute.py
Remove check for open project. Without this check a remote can be rebooted and will be usable once the main server polls it again. Without this the main server would need to open a project that already uses the remote server or restart the main server's gns3 process.
2022-07-18 18:43:57 -04:00
grossmj
d022b211dc Fix check for 32-bit in ELF header 2022-07-17 23:55:34 +02:00
grossmj
80f5ca0c3f Checks for valid hostname on server side for Dynamips, IOU, Qemu and Docker nodes 2022-07-17 11:51:29 +02:00
grossmj
86368a1177 Sync appliance files 2022-07-17 00:04:55 +02:00
grossmj
e9f4fad0bd Merge remote-tracking branch 'origin/3.0' into 3.0 2022-07-16 12:11:41 +02:00
grossmj
b2ba561c0d Only check files (not directories) when looking for new images on file system. 2022-07-16 12:11:26 +02:00
grossmj
f5e1956dfa Support user defined loader/libraries to run IOU 2022-07-16 11:38:51 +02:00
grossmj
9462bca124 Remove explicit Response for VPCS endpoints returning HTTP 204 status code 2022-07-16 00:14:31 +02:00
grossmj
fc6aeb715a Remove explicit Response for endpoints returning HTTP 204 status code 2022-07-16 00:12:18 +02:00
grossmj
4a1da00601 Make 'vendor_url' and 'maintainer_email' optional for template validation. 2022-07-12 11:55:18 +02:00
grossmj
f4b67f2e59 Allow auth token to be passed as a URL param 2022-07-11 14:19:47 +02:00
BoHong Li
790bf4521d fix: use exact match to find interface in windows to avoid get wrong interface 2022-07-06 14:22:11 +08:00
grossmj
149d086fd8 Reactivate project importation 2022-07-05 23:01:44 +02:00
grossmj
9e5ca50302 Bump version to v2.2.34dev2 2022-06-23 10:55:19 +02:00
grossmj
c5f441e1d3 Remove wrong reset_console() method 2022-06-21 17:22:47 +02:00
grossmj
410f062721 Fix config option to disable built-in templates. 2022-06-21 17:17:44 +02:00
grossmj
d303d13045 Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/compute/base_node.py
#	gns3server/compute/docker/docker_vm.py
#	gns3server/compute/iou/iou_vm.py
#	gns3server/controller/template_manager.py
#	gns3server/handlers/api/compute/docker_handler.py
#	gns3server/handlers/api/compute/dynamips_vm_handler.py
#	gns3server/handlers/api/compute/iou_handler.py
#	gns3server/handlers/api/compute/qemu_handler.py
#	gns3server/handlers/api/compute/virtualbox_handler.py
#	gns3server/handlers/api/compute/vmware_handler.py
#	gns3server/handlers/api/compute/vpcs_handler.py
#	gns3server/handlers/api/controller/node_handler.py
#	gns3server/version.py
#	requirements.txt
#	tests/controller/test_controller.py
#	tests/controller/test_project.py
#	tests/handlers/api/controller/test_node.py
2022-06-21 16:45:25 +02:00
grossmj
35ec8bed6e Back to development on v2.2.34dev2 2022-06-21 11:52:58 +02:00
grossmj
0433065b8b Revert "Development on v2.2.34dev2"
This reverts commit 7c5a5a9001.
2022-06-21 11:51:01 +02:00
grossmj
7c5a5a9001 Development on v2.2.34dev2 2022-06-21 11:38:09 +02:00
grossmj
1b32ef7854 Release v2.2.33.1 2022-06-21 10:48:02 +02:00
grossmj
f5b1920f8c Add missing web-ui file 2022-06-21 10:24:19 +02:00
grossmj
4341db0ff3 Development on v2.2.34dev1 2022-06-20 21:47:42 +02:00
grossmj
162a8baf7b Release v2.2.33 2022-06-20 20:53:21 +02:00
grossmj
d47e546fce Release web-ui v2.2.33 2022-06-20 20:37:51 +02:00
grossmj
3c901a84bf Sync appliance files. 2022-06-20 20:02:04 +02:00
grossmj
908911e764 Remove parameter "Name" not useful to create a Docker container 2022-06-18 19:41:20 +02:00
grossmj
bdd703a0dc Support to reset all console connections. Ref https://github.com/GNS3/gns3-server/issues/1619 2022-06-15 15:30:44 +02:00
grossmj
67bf14776f Config option to disable built-in templates 2022-06-15 14:48:52 +02:00
grossmj
2eb64200a4 Add spaces before hostname for Docker network config. Ref #2039 2022-06-12 19:32:34 +08:00
grossmj
988ca7574c Add hostname entry to sample network config for Docker nodes. Fixes #2039 2022-06-08 01:07:31 +08:00
grossmj
527d4bb3ea Run Xtigervnc with MIT-SHM extension disabled for Docker VNC console support. Fixes #2071 2022-06-08 00:05:24 +08:00
grossmj
7d49b80e6b Add controller endpoints to get VirtualBox VMs, VMware VMs and Docker images 2022-06-07 00:38:59 +08:00
Jeremy Grossmann
3b7dfe5929
Merge pull request #2055 from GNS3/remove-qemu-binaries-requirement
Remove Qemu binary requirement
2022-06-06 14:51:07 +08:00
grossmj
30f7c0ce74 Fix issues when discovering images 2022-06-03 15:35:33 +07:00
grossmj
c98a10dcfd Do not tweak zstd compression params 2022-06-03 11:26:26 +07:00
grossmj
162af5bb7a Checks for compression levels + tests 2022-06-01 20:26:59 +07:00
grossmj
015e17338c HTTP middleware create issues when streaming project archive 2022-06-01 15:31:59 +07:00
grossmj
8a964390f8 Add zstandard compression support for project export 2022-05-31 18:08:34 +07:00
grossmj
37c7bc4956 Add missing response() method in ComputeConflictError 2022-05-27 16:03:54 +07:00
grossmj
85cdd7d9a5 Fix reading response embedded in ComputeConflictError 2022-05-27 15:58:14 +07:00
grossmj
944a72254c Revert "Sync dev version of web-ui v3"
This reverts commit a9d58e337f.
2022-05-27 14:00:18 +07:00
grossmj
a9d58e337f Sync dev version of web-ui v3 2022-05-26 19:37:23 +07:00
grossmj
df50b46952 Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/compute/docker/docker_vm.py
#	gns3server/version.py
#	requirements.txt
2022-04-27 22:23:05 +07:00
grossmj
bccfb64958 Development on 2.2.33dev1 2022-04-27 19:51:24 +07:00
grossmj
99813b3cfa Release v2.2.32 2022-04-27 18:47:20 +07:00
grossmj
1837850894 Docker: load custom interface files from /etc/network/interfaces (commented by default). Ref #2052 2022-04-27 18:37:09 +07:00
grossmj
fe037a5f1c Merge branch 'master' into 2.2 2022-04-27 18:25:31 +07:00
grossmj
b03ec6e3fe Release web Ui 2.2.32 with correct version displayed 2022-04-27 18:24:36 +07:00
grossmj
732c5deeff Revert "Release web UI 2.2.32"
This reverts commit db1443dd08.
2022-04-27 18:19:44 +07:00
grossmj
db1443dd08 Release web UI 2.2.32 2022-04-27 18:11:26 +07:00
grossmj
54e638f3ea Update appliance files 2022-04-27 17:26:36 +07:00
grossmj
89c67790ae Make sure that the temporary image file is removed after uploading an image 2022-04-27 16:00:02 +07:00
grossmj
cd096ac6e6 Backward compatibility for --log argument 2022-04-27 14:15:29 +07:00
grossmj
890dbd9f77 Create /etc/network/interfaces.d in Docker container. Fixes #2052 2022-04-20 22:59:51 +07:00
grossmj
460fe5ed95 Prettify Docker '/etc/network/interfaces' file. Ref #2040 2022-04-20 19:29:56 +07:00
grossmj
653539d2b0 Use public DSNs for Sentry 2022-04-20 18:41:18 +07:00
grossmj
56b5c1d237 Fix VMware Fusion VM does not start on macOS >= 11. Fixes #2027 2022-04-20 18:26:45 +07:00
grossmj
2535e5508d Remove Qemu binary requirement 2022-04-19 18:21:39 +07:00
grossmj
8b5558ba94 Fix merge error 2022-04-18 17:18:30 +07:00
Jeremy Grossmann
b94f01fe4e
Merge branch '3.0' into image-md5sum-management 2022-04-18 17:15:21 +07:00
grossmj
3106c8a6a2 Do not cache to md5sum file in some situations 2022-04-18 17:13:52 +07:00
grossmj
010d7aa49f Upgrade SQLAlchemy version and dispose of db engine 2022-04-17 17:32:44 +07:00
grossmj
e6c8144210 Detect new images added to the default image directory.
* Images can be present before the server starts or while it is running
* Images are recorded in the database
2022-04-17 16:58:20 +07:00
grossmj
e50bed5bee Support delete Qemu disk image from API
Return the real disk image name in the 'hdx_disk_image_backed' property for Qemu VMs
2022-04-14 17:01:54 +07:00
grossmj
a1c76ec4f2 Fix ComputeConflictError import 2022-04-07 16:34:48 +08:00
grossmj
fda2a37b98 Handle creating Qemu disk images and resizing 2022-04-07 16:21:47 +08:00
grossmj
888c773dc0 Finish to clean up local setting usage. Ref #1460 2022-03-31 12:05:47 +08:00
grossmj
900d4f79ee "Local" command line parameter is only for stopping
a server that has been started by the desktop GUI
2022-03-30 18:38:34 +08:00
Kai Vogelgesang
73dff4b9c6
Fix typo 2022-03-23 08:38:14 +01:00
grossmj
8975f63e2f Fix AsyncSession handling after breaking changes in FastAPI 0.74.0
See https://github.com/tiangolo/fastapi/releases/tag/0.74.0 for details.
2022-03-20 16:25:48 +10:00
grossmj
9b39bfb845 Detect image type instead of requesting it from user 2022-03-20 16:20:17 +10:00
grossmj
db739775d0 Drop Python 3.6 support and require Python >= 3.7 2022-03-14 15:13:26 +10:30
grossmj
f8a83e7ff9 Merge branch '2.2' into 3.0
# Conflicts:
#	dev-requirements.txt
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/version.py
#	requirements.txt
2022-03-13 14:50:02 +10:30
grossmj
53f89a7fe5 Development on 2.2.32dev1 2022-02-26 20:39:26 +10:30
grossmj
22c16e3608 Release v2.2.31 2022-02-26 18:22:29 +10:30
grossmj
bb26ef2c3d Development on 2.2.31dev1 2022-02-25 15:59:40 +10:30
grossmj
74018fae7b Release v2.2.30 2022-02-25 14:52:27 +10:30
grossmj
f963e63d16 Merge branch 'master' into 2.2 2022-02-25 14:45:47 +10:30
grossmj
7490be6d5e Support GNS3 variables in Docker environment variables. Fixes #2033 2022-02-23 14:33:30 +10:30
piotrpekala7
fa96c1845c Release web UI 2.2.30 2022-02-16 01:08:59 +01:00
grossmj
74c675d5b0 Drop Windows support 2022-01-19 22:28:36 +10:30
grossmj
4fb0cd9321 Remove unused code 2022-01-18 19:55:36 +10:30
John Fleming
511ac73d4f
qemu_vm.py Linked node test.
Include project name in error. This should help identify which project the none linked node is located in.
2022-01-17 14:19:49 -05:00
grossmj
f9312764ba Merge branch 'master' into 3.0
# Conflicts:
#	gns3server/version.py
2022-01-11 22:42:25 +10:30
grossmj
6544f2e8e4 Development on 2.2.30dev1 2022-01-08 22:53:27 +10:30
grossmj
aff06572d4 Release v2.2.29 2022-01-08 22:15:15 +10:30
grossmj
35781e9b39 Sync appliance files 2022-01-08 22:11:32 +10:30
grossmj
3251badfa5 Merge branch 'master' into 2.2 2022-01-08 22:02:37 +10:30
piotrpekala7
9559741d1f Release web UI 2.2.29 2022-01-07 21:03:19 +01:00
grossmj
10fdd8fcf4 Add connect endpoint for computes
Param to connect to compute after creation
Report compute unauthorized HTTP errors to client
2021-12-24 13:05:39 +10:30
grossmj
36cf43475d Replace CORS origins by origin regex 2021-12-19 18:10:15 +10:30
grossmj
d1d36ce254 Change default config settings 2021-12-17 12:26:02 +10:30
grossmj
f5301e5f14 Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/version.py
2021-12-16 12:35:11 +10:30
grossmj
ef36b340b0 Development on 2.2.29dev1 2021-12-15 21:38:06 +10:30
grossmj
bbcc28bbfc Release v2.2.28 2021-12-15 13:54:14 +10:30
grossmj
d96d11746e Merge branch 'master' into 2.2
# Conflicts:
#	init/gns3.service.systemd
2021-12-15 13:36:04 +10:30
grossmj
b400ae240d Sync appliance files 2021-12-15 13:23:48 +10:30
grossmj
ff64f86289 Fix calls to static methods in server.py 2021-12-15 13:08:18 +10:30
piotrpekala7
466584f074 Release web UI 2.2.28 2021-12-13 23:49:42 +01:00
grossmj
ab4d964d69 Do not require the local server param to open a .gns3 file. Fixes https://github.com/GNS3/gns3-gui/issues/2421 Ref #1460 2021-12-10 15:52:57 +10:30
grossmj
16fcf6141e Fix tests 2021-12-08 00:43:54 +10:30
grossmj
05d2579907 Do not automatically install appliance after uploading image 2021-12-08 00:01:25 +10:30
grossmj
01a9e83f08 Ignore OSError when closing websocket 2021-12-08 00:00:54 +10:30
grossmj
296446189f Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/appliances/Simulator.gns3a
#	gns3server/compute/docker/__init__.py
#	gns3server/compute/docker/docker_vm.py
#	gns3server/version.py
2021-12-02 19:57:04 +10:30
grossmj
8bae921587 Fix packet capture 2021-12-02 18:07:09 +10:30
grossmj
25466a9958 Allow empty compute_id. Ref #1657 2021-11-24 17:25:55 +10:30
Jeremy Grossmann
8995ed37a4
Merge pull request #1990 from GNS3/scalability
Scalability and option to use templates across all computes
2021-11-24 16:38:41 +10:30
grossmj
38388f7ae5 Secure controller to compute communication using HTTP basic authentication 2021-11-18 18:37:10 +10:30
grossmj
8d5d480077 Development on 2.2.28dev1 2021-11-13 16:31:21 +10:30
grossmj
2469468c5d Release v2.2.27 2021-11-12 15:33:53 +10:30
grossmj
02a19b230f Sync appliance files 2021-11-12 15:12:15 +10:30
grossmj
c077a15137 Merge branch 'master' into 2.2 2021-11-12 14:46:30 +10:30
piotrpekala7
ce08b8914f Release web UI 2.2.27 fixed version 2021-11-10 00:14:25 +01:00
piotrpekala7
f7b7b1e59f Release web UI 2.2.27 2021-11-08 18:13:12 +01:00
grossmj
b1a62dfdc2 Fix unhandled KeyError exception when starting Docker container. Ref #1991 2021-11-04 16:59:35 +10:30
grossmj
741fc4a557 Secure websocket endpoints 2021-11-01 16:45:14 +10:30
grossmj
7ce5e19a6e Fix issue when updating a template 2021-10-23 16:23:19 +10:30
grossmj
6165778576 Allocate compute when compute_id is unset 2021-10-22 22:03:51 +10:30
grossmj
bb15b13a9d Return the current controller hostname/IP from any compute 2021-10-21 21:38:36 +10:30
Jeremy Grossmann
16ac9358df
Merge pull request #1986 from GNS3/remove-qemu-legacy-networking
Remove Qemu legacy networking support
2021-10-20 15:44:31 +10:30
grossmj
eab4c8c770 Remove Qemu legacy networking support 2021-10-19 15:32:27 +10:30
grossmj
a31e5615a4 Add a custom version to an appliance 2021-10-19 15:15:10 +10:30
grossmj
be473aaaf7 Remove from __future__ import annotations 2021-10-18 22:16:57 +10:30
grossmj
88d98cf02e Fix tests and workaround issue with flake8 2021-10-18 22:12:10 +10:30
grossmj
01da25a7c7 Fix appliance validation with Pydantic 2021-10-18 21:53:29 +10:30
grossmj
13ff7df9fa Validate appliance files with Pydantic 2021-10-18 21:46:50 +10:30
grossmj
04934691df Appliance management refactoring:
* Install an appliance based on selected version
* Each template have unique name and version
* Allow to download an appliance file
2021-10-18 18:04:30 +10:30
grossmj
8a643cf4a4 Sync appliance files 2021-10-18 16:17:27 +10:30
grossmj
7563e4ef29 Update appliance files 2021-10-17 15:09:49 +10:30
Jeremy Grossmann
9ac6bd1e59
Merge pull request #1908 from GNS3/busybox-docker
Use a stock BusyBox for the Docker Integration
2021-10-16 19:47:24 +10:30
Jeremy Grossmann
7d626c3be8
Merge pull request #1911 from GNS3/image-management-refactoring
Images management refactoring
2021-10-10 17:40:10 +10:30
grossmj
bc36d95060 Finalize image management refactoring and auto install appliance if possible 2021-10-10 17:35:11 +10:30
grossmj
0b200def88 Merge branch 'master' into 3.0
# Conflicts:
#	.github/workflows/testing.yml
#	Dockerfile
#	gns3server/version.py
2021-10-09 12:16:50 +10:30
grossmj
1067e60284 Development on 2.2.27dev1 2021-10-08 21:49:11 +10:30
grossmj
6cb8b9a75e Release v2.2.26 2021-10-08 21:02:04 +10:30
grossmj
7009459b0c Merge branch 'master' into 2.2 2021-10-08 20:14:09 +10:30
grossmj
03c94c0bc5 Sync appliance files. 2021-10-08 20:13:32 +10:30
piotrpekala7
482b46d343 Release web UI 2.2.26 2021-10-06 17:53:00 +02:00
grossmj
b683659d21 Sqlite doesn't allow BigInteger to be used as an primary key with autoincrement 2021-09-23 11:05:03 +09:30
grossmj
5ece48500c Sort symbols by theme. Fixes https://github.com/GNS3/gns3-gui/issues/3230 2021-09-20 20:09:58 +09:30
grossmj
5eb5658a74 Fix memory percentage left warning. Fixes #1966 2021-09-20 18:08:02 +09:30
grossmj
3286348a95 Update affinity symbols. Fixes https://github.com/GNS3/gns3-gui/issues/3232 2021-09-20 17:46:19 +09:30
grossmj
d8bceaad5d Merge branch '3.0' into image-management-refactoring
# Conflicts:
#	gns3server/api/routes/controller/permissions.py
2021-09-20 17:06:46 +09:30
grossmj
5807dd068e Revert "No need to add permissions when the super admin creates templates or projects"
This reverts commit 3d1c3303f9.
2021-09-20 10:36:56 +09:30
grossmj
3d1c3303f9 No need to add permissions when the super admin creates templates or projects 2021-09-18 12:49:54 +09:30
grossmj
c8ed96d91b Add isolate and unisolate endpoints. Ref https://github.com/GNS3/gns3-gui/issues/3190 2021-09-15 18:04:43 +09:30
grossmj
541a906f49 Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/controller/node.py
#	gns3server/handlers/api/compute/server_handler.py
#	gns3server/version.py
2021-09-15 16:59:56 +09:30
grossmj
67661616cf Development on v2.2.26dev1 2021-09-14 21:13:04 +09:30
grossmj
6beab9433b Release v2.2.25 2021-09-14 19:20:10 +09:30
grossmj
e59e051961 Merge branch 'master' into 2.2 2021-09-14 18:42:39 +09:30
piotrpekala7
6b3f703f94 Release web UI 2.2.25 2021-09-14 10:35:10 +02:00
grossmj
d44a6756c1 Sync appliance files 2021-09-12 18:13:21 +09:30
grossmj
cdc4cf796b Bump version to 3.0.0dev3 2021-09-11 22:18:01 +09:30
Rolf Sommerhalder
6e88d4816f
REST API example needs additional parameter
While try this example with GNS3 branch 3.0 on Ubuntu 20.04 LTS, the API call 
```$ curl http://172.17.46.114:3080/v3/users/authenticate -d '{"username": "admin", "password": "admin"}' ```  fails with ```{"detail":[{"loc":["body"],"msg":"value is not a valid dict","type":"type_error.dict"}]}```.

The additional parameter appended to curl fixes this ```{"access_token":"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTYzMTI4NTc4NX0.kT1dAN4v1vHMTBJO2UaI2I7yAFhnSpBU9iqmdDuwtAQ","token_type":"bearer"} ```
Found after googling for the error above in 
FastAPI 0.65.2 POST request fails with "value is not a valid dict" when using the Requests library; 0.65.1 works (with a caveat) #3373
https://github.com/tiangolo/fastapi/issues/3373#issuecomment-886745123
2021-09-09 17:08:26 +02:00
grossmj
6d10d92af2 Fix images_path -> symbols_path 2021-09-09 16:58:42 +09:30
grossmj
a8aeb63c91 No need to find the mountpoint first for disk usage. 2021-09-09 16:58:02 +09:30
grossmj
986010446a Remove empty files after merge 2021-09-09 16:55:00 +09:30
grossmj
43ca53a089 Fix tests 2021-09-09 16:54:16 +09:30
grossmj
a324459152 Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/handlers/api/compute/server_handler.py
#	gns3server/utils/path.py
#	gns3server/version.py
#	requirements.txt
#	tests/compute/qemu/test_qemu_vm.py
#	tests/compute/test_manager.py
2021-09-09 16:36:17 +09:30
grossmj
6f1feed265 Fix issue preventing to use custom nested symbols. Fixes #1969 2021-09-08 15:13:51 +09:30
grossmj
5162ef2e22 Updated affinity symbols 2021-09-08 01:08:01 +09:30
grossmj
611570a863 Fix qemu-img rebase code to support Qemu 6.1. Ref https://github.com/GNS3/gns3-server/pull/1962 2021-09-05 22:18:46 +09:30
grossmj
99d7d0c769 Merge branch 'master' into 2.2
# Conflicts:
#	gns3server/compute/qemu/qemu_vm.py
2021-09-05 21:53:36 +09:30
grossmj
ed336da304 Qemu 6.1 support
Handle the deprecated use of backing file without explicit backing format issue.
2021-09-05 18:34:37 +09:30
Brian Candler
21e9f38437 Reinstate qemu-img rebase
This allows importing portable projects with images and/or snapshots,
regression introduced by #1927.

Fixes #1955
2021-09-04 12:34:22 +01:00
grossmj
f1ecb02160 Small db tables adjustments 2021-09-04 15:23:25 +09:30
grossmj
fdc3774fff Add index for "name" field in role table 2021-09-03 15:21:41 +09:30
grossmj
a55c9a5c6a Return disk usage for partition that contains the default project directory. Fixes #1947 2021-09-03 12:04:10 +09:30
Jeremy Grossmann
51c6f3fa31
Revert "List disk usage for all mount points" 2021-09-02 21:59:09 +09:30
grossmj
b1224ce9f6 Update schema description for disk_usage_percent. 2021-09-02 15:48:13 +09:30
grossmj
a2367d3c04 List disk usage for all mount points. 2021-09-02 15:43:38 +09:30
grossmj
d606553e20 Allow images to be stored in subdirs and used by templates. 2021-08-30 16:53:41 +09:30
grossmj
75bb06563a Fix tests 2021-08-30 13:04:24 +09:30
grossmj
afdda427d2 Merge branch 'master' into 3.0
# Conflicts:
#	.github/workflows/testing.yml
#	gns3server/compute/builtin/nodes/nat.py
#	gns3server/compute/qemu/__init__.py
#	gns3server/controller/link.py
#	gns3server/utils/asyncio/embed_shell.py
#	gns3server/utils/asyncio/raw_command_server.py
#	gns3server/utils/asyncio/telnet_server.py
#	gns3server/version.py
#	gns3server/web/web_server.py
2021-08-29 19:23:51 +09:30
grossmj
945e3e3e8e Development on 2.2.25dev1 2021-08-25 21:23:19 +09:30
grossmj
59a89c5f88 Release v2.2.24 2021-08-25 20:31:25 +09:30
grossmj
78c2ded2aa Merge branch 'master' into 2.2 2021-08-25 20:08:26 +09:30
piotrpekala7
6ba40bd5fb Release web UI 2.2.24 2021-08-25 11:57:52 +02:00
grossmj
6005e89181 Fix issue when searching for image with relative path. Fixes #1925 2021-08-25 17:23:21 +09:30
grossmj
27bcb60580 Sync appliance files. 2021-08-24 21:21:18 +09:30
grossmj
363fdb7d10 Fix wrong error when NAT interface is not allowed. Fixes #1943 2021-08-24 20:40:06 +09:30
grossmj
92150fba71 Fix incorrect Qemu binary selected when importing template. Fixes https://github.com/GNS3/gns3-gui/issues/3216 2021-08-24 17:26:06 +09:30
grossmj
c4c71cc838 Fix error when updating a link style. Fixes https://github.com/GNS3/gns3-gui/issues/2461 2021-08-24 11:35:33 +09:30
grossmj
332fa47b50 Option to prune images when deleting template. 2021-08-23 10:27:10 +09:30
grossmj
bf9a3aee20 Associate images when creating or updating a template. 2021-08-22 15:16:02 +09:30
grossmj
4d9e4e1059 Add prune images endpoint.
Use many-to-many relationship between images and templates.
2021-08-20 15:58:41 +09:30
grossmj
8f30b466e0 Merge remote-tracking branch 'origin/3.0' into 3.0 2021-08-19 14:48:29 +09:30
grossmj
07d4892faf Check if user has the right to add a permission 2021-08-19 14:47:48 +09:30
Jeremy Grossmann
1a5fb1abcc
Only use the necessary HTTP methods for default permissions 2021-08-17 23:47:32 +09:30
grossmj
4c6135fe88 Add /permissions/prune to delete orphaned permissions 2021-08-17 21:55:59 +09:30
grossmj
9df586d5d5 Check a permission matches an existing route before it is allowed to be created. 2021-08-17 16:14:15 +09:30
grossmj
8aada49414 Some fixes for early support for Python3.10
The loop parameter has been removed from most of asyncio‘s high-level API following deprecation in Python 3.8.
2021-08-15 15:25:33 +09:30
grossmj
496170b4e5 Early support for Python3.10 Fixes #1940 2021-08-15 15:09:48 +09:30
grossmj
75c934f30a Bump version to 3.0.0dev3 2021-08-12 16:05:19 +09:30
grossmj
cfaafedb09 Merge branch '3.0' into busybox-docker 2021-08-11 18:36:30 +09:30
grossmj
d0a9425392 Remove busybox and copy system busybox in setup.py 2021-08-11 17:27:47 +09:30
grossmj
078c42f185 Save image size + start to automatic template creation based on image checksum. 2021-08-11 16:58:23 +09:30
Jeremy Grossmann
f13b4e89b7
Merge branch '3.0' into image-management-refactoring 2021-08-10 05:46:22 -07:00
grossmj
ce55ec73a4 Fix exception with endpoints returning HTTP status code 204. Fixes #1891 2021-08-10 21:53:21 +09:30
grossmj
3ae7783360 Fix "-machine accel=tcg" check 2021-08-10 15:41:05 +09:30
grossmj
c5c95979c2 Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/compute/base_node.py
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/compute/qemu/utils/qcow2.py
#	gns3server/handlers/api/compute/qemu_handler.py
#	gns3server/handlers/api/controller/server_handler.py
#	gns3server/version.py
2021-08-10 15:38:49 +09:30
grossmj
6dd0f4d4d3 Allow logged in user to change some of its data. Administrators can lock users using the is_active field. 2021-08-09 16:36:18 +09:30
grossmj
8c0899d086 Development on 2.2.24dev1 2021-08-05 21:16:10 +09:30
grossmj
d5c73f4ba4 Release v2.2.23 2021-08-05 15:58:54 +09:30
grossmj
77487e4fc3 Merge branch 'master' into 2.2 2021-08-05 15:54:16 +09:30
grossmj
754f55b01b Sync appliance files. 2021-08-05 15:53:12 +09:30
Jeremy Grossmann
b68f7a78a7
Merge pull request #1927 from candlerb/candlerb/1921
Support cloning of encrypted qcow2 base image files
2021-08-04 23:19:23 -07:00
piotrpekala7
6c36beb97f Release web UI 2.2.23 2021-08-04 10:59:50 +02:00
grossmj
1a24ebfc19 Add a reload server endpoint. Fixes #1926 2021-08-01 16:20:30 +09:30
Jeremy Grossmann
6cf268ca93
Merge pull request #1934 from GNS3/handle_no-kvm_deprecated
Handle -no-kvm param deprecated in Qemu >= v5.2
2021-07-27 17:37:41 +09:30
grossmj
4646ce684f Handle -no-kvm param deprecated in Qemu >= v5.2 2021-07-27 16:34:51 +09:30
Andrej Krpič
3b7dc21ef0 Fix binary websocket access to the console
telnet_writer.write is not an async method - drain() is.
Remove async keyword so the call is the same as for the text websocket.
2021-07-26 12:58:35 +02:00
grossmj
0ecea8ffbb Change how to generate random MAC addresses 2021-07-25 16:03:54 +09:30
Brian Candler
1ee3e14bd3 Support cloning of encrypted qcow2 base image files
Fixes #1921
2021-07-09 10:53:02 +01:00
grossmj
1f0ceb6f74 Symbols endpoints (except upload) don't require authentication. 2021-06-16 20:22:49 +09:30
grossmj
c13f5c6627 Update to the udhcpc wrapper script. Ref #1890 2021-06-14 19:28:40 +09:30
grossmj
cdedd53339 Fix VMware VM support on Linux and Windows. Fixes #1919 2021-06-14 13:16:11 +09:30
grossmj
229a04e2fa Fix link style merge 2021-06-12 15:26:35 +09:30
Jeremy Grossmann
e78b5fa6d6
Fix typo 2021-06-12 15:20:55 +09:30
grossmj
6ec028ea4e Merge branch '2.2' into 3.0
# Conflicts:
#	gns3server/compute/builtin/nodes/cloud.py
#	gns3server/compute/vmware/vmware_vm.py
#	gns3server/controller/link.py
#	gns3server/controller/snapshot.py
#	gns3server/handlers/api/compute/dynamips_vm_handler.py
#	gns3server/handlers/api/compute/iou_handler.py
#	gns3server/handlers/api/compute/qemu_handler.py
#	gns3server/handlers/api/controller/link_handler.py
#	gns3server/schemas/link.py
#	gns3server/utils/path.py
#	gns3server/version.py
#	requirements.txt
2021-06-12 14:36:32 +09:30
grossmj
3524e22761 Development on 2.2.23dev1 2021-06-10 16:20:09 +09:30
grossmj
10daab21a3 Release v2.2.22 2021-06-10 15:41:58 +09:30
grossmj
22eb6f7d8c Sync appliance files. 2021-06-10 12:42:43 +09:30
grossmj
c892cf371b Fix VMware support on macOS BigSur 2021-06-08 11:56:33 +09:30
grossmj
bfd30f3547 Sync appliance files. 2021-06-07 15:01:45 +09:30
grossmj
4e34ab8e4f Link style support. Fixes https://github.com/GNS3/gns3-gui/issues/2461 2021-06-07 14:08:21 +09:30
grossmj
5da5cbd6d8 Merge branch 'master' into 2.2 2021-06-07 13:34:25 +09:30
grossmj
515bd50261 Start refactoring for images management 2021-06-06 16:52:47 +09:30
piotrpekala7
08f540f417 Release web UI 2.2.22 2021-06-05 10:32:12 +02:00
grossmj
f64b5cd9b6 Allow controller to be reloaded using the API. Fixes #1743 2021-06-04 17:01:07 +09:30
grossmj
6a726d0344 Fix formatting issue. 2021-06-03 19:32:00 +09:30
grossmj
9b0e3a77ed Use a stock BusyBox for the Docker Integration 2021-06-03 18:38:08 +09:30
grossmj
8be015cd86 Move "/{project_id}/templates/{template_id}" endpoint. 2021-06-03 18:18:34 +09:30
grossmj
6fb6a27859 Add last login info for users. 2021-06-03 16:57:16 +09:30
grossmj
4e33d29af8 Change RBAC field names from builtin to is_builtin 2021-06-03 16:24:38 +09:30
grossmj
d65b49acaa Add user permissions + RBAC tests. 2021-06-03 15:40:12 +09:30
grossmj
36a27c0c19 Force refresh of updated_at value for RBAC db models. 2021-06-01 16:12:06 +09:30
grossmj
a6d2f48df1 Merge remote-tracking branch 'origin/3.0' into rbac 2021-06-01 16:11:22 +09:30
grossmj
0113ca6673 Force refresh of updated_at value in db models. 2021-06-01 16:09:29 +09:30
grossmj
74d820fd0a Use synchronize_session="fetch" when updating values. 2021-06-01 15:55:50 +09:30
grossmj
e9b9884ee3 Merge remote-tracking branch 'origin/3.0' into rbac 2021-06-01 15:50:14 +09:30
grossmj
a6c2a3e47f Use synchronize_session="fetch" when updating values. 2021-06-01 13:02:03 +09:30
grossmj
2e2e31337a Add description for user permission. 2021-06-01 12:55:16 +09:30
grossmj
fbc47598d9 Basic functional RBAC support. 2021-05-27 17:28:44 +09:30
grossmj
6d4da98b8e Base API and tables for RBAC support. 2021-05-25 18:34:59 +09:30
Brian Candler
c051367d4b Preserve auto_start/auto_open/auto_close when restoring snapshot
Fixes #1904
2021-05-24 17:31:04 +01:00