NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-11-17 17:24:51 +02:00
Code Issues Packages Projects Releases Wiki Activity
5,529 Commits 6 Branches 202 Tags 85 MiB
0077fd98aa
Commit Graph

4197 Commits

Author SHA1 Message Date
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
grossmj
eb0f8c6174 Save/restore appliances Etag. 2021-05-17 00:37:15 +09:30
grossmj
f416d64042 Allow to set the initial super admin username / password in server config file. Ref #1857 2021-05-16 20:01:05 +09:30
grossmj
fffbb08a8e Catch SQLAlchemyError exception. 2021-05-16 18:37:17 +09:30
grossmj
d759564e20 Require authentication for get_user_memberships endpoint. 2021-05-16 17:06:23 +09:30
grossmj
971e86d254 Fix uBridge errors for cloud nodes not visible in logs. Fixes #1895 2021-05-16 14:59:02 +09:30
grossmj
6847e19847 Change method to prevent forbidden directory traversal. Fixes #1894 2021-05-16 14:44:38 +09:30
grossmj
2bf16f1e5f Change method to prevent forbidden directory traversal. Ref #1894 2021-05-16 14:29:56 +09:30
grossmj
f3d81fa450 Clean files and catch file path escape. Ref #1894 2021-05-15 22:35:44 +09:30
grossmj
09ac7fd7fb Merge branch '2.2' into 3.0 
# Conflicts:
#	gns3server/compute/base_manager.py
#	gns3server/handlers/api/compute/dynamips_vm_handler.py
#	gns3server/handlers/api/compute/iou_handler.py
#	gns3server/handlers/api/compute/project_handler.py
#	gns3server/handlers/api/compute/qemu_handler.py
#	gns3server/handlers/api/controller/node_handler.py
#	gns3server/handlers/api/controller/project_handler.py
#	gns3server/handlers/index_handler.py
#	tests/handlers/api/compute/test_project.py
#	tests/handlers/api/compute/test_qemu.py
#	tests/handlers/api/controller/test_node.py
#	tests/handlers/api/controller/test_project.py
 2021-05-15 20:46:34 +09:30
grossmj
e86d8f96ca Merge branch '2.2' into 3.0 
# Conflicts:
#	gns3server/version.py
 2021-05-15 20:12:21 +09:30
grossmj
9a6978902d Fix tests. 2021-05-15 19:43:36 +09:30
grossmj
6294ad9e76 Prevent directory traversal 2021-05-15 17:35:32 +09:30
grossmj
8810249d36 Add user groups support. 2021-05-15 15:10:02 +09:30
grossmj
2c938b2c19 Development on 2.2.22dev1 2021-05-10 23:44:40 +09:30
grossmj
03b7d9191b Release v2.2.21 2021-05-10 22:42:46 +09:30
grossmj
87c87ca3cb Sync appliance files. 2021-05-10 22:39:03 +09:30
grossmj
dfba40fee2 Merge branch 'master' into 2.2 2021-05-10 22:34:59 +09:30
grossmj
956b9056c1 Fix issues with latest version of sqlalchemy 2021-05-08 15:37:51 +09:30
grossmj
0a77f0035b Add delete cascade on foreign keys for appliance table 2021-05-06 17:25:32 +09:30
grossmj
10164e262d Enable SQL foreign key support for SQLite 2021-05-06 17:21:45 +09:30
grossmj
912fb2ed29 Fix add node from template. Fixes https://github.com/GNS3/gns3-web-ui/issues/1122 2021-05-06 16:22:16 +09:30
piotrpekala7
f576bedfaf Release web UI 2.2.21 2021-04-30 14:01:53 +02:00
grossmj
a795e0d7c1 Add missing CORS origins. 2021-04-28 21:20:05 +09:30
grossmj
41ba215e32 Show topology path when check topology schema fails. 2021-04-27 22:48:55 -07:00
grossmj
b1b3338e3c Fix bug when binding on address already in use. 2021-04-28 15:13:31 +09:30
grossmj
edb20482c7 Fix bug when no server config file is present. 2021-04-28 14:44:34 +09:30
grossmj
d3ace8ff17 Fix user delete endpoint. 2021-04-26 16:21:16 +09:30
grossmj
49be4146d6 Protect controlle notification endpoints. Ref #1888 
(WebSocket endpoint is not secured, it takes an optional token).
 2021-04-26 16:18:18 +09:30
grossmj
a02aede1b0 Use uuid5 to create new compute_id. Fixes #1641 #1887 2021-04-21 13:47:32 +09:30
grossmj
dff1ec9bc6 Fix /users/me endpoint. 2021-04-20 19:54:55 +09:30
grossmj
0465cb87f6 Protect the API and add alternative authentication endpoint. 2021-04-20 11:59:02 +09:30
grossmj
e28452f09a Secure users API and handle manual password recovery. 2021-04-19 09:40:04 +09:30
grossmj
c03226e368 Add default super admin account in controller db. 2021-04-18 17:39:47 +09:30
grossmj
9404c00411 Complete type annotations for API endpoints. 2021-04-18 15:40:38 +09:30
grossmj
cefab8d362 Rename __json__() to asdict() 2021-04-17 23:34:28 +09:30
grossmj
44074ff7c9 Some cleaning. 2021-04-17 18:36:32 +09:30
grossmj
bad3ef7003 Detect the app is exiting and avoid reconnecting to computes. 2021-04-17 18:33:20 +09:30
grossmj
9c850e0f2b Move schemas between compute and controller subpackages 2021-04-15 18:12:08 +09:30
grossmj
c59fc375f2 Remove traceng code. 2021-04-13 19:03:23 +09:30
grossmj
c021e21309 Use black with -l 120 param. 2021-04-13 18:46:50 +09:30
grossmj
f928738bd5 Use pyupgrade with --py36-plus param. 2021-04-13 18:37:58 +09:30
grossmj
a9eb035b7d Move error responses to API routers. 2021-04-13 16:19:56 +09:30
grossmj
6b0d0de1bc Wait for local compute to be started. 
Don't reconnect to local compute when server is being stopped.
 2021-04-13 15:41:59 +09:30
grossmj
71725aade6 Rename ssl and auth configuration file settings. 
Add enable SSL config validator.
Strict configuration file validation: any error will prevent the server to start.
Core server logic moved to a Server class.
 2021-04-12 23:26:42 +09:30
grossmj
1b5a5de4bc Generate new config for each test. Fixes tests. 2021-04-12 19:37:59 +09:30
grossmj
30ebae207f Use Pydantic to validate the server config file. 2021-04-12 17:02:23 +09:30
grossmj
fa4c9a91ca Add symbol dimensions endpoint and SSL support for packet capture with remote HTTPS server. 2021-04-10 13:01:23 +09:30
grossmj
802959f9ab Merge branch 'master' into 3.0 
# Conflicts:
#	dev-requirements.txt
#	gns3server/controller/__init__.py
#	gns3server/controller/appliance_manager.py
#	gns3server/controller/compute.py
#	gns3server/controller/topology.py
#	gns3server/handlers/api/compute/ethernet_switch_handler.py
#	gns3server/handlers/api/controller/link_handler.py
#	gns3server/handlers/api/controller/symbol_handler.py
#	gns3server/version.py
#	requirements.txt
#	tests/controller/test_export_project.py
#	tests/handlers/api/compute/test_qemu.py
#	tests/web/test_response.py
#	win-requirements.txt
 2021-04-10 12:46:40 +09:30
grossmj
4e61cc811e Improvements for get symbol dimensions endpoint. Ref #1885 2021-04-10 12:28:50 +09:30
Jeremy Grossmann
c9c6a5a762
Merge pull request #1885 from GNS3/Create-endpoint-in-symbols-handler-to-get-symbol-dimensions 
Create endpoint in symbols handler to get symbol dimensions #1884
 2021-04-09 04:59:57 -07:00
grossmj
e797ad1b9f Development on 2.2.21dev1 2021-04-09 13:50:20 +09:30
grossmj
a50141fcbf Release v2.2.20 2021-04-09 12:14:38 +09:30
grossmj
852151f836 Merge branch 'master' into 2.2 2021-04-09 12:06:01 +09:30
grossmj
e5807e5a8c Sync appliance files. 2021-04-09 12:04:20 +09:30
piotrpekala7
30cbfe2154 Update picture.py 2021-04-08 23:29:46 +02:00
piotrpekala7
4bbf7c2ed2 Update symbol_handler.py 2021-04-08 21:27:05 +02:00
piotrpekala7
7a8c1e8f5d Release web UI 2.2.20 2021-04-08 13:30:59 +02:00
grossmj
7bb5202bdb Sync appliance files. 2021-04-07 20:58:55 +09:30
grossmj
082206a7db Fix packet capture with HTTPS remote server. Fixes #1882 2021-04-07 12:40:15 +09:30
grossmj
360a819e91 Set PyQt5 version to 5.15.2 on Windows 2021-04-06 22:12:34 +09:30
grossmj
685963b85d Sync appliance files and remove old ones after sync with online repo. Fixes #1876 2021-04-06 17:38:11 +09:30
grossmj
e614ed79f4 Upgrade dependencies 2021-04-06 13:57:00 +09:30
grossmj
170e83e589 Fix tests and update requirements 2021-04-05 17:43:35 +09:30
grossmj
5217dbf3a3 Fix tests 2021-04-05 14:39:50 +09:30
grossmj
566e326b57 Save computes to database 2021-04-05 14:21:41 +09:30
grossmj
e607793e74 Generate a new list in template schema defaults. 2021-04-02 17:45:16 +10:30
grossmj
3b30d51972 Sync appliance files. 2021-04-02 17:43:38 +10:30
grossmj
91920e5a5b Fix issue with tests + some cleaning. 2021-03-31 09:58:52 +10:30
grossmj
0fea3f969e Use aiosqlite and add service for templates 2021-03-28 21:17:29 +10:30
grossmj
d730c591b3 Refactor template management to use database. 2021-03-28 11:15:08 +10:30
grossmj
6120736c91 Fix export for missing files 2021-03-24 13:16:00 +10:30
grossmj
055a78bade Fix issue when trying to export temporary Dynamips files. 2021-03-24 12:06:10 +10:30
grossmj
fad52ea2fc Development on 2.2.20dev1 2021-03-05 16:48:09 +10:30
grossmj
d8054c7cb4 Release v2.2.19 2021-03-05 14:51:03 +10:30
grossmj
91570f475f Launch projects marked for auto open after SIGHUP is received 2021-03-05 14:47:20 +10:30
grossmj
42cda3af2b Sync appliance files. 2021-03-05 14:46:20 +10:30
grossmj
e6be6bc958 Merge branch 'master' into 2.2 2021-03-02 17:18:24 +10:30
grossmj
b7f8fb283b Sync appliance files. 2021-03-02 17:09:28 +10:30
piotrpekala7
72d5b5e7cc Release web UI 2.2.19 2021-03-02 00:31:54 +01:00
grossmj
8cce0eedee Fix console type error when creating Ethernet switch node. Fixes #1873 2021-03-01 13:55:52 +10:30
grossmj
11c53c128e Sync Juniper vSRX appliance file. 2021-02-24 14:28:12 +10:30
grossmj
17b56ac7cb Sync appliance files. 2021-02-24 14:08:13 +10:30
grossmj
c17a86e814 Add missing async 2021-02-18 18:14:35 +10:30
grossmj
1add223891 Merge branch '2.2' into 3.0 
# Conflicts:
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/handlers/api/controller/server_handler.py
#	gns3server/schemas/project.py
#	gns3server/schemas/qemu.py
#	gns3server/schemas/qemu_template.py
#	gns3server/version.py
#	tests/handlers/api/compute/test_qemu.py
 2021-02-16 21:11:40 +10:30
grossmj
3c5bbe04dc Development on 2.2.19dev1 2021-02-16 20:44:58 +10:30
grossmj
c213cae500 Release v2.2.18 2021-02-16 19:09:46 +10:30
grossmj
1043be02a6 Merge branch 'master' into 2.2 
# Conflicts:
#	gns3server/compute/qemu/qemu_vm.py
 2021-02-16 19:02:12 +10:30
grossmj
56c25727b6 SIGHUP: remove projects with an empty project directory. 2021-02-16 17:00:59 +10:30
grossmj
0b854ffceb Bump version to 2.2.18dev2 2021-02-16 16:35:26 +10:30
piotrpekala7
366e904698 Release web UI 2.2.18 2021-02-15 23:55:14 +01:00
grossmj
16c84e23a9 Catch OSError exception in psutil. Fixes https://github.com/GNS3/gns3-gui/issues/3127 2021-02-15 15:57:24 +10:30
grossmj
64f172fe20 Expose 'auto_open' and 'auto_start' properties in API when creating project. Fixes https://github.com/GNS3/gns3-gui/issues/3119 2021-02-15 15:16:19 +10:30
grossmj
9de61cd671 Fix warning: 'ide-drive' is deprecated when using recent version of Qemu. Fixes https://github.com/GNS3/gns3-gui/issues/3101 2021-02-14 14:39:02 +10:30
grossmj
9e6ccc3f61 Fix bug when starting of vpcs stopped with "quit". Fixes https://github.com/GNS3/gns3-gui/issues/3110 2021-02-14 13:50:10 +10:30
grossmj
4c339eade1 Fix WinError 0 handling 2021-01-27 21:47:14 +10:30
grossmj
128e494134 Stop uBridge if VPCS node has been terminated. Ref https://github.com/GNS3/gns3-gui/issues/3110 2021-01-27 21:03:19 +10:30
Brent Baccala
235a127111 Allow cloned QEMU disk images to be resized before the node starts, 
by cloning the disk image in response to a resize request instead
of waiting until the node starts.
 2020-12-30 15:36:38 -05:00
grossmj
58c1b01439 Add default JWT secret key and fix tests. 2020-12-18 16:51:54 +10:30
grossmj
bde706d19a Generate JWT secret key if none is configured in the config file. 
Change location of the database.
 2020-12-16 18:24:21 +10:30
grossmj
6aefb5d32b Merge branch '2.2' into 3.0 
# Conflicts:
#	gns3server/compute/base_node.py
#	gns3server/version.py
#	gns3server/web/web_server.py
 2020-12-07 18:00:33 +10:30
grossmj
d47dcb0d6f User authentication with tests. 2020-12-07 16:52:36 +10:30
grossmj
87ede50827 Development on 2.2.18dev1 2020-12-04 18:10:11 +10:30
grossmj
24fe67f82b Release v2.2.17 2020-12-04 16:26:56 +10:30
grossmj
18c878429f Merge branch 'master' into 2.2 2020-12-04 16:22:04 +10:30
grossmj
6c3a070733 Close and remove projects deleted from disks after SIGHUP signal is received. 2020-12-04 16:17:28 +10:30
piotrpekala7
a157ef5a8a Release web UI 2.2.17 2020-12-04 02:59:13 +01:00
grossmj
5244ae6d4c New config file options to configure the VNC console port range. 2020-12-03 18:04:42 +10:30
grossmj
bf7cf862af Refactor tests and start work on database integration. 2020-12-02 18:39:08 +10:30
grossmj
ae55c0ec9c Fix tests. 2020-11-19 15:27:33 +10:30
grossmj
c043830e3f Move endpoints to routes & preparations to use a database. 2020-11-19 15:21:03 +10:30
Karthikeyan Singaravelan
603683e2c5 Use asyncio.all_tasks instead of deprecated method for Python 3.9 compatibility. 2020-11-17 06:30:47 +00:00
grossmj
95ea1fa636 Providing the path to create a project is now deprecated. 2020-11-13 15:17:54 +10:30
grossmj
acc5c7ebfa Update package versions. 
Do not use Path in schemas (causes issues with empty paths).
Change how notifications are handled.
Run tests with Python 3.9
 2020-11-11 17:18:41 +10:30
Bernhard Ehlers
e45bc5aec1 Fix mcopy error messages 2020-11-05 15:00:44 +01:00
grossmj
e13c84bada Fix tests 2020-11-05 18:47:59 +10:30
grossmj
841b013223 SSL support. 2020-11-05 18:24:50 +10:30
grossmj
a5d89b428a Merge branch '2.2' into 3.0 
# Conflicts:
#	gns3server/controller/__init__.py
#	gns3server/controller/compute.py
#	gns3server/schemas/gns3vm.py
#	gns3server/utils/application_id.py
#	gns3server/version.py
#	gns3server/web/web_server.py
 2020-11-05 17:15:25 +10:30
grossmj
a3ee1d9ee6 Development on 2.2.17dev1 2020-11-05 16:59:58 +10:30
grossmj
0e95e7e023 Release v2.2.16 2020-11-05 15:38:19 +10:30
grossmj
1748250179 Sync appliance files. 2020-11-05 15:30:21 +10:30
grossmj
c8ea22c651 Merge branch 'master' into 2.2 2020-11-05 15:05:05 +10:30
grossmj
d16cb5ef89 Option to allocate or not the vCPUs and RAM settings for the GNS3 VM. Fixes https://github.com/GNS3/gns3-gui/issues/3069 2020-11-05 11:13:57 +10:30
piotrpekala7
004acdc271 Release web UI 2.2.16 2020-11-04 12:51:25 +01:00
grossmj
e182f53d69 Fix wrong defaults for images_path, configs_path, appliances_path. Fixes #1829 2020-11-04 12:30:23 +10:30
grossmj
5a7b5e4e08 Make sure all HTTP exceptions return JSON with a "message" field instead of "detail" 2020-11-02 18:08:25 +10:30
grossmj
359f9a7384 Move to version 3 of the REST API. 
Rename packet capture endpoints.
 2020-11-02 12:05:32 +10:30
grossmj
eeaf10b418 Put all schemas in the same module. 2020-10-31 16:02:21 +10:30
grossmj
81439c750a Use pydantic for data validation (instead of jsonschema) 
Fix/improve various pydantic shema models.
 2020-10-31 15:07:12 +10:30
grossmj
b6a021dabd Fix SSL support for controller and local compute. Fixes #1826 2020-10-27 23:25:19 +10:30
grossmj
5dab0c2587 Prevent WIC to be added/removed while Dynamips router is running. Fixes https://github.com/GNS3/gns3-gui/issues/3082 2020-10-27 20:08:01 +10:30
grossmj
5d1fdceb98 Fix bug with application id allocation for IOU nodes. Fixes #3079 2020-10-27 19:41:24 +10:30
grossmj
b2fb2442c8 Change tag for index routes. 2020-10-24 17:00:43 +10:30
grossmj
d316ee33df Capitalize openapi tags. 2020-10-24 15:35:53 +10:30
grossmj
80d14a98fb Some cleaning in compute.py 2020-10-23 19:42:21 +10:30
grossmj
3185ebaa3d Publish API documentation generated by FastAPI. 2020-10-23 18:01:58 +10:30
grossmj
087bbd1a0b Fix tests. 2020-10-22 20:37:34 +10:30
grossmj
a08ddce033 Revert compute.py 2020-10-22 20:05:37 +10:30
grossmj
97a91f1899 Overwrite uvicorn loggers. 2020-10-22 19:56:53 +10:30
grossmj
13da8aa8f5 Do not automatically connect to local compute. 2020-10-22 16:47:11 +10:30
grossmj
a92c47b310 Add HTTP client to reuse the aiohttp session where needed. 
Remove unnecessary aiohttp exceptions.
 2020-10-22 16:19:44 +10:30
grossmj
36c8920cd1 Warn not to use the private compute API. Fixes #1593. 2020-10-20 16:27:00 +10:30
grossmj
25494ca098 Fix project import to work with FastAPI. 2020-10-19 22:39:30 +10:30
grossmj
b8e8e5cba7 Fix status code 204 must not have a response body. 2020-10-19 18:42:27 +10:30
grossmj
5d71ee25ee Fix syntax error. 2020-10-19 18:34:27 +10:30
grossmj
f20e16074f Fix Docker dev server script. 2020-10-19 18:28:01 +10:30
grossmj
be6d4771d0 Migrate PCAP streaming code to work with FastAPI. 2020-10-19 15:55:29 +10:30
grossmj
bd8565b2b9 Refactor WebSocket console code to work with FastAPI. 
Fix endpoint routes.
 2020-10-19 15:00:41 +10:30
Bernhard Ehlers
de2b9caeeb Use HDD disk image as startup QEMU config disk 2020-10-19 03:19:22 +02:00
grossmj
5341ccdbd6 Use dependencies and group common HTTP responses in endpoints. 2020-10-14 10:49:29 +10:30
grossmj
46f4e7ef6e Fix update property call for Qemu VMs. 2020-10-12 18:07:00 +10:30
grossmj
0746949207 Merge branch '2.2' into 3.0 
# Conflicts:
#	gns3server/compute/qemu/qemu_vm.py
#	gns3server/handlers/api/compute/qemu_handler.py
#	gns3server/handlers/api/controller/symbol_handler.py
#	gns3server/version.py
#	tests/compute/qemu/test_qemu_vm.py
#	tests/endpoints/compute/test_qemu_nodes.py
#	tests/endpoints/controller/test_nodes.py
 2020-10-12 18:04:49 +10:30
grossmj
362701f5aa Allow commas in image paths and VM name for Qemu VMs. Fixes https://github.com/GNS3/gns3-gui/issues/3065 2020-10-11 14:02:22 +10:30
grossmj
91244456f5 Handle comma in disk path for Qemu VMs. Fixes https://github.com/GNS3/gns3-gui/issues/3065 2020-10-08 22:09:03 +10:30
grossmj
88ab528977 Development on 2.2.16dev1 2020-10-07 16:30:03 +10:30
grossmj
7d031e71a0 Release v2.2.15 2020-10-07 15:29:52 +10:30
grossmj
c46c095fcb Sync appliance files. 2020-10-07 15:24:15 +10:30
grossmj
e592b95639 Revert "Add info log to show where custom symbols are searched from." 
This reverts commit 593e3795
 2020-10-07 15:20:28 +10:30
grossmj
593e379523 Add info log to show where custom symbols are searched from. 2020-10-07 15:19:09 +10:30
grossmj
d451d3125e Fix symbol retrieval issue. Ref #1824 2020-10-07 11:48:11 +10:30
grossmj
c248764efb Fixes update() missing 2 required positional arguments: 'name' and 'value'. Fixes #1821 #1825 2020-10-06 17:08:51 +10:30
grossmj
0259696872 Fix Hyper-V based GNS3 VM WMI issue. Fixes #1822 2020-10-06 16:42:50 +10:30
grossmj
165ba4d8d5 Merge branch 'master' into 2.2 2020-10-06 12:30:08 +10:30
piotrpekala7
8049ab8b64 Release 2020.4.0-beta.1 2020-10-05 15:42:19 +02:00
grossmj
eb3cb8a41f Migration to FastAPI 2020-10-02 16:07:50 +09:30
grossmj
2857cab94e Development on 2.2.15dev1 2020-09-15 06:49:11 +09:30
grossmj
326841cd9e Release v2.2.14 2020-09-15 05:52:47 +09:30
grossmj
dacc5ef9cd Merge branch 'master' into 2.2 2020-09-15 05:28:00 +09:30
piotrpekala7
dd1e4f655e Release 2020.3.0-beta.4 2020-09-14 18:35:17 +02:00
grossmj
399f1c082e Add '-smp sockets=1' by default for Qemu VMs. Ref https://github.com/GNS3/gns3-gui/issues/3047 2020-09-13 23:16:52 +09:30
grossmj
919abdc052 Sync appliance files. 2020-09-12 23:08:38 +09:30
grossmj
992cd7fc6c Implement full restart if user reload a Qemu VM which has been updated. Fixes https://github.com/GNS3/gns3-gui/issues/3038 2020-09-12 23:07:39 +09:30
grossmj
90ecefd455 Development on 2.2.14dev1 2020-09-05 04:26:16 +09:30
grossmj
b4c7823696 Release v2.2.13 2020-09-04 23:13:28 +09:30
grossmj
ffde704251 Merge branch 'master' into 2.2 2020-09-04 23:10:09 +09:30
piotrpekala7
8c00cd0a84 Release 2020.3.0-beta.3 2020-09-04 12:54:48 +02:00
grossmj
2bf625e000 Fix issue when resuming Qemu VM. Fixes https://github.com/GNS3/gns3-gui/issues/3027 2020-09-04 18:02:21 +09:30
grossmj
5305117a75 Sync appliance files. 2020-09-04 01:59:45 +09:30
grossmj
4843084158 Prioritize the config disk over HD-D for Qemu VMs. 
Fixes https://github.com/GNS3/gns3-gui/issues/3036

(cherry picked from commit c12b675691)
 2020-08-18 10:54:11 +09:30
grossmj
c12b675691 Prioritize the config disk over HD-D for Qemu VMs. 
Fixes https://github.com/GNS3/gns3-gui/issues/3036
 2020-08-18 10:54:11 +09:30
Jeremy Grossmann
01db2d2a86 Create config disk property false by default for Qemu templates 
Ref https://github.com/GNS3/gns3-gui/issues/3035

(cherry picked from commit a2e884e315)
 2020-08-17 12:45:57 +09:30
Jeremy Grossmann
a2e884e315
Create config disk property false by default for Qemu templates 
Ref https://github.com/GNS3/gns3-gui/issues/3035
 2020-08-17 12:45:57 +09:30
Jeremy Grossmann
fa26555d00
Merge pull request #1801 from GNS3/qemu-config-disk 
QEMU config disk - enable QEMU config import/export
 2020-08-15 16:35:20 +08:00
grossmj
f2ddef855f Fix tests. 
(cherry picked from commit 620d93634e)
 2020-08-15 16:35:31 +09:30
grossmj
620d93634e Fix tests. 2020-08-15 16:35:31 +09:30
grossmj
ec02150fd2 Set default disk interface type to "none". 
Fail-safe: use "ide" if an image is set but no interface type is configured.
Use the HDA disk interface type if none has been configured for HDD.

(cherry picked from commit 464fd804ce)
 2020-08-15 16:14:16 +09:30
grossmj
464fd804ce Set default disk interface type to "none". 
Fail-safe: use "ide" if an image is set but no interface type is configured.
Use the HDA disk interface type if none has been configured for HDD.
 2020-08-15 16:14:16 +09:30
grossmj
a56b816c1a Add explicit option to automatically create or not the config disk. Off by default. 
(cherry picked from commit 56aba96a5f)
 2020-08-14 17:57:24 +09:30
grossmj
56aba96a5f Add explicit option to automatically create or not the config disk. Off by default. 2020-08-14 17:57:24 +09:30
grossmj
c684c554bf Fix tests 
(cherry picked from commit 2ba6eac113)
 2020-08-13 17:10:31 +09:30
grossmj
2ba6eac113 Fix tests 2020-08-13 17:10:31 +09:30