Compare commits
	
		
			22 Commits
		
	
	
		
			20240407
			...
			3d4750de21
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 3d4750de21 | |||
| 6a7af7e6c4 | |||
| a8171375a8 | |||
| de33c7d521 | |||
| ff372800bd | |||
| aac05b7faf | |||
| 61e5a42ef7 | |||
| 19f2f6d730 | |||
| dce17062a3 | |||
| dcb0743cbe | |||
| 644fd6f1bb | |||
| 94ee8f8c78 | |||
| 53a8963fc4 | |||
| 56ab7065ac | |||
| 1e8394b3c4 | |||
| 01f26c1a79 | |||
| 8c27010396 | |||
| 35e7f4b59c | |||
| d08516a72d | |||
| 479cc1fa0f | |||
| 3c636406af | |||
| 578f1432a0 | 
| @@ -11,7 +11,7 @@ steps: | |||||||
|       path: /tmp/web_build |       path: /tmp/web_build | ||||||
|   commands: |   commands: | ||||||
|   - cd virtweb_frontend |   - cd virtweb_frontend | ||||||
|   - npm install --legacy-peer-deps # TODO : remove when mui-file-input is updated |   - npm install | ||||||
|   - npm run lint |   - npm run lint | ||||||
|   - npm run build |   - npm run build | ||||||
|   - mv dist /tmp/web_build |   - mv dist /tmp/web_build | ||||||
|   | |||||||
							
								
								
									
										573
									
								
								virtweb_backend/Cargo.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										573
									
								
								virtweb_backend/Cargo.lock
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -7,12 +7,12 @@ edition = "2024" | |||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| log = "0.4.27" | log = "0.4.27" | ||||||
| env_logger = "0.11.7" | env_logger = "0.11.8" | ||||||
| clap = { version = "4.5.34", features = ["derive", "env"] } | clap = { version = "4.5.38", features = ["derive", "env"] } | ||||||
| light-openid = { version = "1.0.4", features = ["crypto-wrapper"] } | light-openid = { version = "1.0.4", features = ["crypto-wrapper"] } | ||||||
| lazy_static = "1.5.0" | lazy_static = "1.5.0" | ||||||
| actix = "0.13.5" | actix = "0.13.5" | ||||||
| actix-web = "4.10.2" | actix-web = "4.11.0" | ||||||
| actix-remote-ip = "0.1.0" | actix-remote-ip = "0.1.0" | ||||||
| actix-session = { version = "0.10.1", features = ["cookie-session"] } | actix-session = { version = "0.10.1", features = ["cookie-session"] } | ||||||
| actix-identity = "0.8.0" | actix-identity = "0.8.0" | ||||||
| @@ -22,27 +22,25 @@ actix-ws = "0.3.0" | |||||||
| actix-http = "3.10.0" | actix-http = "3.10.0" | ||||||
| serde = { version = "1.0.219", features = ["derive"] } | serde = { version = "1.0.219", features = ["derive"] } | ||||||
| serde_json = "1.0.140" | serde_json = "1.0.140" | ||||||
| quick-xml = { version = "0.37.3", features = ["serialize", "overlapped-lists"] } | quick-xml = { version = "0.37.5", features = ["serialize", "overlapped-lists"] } | ||||||
| futures-util = "0.3.31" | futures-util = "0.3.31" | ||||||
| anyhow = "1.0.97" | anyhow = "1.0.98" | ||||||
| actix-multipart = "0.7.2" | actix-multipart = "0.7.2" | ||||||
| tempfile = "3.19.1" | tempfile = "3.20.0" | ||||||
| reqwest = { version = "0.12.15", features = ["stream"] } | reqwest = { version = "0.12.15", features = ["stream"] } | ||||||
| url = "2.5.4" | url = "2.5.4" | ||||||
| virt = "0.4.2" | virt = "0.4.2" | ||||||
| sysinfo = { version = "0.34.2", features = ["serde"] } | sysinfo = { version = "0.35.1", features = ["serde"] } | ||||||
| uuid = { version = "1.16.0", features = ["v4", "serde"] } | uuid = { version = "1.16.0", features = ["v4", "serde"] } | ||||||
| lazy-regex = "3.4.1" | lazy-regex = "3.4.1" | ||||||
| thiserror = "2.0.12" | thiserror = "2.0.12" | ||||||
| image = "0.25.6" | image = "0.25.6" | ||||||
| rand = "0.9.0" | rand = "0.9.1" | ||||||
| bytes = "1.10.1" | tokio = { version = "1.45.1", features = ["rt", "time", "macros"] } | ||||||
| tokio = { version = "1.44.1", features = ["rt", "time", "macros"] } |  | ||||||
| futures = "0.3.31" | futures = "0.3.31" | ||||||
| ipnetwork = { version = "0.21.1", features = ["serde"] } | ipnetwork = { version = "0.21.1", features = ["serde"] } | ||||||
| num = "0.4.3" | num = "0.4.3" | ||||||
| rust-embed = { version = "8.6.0" } | rust-embed = { version = "8.7.2", features = ["mime-guess"] } | ||||||
| mime_guess = "2.0.5" |  | ||||||
| dotenvy = "0.15.7" | dotenvy = "0.15.7" | ||||||
| nix = { version = "0.29.0", features = ["net"] } | nix = { version = "0.30.1", features = ["net"] } | ||||||
| basic-jwt = "0.3.0" | basic-jwt = "0.3.0" | ||||||
|   | |||||||
							
								
								
									
										86
									
								
								virtweb_backend/assets/img/debian.svg
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										86
									
								
								virtweb_backend/assets/img/debian.svg
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,86 @@ | |||||||
|  | <?xml version="1.0" encoding="utf-8"?> | ||||||
|  | <!-- Generator: Adobe Illustrator 10.0, SVG Export Plug-In . SVG Version: 3.0.0 Build 77)  --> | ||||||
|  | <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN"    "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd" [ | ||||||
|  | 	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/"> | ||||||
|  | 	<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/"> | ||||||
|  | 	<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/"> | ||||||
|  | 	<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/"> | ||||||
|  | 	<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/"> | ||||||
|  | 	<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/"> | ||||||
|  | 	<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/"> | ||||||
|  | 	<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/"> | ||||||
|  | 	<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/"> | ||||||
|  | 	<!ENTITY ns_svg "http://www.w3.org/2000/svg"> | ||||||
|  | 	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink"> | ||||||
|  | ]> | ||||||
|  | <svg  | ||||||
|  | 	 xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;" i:viewOrigin="262 450" i:rulerOrigin="0 0" i:pageBounds="0 792 612 0" | ||||||
|  | 	 xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" | ||||||
|  | 	 width="87.041" height="108.445" viewBox="0 0 87.041 108.445" overflow="visible" enable-background="new 0 0 87.041 108.445" | ||||||
|  | 	 xml:space="preserve"> | ||||||
|  | 	<metadata> | ||||||
|  | 		<variableSets  xmlns="&ns_vars;"> | ||||||
|  | 			<variableSet  varSetName="binding1" locked="none"> | ||||||
|  | 				<variables></variables> | ||||||
|  | 				<v:sampleDataSets  xmlns="&ns_custom;" xmlns:v="&ns_vars;"></v:sampleDataSets> | ||||||
|  | 			</variableSet> | ||||||
|  | 		</variableSets> | ||||||
|  | 		<sfw  xmlns="&ns_sfw;"> | ||||||
|  | 			<slices></slices> | ||||||
|  | 			<sliceSourceBounds  y="341.555" x="262" width="87.041" height="108.445" bottomLeftOrigin="true"></sliceSourceBounds> | ||||||
|  | 		</sfw> | ||||||
|  | 	</metadata> | ||||||
|  | 	<g id="Layer_1" i:layer="yes" i:dimmedPercent="50" i:rgbTrio="#4F008000FFFF"> | ||||||
|  | 		<g> | ||||||
|  | 			<path i:knockout="Off" fill="#A80030" d="M51.986,57.297c-1.797,0.025,0.34,0.926,2.686,1.287 | ||||||
|  | 				c0.648-0.506,1.236-1.018,1.76-1.516C54.971,57.426,53.484,57.434,51.986,57.297"/> | ||||||
|  | 			<path i:knockout="Off" fill="#A80030" d="M61.631,54.893c1.07-1.477,1.85-3.094,2.125-4.766c-0.24,1.192-0.887,2.221-1.496,3.307 | ||||||
|  | 				c-3.359,2.115-0.316-1.256-0.002-2.537C58.646,55.443,61.762,53.623,61.631,54.893"/> | ||||||
|  | 			<path i:knockout="Off" fill="#A80030" d="M65.191,45.629c0.217-3.236-0.637-2.213-0.924-0.978 | ||||||
|  | 				C64.602,44.825,64.867,46.932,65.191,45.629"/> | ||||||
|  | 			<path i:knockout="Off" fill="#A80030" d="M45.172,1.399c0.959,0.172,2.072,0.304,1.916,0.533 | ||||||
|  | 				C48.137,1.702,48.375,1.49,45.172,1.399"/> | ||||||
|  | 			<path i:knockout="Off" fill="#A80030" d="M47.088,1.932l-0.678,0.14l0.631-0.056L47.088,1.932"/> | ||||||
|  | 			<path i:knockout="Off" fill="#A80030" d="M76.992,46.856c0.107,2.906-0.85,4.316-1.713,6.812l-1.553,0.776 | ||||||
|  | 				c-1.271,2.468,0.123,1.567-0.787,3.53c-1.984,1.764-6.021,5.52-7.313,5.863c-0.943-0.021,0.639-1.113,0.846-1.541 | ||||||
|  | 				c-2.656,1.824-2.131,2.738-6.193,3.846l-0.119-0.264c-10.018,4.713-23.934-4.627-23.751-17.371 | ||||||
|  | 				c-0.107,0.809-0.304,0.607-0.526,0.934c-0.517-6.557,3.028-13.143,9.007-15.832c5.848-2.895,12.704-1.707,16.893,2.197 | ||||||
|  | 				c-2.301-3.014-6.881-6.209-12.309-5.91c-5.317,0.084-10.291,3.463-11.951,7.131c-2.724,1.715-3.04,6.611-4.227,7.507 | ||||||
|  | 				C31.699,56.271,36.3,61.342,44.083,67.307c1.225,0.826,0.345,0.951,0.511,1.58c-2.586-1.211-4.954-3.039-6.901-5.277 | ||||||
|  | 				c1.033,1.512,2.148,2.982,3.589,4.137c-2.438-0.826-5.695-5.908-6.646-6.115c4.203,7.525,17.052,13.197,23.78,10.383 | ||||||
|  | 				c-3.113,0.115-7.068,0.064-10.566-1.229c-1.469-0.756-3.467-2.322-3.11-2.615c9.182,3.43,18.667,2.598,26.612-3.771 | ||||||
|  | 				c2.021-1.574,4.229-4.252,4.867-4.289c-0.961,1.445,0.164,0.695-0.574,1.971c2.014-3.248-0.875-1.322,2.082-5.609l1.092,1.504 | ||||||
|  | 				c-0.406-2.696,3.348-5.97,2.967-10.234c0.861-1.304,0.961,1.403,0.047,4.403c1.268-3.328,0.334-3.863,0.66-6.609 | ||||||
|  | 				c0.352,0.923,0.814,1.904,1.051,2.878c-0.826-3.216,0.848-5.416,1.262-7.285c-0.408-0.181-1.275,1.422-1.473-2.377 | ||||||
|  | 				c0.029-1.65,0.459-0.865,0.625-1.271c-0.324-0.186-1.174-1.451-1.691-3.877c0.375-0.57,1.002,1.478,1.512,1.562 | ||||||
|  | 				c-0.328-1.929-0.893-3.4-0.916-4.88c-1.49-3.114-0.527,0.415-1.736-1.337c-1.586-4.947,1.316-1.148,1.512-3.396 | ||||||
|  | 				c2.404,3.483,3.775,8.881,4.404,11.117c-0.48-2.726-1.256-5.367-2.203-7.922c0.73,0.307-1.176-5.609,0.949-1.691 | ||||||
|  | 				c-2.27-8.352-9.715-16.156-16.564-19.818c0.838,0.767,1.896,1.73,1.516,1.881c-3.406-2.028-2.807-2.186-3.295-3.043 | ||||||
|  | 				c-2.775-1.129-2.957,0.091-4.795,0.002c-5.23-2.774-6.238-2.479-11.051-4.217l0.219,1.023c-3.465-1.154-4.037,0.438-7.782,0.004 | ||||||
|  | 				c-0.228-0.178,1.2-0.644,2.375-0.815c-3.35,0.442-3.193-0.66-6.471,0.122c0.808-0.567,1.662-0.942,2.524-1.424 | ||||||
|  | 				c-2.732,0.166-6.522,1.59-5.352,0.295c-4.456,1.988-12.37,4.779-16.811,8.943l-0.14-0.933c-2.035,2.443-8.874,7.296-9.419,10.46 | ||||||
|  | 				l-0.544,0.127c-1.059,1.793-1.744,3.825-2.584,5.67c-1.385,2.36-2.03,0.908-1.833,1.278c-2.724,5.523-4.077,10.164-5.246,13.97 | ||||||
|  | 				c0.833,1.245,0.02,7.495,0.335,12.497c-1.368,24.704,17.338,48.69,37.785,54.228c2.997,1.072,7.454,1.031,11.245,1.141 | ||||||
|  | 				c-4.473-1.279-5.051-0.678-9.408-2.197c-3.143-1.48-3.832-3.17-6.058-5.102l0.881,1.557c-4.366-1.545-2.539-1.912-6.091-3.037 | ||||||
|  | 				l0.941-1.229c-1.415-0.107-3.748-2.385-4.386-3.646l-1.548,0.061c-1.86-2.295-2.851-3.949-2.779-5.23l-0.5,0.891 | ||||||
|  | 				c-0.567-0.973-6.843-8.607-3.587-6.83c-0.605-0.553-1.409-0.9-2.281-2.484l0.663-0.758c-1.567-2.016-2.884-4.6-2.784-5.461 | ||||||
|  | 				c0.836,1.129,1.416,1.34,1.99,1.533c-3.957-9.818-4.179-0.541-7.176-9.994l0.634-0.051c-0.486-0.732-0.781-1.527-1.172-2.307 | ||||||
|  | 				l0.276-2.75C4.667,58.121,6.719,47.409,7.13,41.534c0.285-2.389,2.378-4.932,3.97-8.92l-0.97-0.167 | ||||||
|  | 				c1.854-3.234,10.586-12.988,14.63-12.486c1.959-2.461-0.389-0.009-0.772-0.629c4.303-4.453,5.656-3.146,8.56-3.947 | ||||||
|  | 				c3.132-1.859-2.688,0.725-1.203-0.709c5.414-1.383,3.837-3.144,10.9-3.846c0.745,0.424-1.729,0.655-2.35,1.205 | ||||||
|  | 				c4.511-2.207,14.275-1.705,20.617,1.225c7.359,3.439,15.627,13.605,15.953,23.17l0.371,0.1 | ||||||
|  | 				c-0.188,3.802,0.582,8.199-0.752,12.238L76.992,46.856"/> | ||||||
|  | 			<path i:knockout="Off" fill="#A80030" d="M32.372,59.764l-0.252,1.26c1.181,1.604,2.118,3.342,3.626,4.596 | ||||||
|  | 				C34.661,63.502,33.855,62.627,32.372,59.764"/> | ||||||
|  | 			<path i:knockout="Off" fill="#A80030" d="M35.164,59.654c-0.625-0.691-0.995-1.523-1.409-2.352 | ||||||
|  | 				c0.396,1.457,1.207,2.709,1.962,3.982L35.164,59.654"/> | ||||||
|  | 			<path i:knockout="Off" fill="#A80030" d="M84.568,48.916l-0.264,0.662c-0.484,3.438-1.529,6.84-3.131,9.994 | ||||||
|  | 				C82.943,56.244,84.088,52.604,84.568,48.916"/> | ||||||
|  | 			<path i:knockout="Off" fill="#A80030" d="M45.527,0.537C46.742,0.092,48.514,0.293,49.803,0c-1.68,0.141-3.352,0.225-5.003,0.438 | ||||||
|  | 				L45.527,0.537"/> | ||||||
|  | 			<path i:knockout="Off" fill="#A80030" d="M2.872,23.219c0.28,2.592-1.95,3.598,0.494,1.889 | ||||||
|  | 				C4.676,22.157,2.854,24.293,2.872,23.219"/> | ||||||
|  | 			<path i:knockout="Off" fill="#A80030" d="M0,35.215c0.563-1.728,0.665-2.766,0.88-3.766C-0.676,33.438,0.164,33.862,0,35.215"/> | ||||||
|  | 		</g> | ||||||
|  | 	</g> | ||||||
|  | </svg> | ||||||
| After Width: | Height: | Size: 6.7 KiB | 
							
								
								
									
										
											BIN
										
									
								
								virtweb_backend/assets/img/kvm.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								virtweb_backend/assets/img/kvm.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 194 KiB | 
							
								
								
									
										8
									
								
								virtweb_backend/assets/img/ubuntu.svg
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								virtweb_backend/assets/img/ubuntu.svg
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,8 @@ | |||||||
|  | <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 100 100"> | ||||||
|  | <circle fill="#f47421" cy="50" cx="50" r="45"/> | ||||||
|  | <circle fill="none" stroke="#ffffff" stroke-width="8.55" cx="50" cy="50" r="21.825"/> | ||||||
|  | <g id="friend"><circle fill="#f47421" cx="19.4" cy="50" r="8.4376"/> | ||||||
|  | <path stroke="#f47421" stroke-width="3.2378" d="M67,50H77"/> | ||||||
|  | <circle fill="#ffffff" cx="19.4" cy="50" r="6.00745"/></g> | ||||||
|  | <use xlink:href="#friend" transform="rotate(120,50,50)"/> | ||||||
|  | <use xlink:href="#friend" transform="rotate(240,50,50)"/></svg> | ||||||
| After Width: | Height: | Size: 550 B | 
							
								
								
									
										1
									
								
								virtweb_backend/assets/img/windows.svg
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								virtweb_backend/assets/img/windows.svg
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | |||||||
|  | <svg xmlns="http://www.w3.org/2000/svg" height="88" width="88" xmlns:v="https://vecta.io/nano"><path d="M0 12.402l35.687-4.86.016 34.423-35.67.203zm35.67 33.529l.028 34.453L.028 75.48.026 45.7zm4.326-39.025L87.314 0v41.527l-47.318.376zm47.329 39.349l-.011 41.34-47.318-6.678-.066-34.739z" fill="#00adef"/></svg> | ||||||
| After Width: | Height: | Size: 311 B | 
							
								
								
									
										47
									
								
								virtweb_backend/assets/iso_catalog.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										47
									
								
								virtweb_backend/assets/iso_catalog.json
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,47 @@ | |||||||
|  | [ | ||||||
|  |   { | ||||||
|  |     "name": "Ubuntu releases", | ||||||
|  |     "url": "https://releases.ubuntu.com", | ||||||
|  |     "image": "/assets/img/ubuntu.svg" | ||||||
|  |   }, | ||||||
|  |   { | ||||||
|  |     "name": "Old ubuntu releases", | ||||||
|  |     "url": "https://old-releases.ubuntu.com/releases/", | ||||||
|  |     "image": "/assets/img/ubuntu.svg" | ||||||
|  |   }, | ||||||
|  |   { | ||||||
|  |     "name": "Current Debian releases (amd64)", | ||||||
|  |     "url": "https://cdimage.debian.org/mirror/cdimage/release/current/amd64/iso-dvd/", | ||||||
|  |     "image": "/assets/img/debian.svg" | ||||||
|  |   }, | ||||||
|  |   { | ||||||
|  |     "name": "Old Debian releases", | ||||||
|  |     "url": "https://cdimage.debian.org/mirror/cdimage/archive/", | ||||||
|  |     "image": "/assets/img/debian.svg" | ||||||
|  |   }, | ||||||
|  |   { | ||||||
|  |     "name": "Latest stable Virtio driver", | ||||||
|  |     "url": "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win.iso", | ||||||
|  |     "image": "/assets/img/kvm.png" | ||||||
|  |   }, | ||||||
|  |   { | ||||||
|  |     "name": "Windows server 2025", | ||||||
|  |     "url": "https://www.microsoft.com/en-us/evalcenter/download-windows-server-2025", | ||||||
|  |     "image": "/assets/img/windows.svg" | ||||||
|  |   }, | ||||||
|  |   { | ||||||
|  |     "name": "Windows server 2022", | ||||||
|  |     "url": "https://www.microsoft.com/en-us/evalcenter/download-windows-server-2022", | ||||||
|  |     "image": "/assets/img/windows.svg" | ||||||
|  |   }, | ||||||
|  |   { | ||||||
|  |     "name": "Windows 11", | ||||||
|  |     "url": "https://www.microsoft.com/en-us/software-download/windows11", | ||||||
|  |     "image": "/assets/img/windows.svg" | ||||||
|  |   }, | ||||||
|  |   { | ||||||
|  |     "name": "Windows 11 Iot Enterprise LTSC 2024", | ||||||
|  |     "url": "https://www.microsoft.com/en-us/evalcenter/download-windows-11-iot-enterprise-ltsc-eval", | ||||||
|  |     "image": "/assets/img/windows.svg" | ||||||
|  |   } | ||||||
|  | ] | ||||||
| @@ -17,10 +17,11 @@ pub const ROUTES_WITHOUT_AUTH: [&str; 5] = [ | |||||||
| ]; | ]; | ||||||
|  |  | ||||||
| /// Allowed ISO mimetypes | /// Allowed ISO mimetypes | ||||||
| pub const ALLOWED_ISO_MIME_TYPES: [&str; 3] = [ | pub const ALLOWED_ISO_MIME_TYPES: [&str; 4] = [ | ||||||
|     "application/x-cd-image", |     "application/x-cd-image", | ||||||
|     "application/x-iso9660-image", |     "application/x-iso9660-image", | ||||||
|     "application/octet-stream", |     "application/octet-stream", | ||||||
|  |     "application/vnd.efi.iso", | ||||||
| ]; | ]; | ||||||
|  |  | ||||||
| /// ISO max size | /// ISO max size | ||||||
| @@ -107,3 +108,9 @@ pub const API_TOKEN_DESCRIPTION_MAX_LENGTH: usize = 30; | |||||||
|  |  | ||||||
| /// API token right path max length | /// API token right path max length | ||||||
| pub const API_TOKEN_RIGHT_PATH_MAX_LENGTH: usize = 255; | pub const API_TOKEN_RIGHT_PATH_MAX_LENGTH: usize = 255; | ||||||
|  |  | ||||||
|  | /// Qemu image program path | ||||||
|  | pub const QEMU_IMAGE_PROGRAM: &str = "/usr/bin/qemu-img"; | ||||||
|  |  | ||||||
|  | /// IP program path | ||||||
|  | pub const IP_PROGRAM: &str = "/usr/sbin/ip"; | ||||||
|   | |||||||
| @@ -4,7 +4,6 @@ use actix_web::body::BoxBody; | |||||||
| use actix_web::{HttpResponse, web}; | use actix_web::{HttpResponse, web}; | ||||||
| use std::error::Error; | use std::error::Error; | ||||||
| use std::fmt::{Display, Formatter}; | use std::fmt::{Display, Formatter}; | ||||||
| use std::io::ErrorKind; |  | ||||||
|  |  | ||||||
| pub mod api_tokens_controller; | pub mod api_tokens_controller; | ||||||
| pub mod auth_controller; | pub mod auth_controller; | ||||||
| @@ -62,7 +61,7 @@ impl From<serde_json::Error> for HttpErr { | |||||||
|  |  | ||||||
| impl From<Box<dyn Error>> for HttpErr { | impl From<Box<dyn Error>> for HttpErr { | ||||||
|     fn from(value: Box<dyn Error>) -> Self { |     fn from(value: Box<dyn Error>) -> Self { | ||||||
|         HttpErr::Err(std::io::Error::new(ErrorKind::Other, value.to_string()).into()) |         HttpErr::Err(std::io::Error::other(value.to_string()).into()) | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
| @@ -98,7 +97,7 @@ impl From<reqwest::header::ToStrError> for HttpErr { | |||||||
|  |  | ||||||
| impl From<actix_web::Error> for HttpErr { | impl From<actix_web::Error> for HttpErr { | ||||||
|     fn from(value: actix_web::Error) -> Self { |     fn from(value: actix_web::Error) -> Self { | ||||||
|         HttpErr::Err(std::io::Error::new(ErrorKind::Other, value.to_string()).into()) |         HttpErr::Err(std::io::Error::other(value.to_string()).into()) | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -188,3 +188,7 @@ pub async fn number_vcpus() -> HttpResult { | |||||||
| pub async fn networks_list() -> HttpResult { | pub async fn networks_list() -> HttpResult { | ||||||
|     Ok(HttpResponse::Ok().json(net_utils::net_list())) |     Ok(HttpResponse::Ok().json(net_utils::net_list())) | ||||||
| } | } | ||||||
|  |  | ||||||
|  | pub async fn bridges_list() -> HttpResult { | ||||||
|  |     Ok(HttpResponse::Ok().json(net_utils::bridges_list()?)) | ||||||
|  | } | ||||||
|   | |||||||
| @@ -3,6 +3,27 @@ pub use serve_static_debug::{root_index, serve_static_content}; | |||||||
| #[cfg(not(debug_assertions))] | #[cfg(not(debug_assertions))] | ||||||
| pub use serve_static_release::{root_index, serve_static_content}; | pub use serve_static_release::{root_index, serve_static_content}; | ||||||
|  |  | ||||||
|  | /// Static API assets hosting | ||||||
|  | pub mod serve_assets { | ||||||
|  |     use actix_web::{HttpResponse, web}; | ||||||
|  |     use rust_embed::RustEmbed; | ||||||
|  |  | ||||||
|  |     #[derive(RustEmbed)] | ||||||
|  |     #[folder = "assets/"] | ||||||
|  |     struct Asset; | ||||||
|  |  | ||||||
|  |     /// Serve API assets | ||||||
|  |     pub async fn serve_api_assets(file: web::Path<String>) -> HttpResponse { | ||||||
|  |         match Asset::get(&file) { | ||||||
|  |             None => HttpResponse::NotFound().body("File not found"), | ||||||
|  |             Some(asset) => HttpResponse::Ok() | ||||||
|  |                 .content_type(asset.metadata.mimetype()) | ||||||
|  |                 .body(asset.data), | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /// Web asset hosting placeholder in debug mode | ||||||
| #[cfg(debug_assertions)] | #[cfg(debug_assertions)] | ||||||
| mod serve_static_debug { | mod serve_static_debug { | ||||||
|     use actix_web::{HttpResponse, Responder}; |     use actix_web::{HttpResponse, Responder}; | ||||||
| @@ -16,6 +37,7 @@ mod serve_static_debug { | |||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
|  | /// Web asset hosting in release mode | ||||||
| #[cfg(not(debug_assertions))] | #[cfg(not(debug_assertions))] | ||||||
| mod serve_static_release { | mod serve_static_release { | ||||||
|     use actix_web::{HttpResponse, Responder, web}; |     use actix_web::{HttpResponse, Responder, web}; | ||||||
| @@ -23,12 +45,12 @@ mod serve_static_release { | |||||||
|  |  | ||||||
|     #[derive(RustEmbed)] |     #[derive(RustEmbed)] | ||||||
|     #[folder = "static/"] |     #[folder = "static/"] | ||||||
|     struct Asset; |     struct WebAsset; | ||||||
|  |  | ||||||
|     fn handle_embedded_file(path: &str, can_fallback: bool) -> HttpResponse { |     fn handle_embedded_file(path: &str, can_fallback: bool) -> HttpResponse { | ||||||
|         match (Asset::get(path), can_fallback) { |         match (WebAsset::get(path), can_fallback) { | ||||||
|             (Some(content), _) => HttpResponse::Ok() |             (Some(content), _) => HttpResponse::Ok() | ||||||
|                 .content_type(mime_guess::from_path(path).first_or_octet_stream().as_ref()) |                 .content_type(content.metadata.mimetype()) | ||||||
|                 .body(content.data.into_owned()), |                 .body(content.data.into_owned()), | ||||||
|             (None, false) => HttpResponse::NotFound().body("404 Not Found"), |             (None, false) => HttpResponse::NotFound().body("404 Not Found"), | ||||||
|             (None, true) => handle_embedded_file("index.html", false), |             (None, true) => handle_embedded_file("index.html", false), | ||||||
|   | |||||||
| @@ -26,6 +26,7 @@ pub struct OSXML { | |||||||
|     pub firmware: String, |     pub firmware: String, | ||||||
|     pub r#type: OSTypeXML, |     pub r#type: OSTypeXML, | ||||||
|     pub loader: Option<OSLoaderXML>, |     pub loader: Option<OSLoaderXML>, | ||||||
|  |     pub smbios: Option<OSSMBiosXML>, | ||||||
| } | } | ||||||
|  |  | ||||||
| /// OS Type information | /// OS Type information | ||||||
| @@ -48,6 +49,14 @@ pub struct OSLoaderXML { | |||||||
|     pub secure: String, |     pub secure: String, | ||||||
| } | } | ||||||
|  |  | ||||||
|  | /// SMBIOS System information | ||||||
|  | #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)] | ||||||
|  | #[serde(rename = "smbios")] | ||||||
|  | pub struct OSSMBiosXML { | ||||||
|  |     #[serde(rename = "@mode")] | ||||||
|  |     pub mode: String, | ||||||
|  | } | ||||||
|  |  | ||||||
| /// Hypervisor features | /// Hypervisor features | ||||||
| #[derive(serde::Serialize, serde::Deserialize, Clone, Default, Debug)] | #[derive(serde::Serialize, serde::Deserialize, Clone, Default, Debug)] | ||||||
| #[serde(rename = "features")] | #[serde(rename = "features")] | ||||||
| @@ -71,7 +80,9 @@ pub struct NetMacAddress { | |||||||
| #[serde(rename = "source")] | #[serde(rename = "source")] | ||||||
| pub struct NetIntSourceXML { | pub struct NetIntSourceXML { | ||||||
|     #[serde(rename = "@network")] |     #[serde(rename = "@network")] | ||||||
|     pub network: String, |     pub network: Option<String>, | ||||||
|  |     #[serde(rename = "@bridge")] | ||||||
|  |     pub bridge: Option<String>, | ||||||
| } | } | ||||||
|  |  | ||||||
| #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)] | #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)] | ||||||
| @@ -305,6 +316,29 @@ pub struct DomainCPUXML { | |||||||
|     pub topology: Option<DomainCPUTopology>, |     pub topology: Option<DomainCPUTopology>, | ||||||
| } | } | ||||||
|  |  | ||||||
|  | #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)] | ||||||
|  | #[serde(rename = "entry")] | ||||||
|  | pub struct OEMStringEntryXML { | ||||||
|  |     #[serde(rename = "$text", default)] | ||||||
|  |     pub content: String, | ||||||
|  | } | ||||||
|  |  | ||||||
|  | #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)] | ||||||
|  | #[serde(rename = "oemStrings")] | ||||||
|  | pub struct OEMStringsXML { | ||||||
|  |     #[serde(rename = "entry")] | ||||||
|  |     pub entries: Vec<OEMStringEntryXML>, | ||||||
|  | } | ||||||
|  |  | ||||||
|  | #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)] | ||||||
|  | #[serde(rename = "sysinfo")] | ||||||
|  | pub struct SysInfoXML { | ||||||
|  |     #[serde(rename = "@type")] | ||||||
|  |     pub r#type: String, | ||||||
|  |     #[serde(rename = "oemStrings")] | ||||||
|  |     pub oem_strings: Option<OEMStringsXML>, | ||||||
|  | } | ||||||
|  |  | ||||||
| /// Domain information, see https://libvirt.org/formatdomain.html | /// Domain information, see https://libvirt.org/formatdomain.html | ||||||
| #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)] | #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)] | ||||||
| #[serde(rename = "domain")] | #[serde(rename = "domain")] | ||||||
| @@ -335,6 +369,10 @@ pub struct DomainXML { | |||||||
|     /// CPU information |     /// CPU information | ||||||
|     pub cpu: DomainCPUXML, |     pub cpu: DomainCPUXML, | ||||||
|  |  | ||||||
|  |     /// SMBios strings | ||||||
|  |     pub sysinfo: Option<SysInfoXML>, | ||||||
|  |  | ||||||
|  |     /// Behavior when guest state change | ||||||
|     pub on_poweroff: String, |     pub on_poweroff: String, | ||||||
|     pub on_reboot: String, |     pub on_reboot: String, | ||||||
|     pub on_crash: String, |     pub on_crash: String, | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ use crate::libvirt_lib_structures::XMLUuid; | |||||||
| use crate::libvirt_lib_structures::domain::*; | use crate::libvirt_lib_structures::domain::*; | ||||||
| use crate::libvirt_rest_structures::LibVirtStructError; | use crate::libvirt_rest_structures::LibVirtStructError; | ||||||
| use crate::libvirt_rest_structures::LibVirtStructError::StructureExtraction; | use crate::libvirt_rest_structures::LibVirtStructError::StructureExtraction; | ||||||
| use crate::utils::disks_utils::Disk; | use crate::utils::file_disks_utils::{DiskFormat, FileDisk}; | ||||||
| use crate::utils::files_utils; | use crate::utils::files_utils; | ||||||
| use crate::utils::files_utils::convert_size_unit_to_mb; | use crate::utils::files_utils::convert_size_unit_to_mb; | ||||||
| use lazy_regex::regex; | use lazy_regex::regex; | ||||||
| @@ -53,7 +53,8 @@ pub struct Network { | |||||||
| #[serde(tag = "type")] | #[serde(tag = "type")] | ||||||
| pub enum NetworkType { | pub enum NetworkType { | ||||||
|     UserspaceSLIRPStack, |     UserspaceSLIRPStack, | ||||||
|     DefinedNetwork { network: String }, // TODO : complete network types |     DefinedNetwork { network: String }, | ||||||
|  |     Bridge { bridge: String }, | ||||||
| } | } | ||||||
|  |  | ||||||
| #[derive(serde::Serialize, serde::Deserialize)] | #[derive(serde::Serialize, serde::Deserialize)] | ||||||
| @@ -77,12 +78,14 @@ pub struct VMInfo { | |||||||
|     pub vnc_access: bool, |     pub vnc_access: bool, | ||||||
|     /// Attach ISO file(s) |     /// Attach ISO file(s) | ||||||
|     pub iso_files: Vec<String>, |     pub iso_files: Vec<String>, | ||||||
|     /// Storage - https://access.redhat.com/documentation/fr-fr/red_hat_enterprise_linux/6/html/virtualization_administration_guide/sect-virtualization-virtualized_block_devices-adding_storage_devices_to_guests#sect-Virtualization-Adding_storage_devices_to_guests-Adding_file_based_storage_to_a_guest |     /// File Storage - https://access.redhat.com/documentation/fr-fr/red_hat_enterprise_linux/6/html/virtualization_administration_guide/sect-virtualization-virtualized_block_devices-adding_storage_devices_to_guests#sect-Virtualization-Adding_storage_devices_to_guests-Adding_file_based_storage_to_a_guest | ||||||
|     pub disks: Vec<Disk>, |     pub file_disks: Vec<FileDisk>, | ||||||
|     /// Network cards |     /// Network cards | ||||||
|     pub networks: Vec<Network>, |     pub networks: Vec<Network>, | ||||||
|     /// Add a TPM v2.0 module |     /// Add a TPM v2.0 module | ||||||
|     pub tpm_module: bool, |     pub tpm_module: bool, | ||||||
|  |     /// Strings injected as OEM Strings in SMBios configuration | ||||||
|  |     pub oem_strings: Vec<String>, | ||||||
| } | } | ||||||
|  |  | ||||||
| impl VMInfo { | impl VMInfo { | ||||||
| @@ -129,6 +132,7 @@ impl VMInfo { | |||||||
|  |  | ||||||
|         let mut disks = vec![]; |         let mut disks = vec![]; | ||||||
|  |  | ||||||
|  |         // Add ISO files | ||||||
|         for iso_file in &self.iso_files { |         for iso_file in &self.iso_files { | ||||||
|             if !files_utils::check_file_name(iso_file) { |             if !files_utils::check_file_name(iso_file) { | ||||||
|                 return Err(StructureExtraction("ISO filename is invalid!").into()); |                 return Err(StructureExtraction("ISO filename is invalid!").into()); | ||||||
| @@ -237,7 +241,18 @@ impl VMInfo { | |||||||
|                     mac, |                     mac, | ||||||
|                     r#type: "network".to_string(), |                     r#type: "network".to_string(), | ||||||
|                     source: Some(NetIntSourceXML { |                     source: Some(NetIntSourceXML { | ||||||
|                         network: network.to_string(), |                         network: Some(network.to_string()), | ||||||
|  |                         bridge: None, | ||||||
|  |                     }), | ||||||
|  |                     model, | ||||||
|  |                     filterref, | ||||||
|  |                 }, | ||||||
|  |                 NetworkType::Bridge { bridge } => DomainNetInterfaceXML { | ||||||
|  |                     r#type: "bridge".to_string(), | ||||||
|  |                     mac, | ||||||
|  |                     source: Some(NetIntSourceXML { | ||||||
|  |                         network: None, | ||||||
|  |                         bridge: Some(bridge.to_string()), | ||||||
|                     }), |                     }), | ||||||
|                     model, |                     model, | ||||||
|                     filterref, |                     filterref, | ||||||
| @@ -246,15 +261,21 @@ impl VMInfo { | |||||||
|         } |         } | ||||||
|  |  | ||||||
|         // Check disks name for duplicates |         // Check disks name for duplicates | ||||||
|         for disk in &self.disks { |         for disk in &self.file_disks { | ||||||
|             if self.disks.iter().filter(|d| d.name == disk.name).count() > 1 { |             if self | ||||||
|  |                 .file_disks | ||||||
|  |                 .iter() | ||||||
|  |                 .filter(|d| d.name == disk.name) | ||||||
|  |                 .count() | ||||||
|  |                 > 1 | ||||||
|  |             { | ||||||
|                 return Err(StructureExtraction("Two different disks have the same name!").into()); |                 return Err(StructureExtraction("Two different disks have the same name!").into()); | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         // Apply disks configuration. Starting from now, the function should ideally never fail due to |         // Apply disks configuration. Starting from now, the function should ideally never fail due to | ||||||
|         // bad user input |         // bad user input | ||||||
|         for disk in &self.disks { |         for disk in &self.file_disks { | ||||||
|             disk.check_config()?; |             disk.check_config()?; | ||||||
|             disk.apply_config(uuid)?; |             disk.apply_config(uuid)?; | ||||||
|  |  | ||||||
| @@ -267,7 +288,10 @@ impl VMInfo { | |||||||
|                 device: "disk".to_string(), |                 device: "disk".to_string(), | ||||||
|                 driver: DiskDriverXML { |                 driver: DiskDriverXML { | ||||||
|                     name: "qemu".to_string(), |                     name: "qemu".to_string(), | ||||||
|                     r#type: "raw".to_string(), |                     r#type: match disk.format { | ||||||
|  |                         DiskFormat::Raw { .. } => "raw".to_string(), | ||||||
|  |                         DiskFormat::QCow2 => "qcow2".to_string(), | ||||||
|  |                     }, | ||||||
|                     cache: "none".to_string(), |                     cache: "none".to_string(), | ||||||
|                 }, |                 }, | ||||||
|                 source: DiskSourceXML { |                 source: DiskSourceXML { | ||||||
| @@ -319,6 +343,9 @@ impl VMInfo { | |||||||
|                         BootType::UEFISecureBoot => "yes".to_string(), |                         BootType::UEFISecureBoot => "yes".to_string(), | ||||||
|                     }, |                     }, | ||||||
|                 }), |                 }), | ||||||
|  |                 smbios: Some(OSSMBiosXML { | ||||||
|  |                     mode: "sysinfo".to_string(), | ||||||
|  |                 }), | ||||||
|             }, |             }, | ||||||
|  |  | ||||||
|             features: FeaturesXML { acpi: ACPIXML {} }, |             features: FeaturesXML { acpi: ACPIXML {} }, | ||||||
| @@ -375,6 +402,17 @@ impl VMInfo { | |||||||
|                 }), |                 }), | ||||||
|             }, |             }, | ||||||
|  |  | ||||||
|  |             sysinfo: Some(SysInfoXML { | ||||||
|  |                 r#type: "smbios".to_string(), | ||||||
|  |                 oem_strings: Some(OEMStringsXML { | ||||||
|  |                     entries: self | ||||||
|  |                         .oem_strings | ||||||
|  |                         .iter() | ||||||
|  |                         .map(|s| OEMStringEntryXML { content: s.clone() }) | ||||||
|  |                         .collect(), | ||||||
|  |                 }), | ||||||
|  |             }), | ||||||
|  |  | ||||||
|             on_poweroff: "destroy".to_string(), |             on_poweroff: "destroy".to_string(), | ||||||
|             on_reboot: "restart".to_string(), |             on_reboot: "restart".to_string(), | ||||||
|             on_crash: "destroy".to_string(), |             on_crash: "destroy".to_string(), | ||||||
| @@ -424,12 +462,12 @@ impl VMInfo { | |||||||
|                 .map(|d| d.source.file.rsplit_once('/').unwrap().1.to_string()) |                 .map(|d| d.source.file.rsplit_once('/').unwrap().1.to_string()) | ||||||
|                 .collect(), |                 .collect(), | ||||||
|  |  | ||||||
|             disks: domain |             file_disks: domain | ||||||
|                 .devices |                 .devices | ||||||
|                 .disks |                 .disks | ||||||
|                 .iter() |                 .iter() | ||||||
|                 .filter(|d| d.device == "disk") |                 .filter(|d| d.device == "disk") | ||||||
|                 .map(|d| Disk::load_from_file(&d.source.file).unwrap()) |                 .map(|d| FileDisk::load_from_file(&d.source.file).unwrap()) | ||||||
|                 .collect(), |                 .collect(), | ||||||
|  |  | ||||||
|             networks: domain |             networks: domain | ||||||
| @@ -442,7 +480,34 @@ impl VMInfo { | |||||||
|                         r#type: match d.r#type.as_str() { |                         r#type: match d.r#type.as_str() { | ||||||
|                             "user" => NetworkType::UserspaceSLIRPStack, |                             "user" => NetworkType::UserspaceSLIRPStack, | ||||||
|                             "network" => NetworkType::DefinedNetwork { |                             "network" => NetworkType::DefinedNetwork { | ||||||
|                                 network: d.source.as_ref().unwrap().network.to_string(), |                                 network: d | ||||||
|  |                                     .source | ||||||
|  |                                     .as_ref() | ||||||
|  |                                     .unwrap() | ||||||
|  |                                     .network | ||||||
|  |                                     .as_deref() | ||||||
|  |                                     .ok_or_else(|| { | ||||||
|  |                                         LibVirtStructError::DomainExtraction( | ||||||
|  |                                             "Missing source network for defined network!" | ||||||
|  |                                                 .to_string(), | ||||||
|  |                                         ) | ||||||
|  |                                     })? | ||||||
|  |                                     .to_string(), | ||||||
|  |                             }, | ||||||
|  |                             "bridge" => NetworkType::Bridge { | ||||||
|  |                                 bridge: d | ||||||
|  |                                     .source | ||||||
|  |                                     .as_ref() | ||||||
|  |                                     .unwrap() | ||||||
|  |                                     .bridge | ||||||
|  |                                     .as_deref() | ||||||
|  |                                     .ok_or_else(|| { | ||||||
|  |                                         LibVirtStructError::DomainExtraction( | ||||||
|  |                                             "Missing bridge name for bridge connection!" | ||||||
|  |                                                 .to_string(), | ||||||
|  |                                         ) | ||||||
|  |                                     })? | ||||||
|  |                                     .to_string(), | ||||||
|                             }, |                             }, | ||||||
|                             a => { |                             a => { | ||||||
|                                 return Err(LibVirtStructError::DomainExtraction(format!( |                                 return Err(LibVirtStructError::DomainExtraction(format!( | ||||||
| @@ -466,6 +531,12 @@ impl VMInfo { | |||||||
|                 .collect::<Result<Vec<_>, _>>()?, |                 .collect::<Result<Vec<_>, _>>()?, | ||||||
|  |  | ||||||
|             tpm_module: domain.devices.tpm.is_some(), |             tpm_module: domain.devices.tpm.is_some(), | ||||||
|  |  | ||||||
|  |             oem_strings: domain | ||||||
|  |                 .sysinfo | ||||||
|  |                 .and_then(|s| s.oem_strings) | ||||||
|  |                 .map(|s| s.entries.iter().map(|o| o.content.to_string()).collect()) | ||||||
|  |                 .unwrap_or_default(), | ||||||
|         }) |         }) | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -28,7 +28,7 @@ use virtweb_backend::controllers::{ | |||||||
| use virtweb_backend::libvirt_client::LibVirtClient; | use virtweb_backend::libvirt_client::LibVirtClient; | ||||||
| use virtweb_backend::middlewares::auth_middleware::AuthChecker; | use virtweb_backend::middlewares::auth_middleware::AuthChecker; | ||||||
| use virtweb_backend::nat::nat_conf_mode; | use virtweb_backend::nat::nat_conf_mode; | ||||||
| use virtweb_backend::utils::files_utils; | use virtweb_backend::utils::{exec_utils, files_utils}; | ||||||
|  |  | ||||||
| #[actix_web::main] | #[actix_web::main] | ||||||
| async fn main() -> std::io::Result<()> { | async fn main() -> std::io::Result<()> { | ||||||
| @@ -43,6 +43,16 @@ async fn main() -> std::io::Result<()> { | |||||||
|     // Load additional config from file, if requested |     // Load additional config from file, if requested | ||||||
|     AppConfig::parse_env_file().unwrap(); |     AppConfig::parse_env_file().unwrap(); | ||||||
|  |  | ||||||
|  |     log::debug!("Checking for required programs"); | ||||||
|  |     exec_utils::check_program( | ||||||
|  |         constants::QEMU_IMAGE_PROGRAM, | ||||||
|  |         "QEMU disk image utility is required to manipulate QCow2 files!", | ||||||
|  |     ); | ||||||
|  |     exec_utils::check_program( | ||||||
|  |         constants::IP_PROGRAM, | ||||||
|  |         "ip is required to access bridges information!", | ||||||
|  |     ); | ||||||
|  |  | ||||||
|     log::debug!("Create required directory, if missing"); |     log::debug!("Create required directory, if missing"); | ||||||
|     files_utils::create_directory_if_missing(AppConfig::get().iso_storage_path()).unwrap(); |     files_utils::create_directory_if_missing(AppConfig::get().iso_storage_path()).unwrap(); | ||||||
|     files_utils::create_directory_if_missing(AppConfig::get().vnc_sockets_path()).unwrap(); |     files_utils::create_directory_if_missing(AppConfig::get().vnc_sockets_path()).unwrap(); | ||||||
| @@ -131,6 +141,10 @@ async fn main() -> std::io::Result<()> { | |||||||
|                 "/api/server/networks", |                 "/api/server/networks", | ||||||
|                 web::get().to(server_controller::networks_list), |                 web::get().to(server_controller::networks_list), | ||||||
|             ) |             ) | ||||||
|  |             .route( | ||||||
|  |                 "/api/server/bridges", | ||||||
|  |                 web::get().to(server_controller::bridges_list), | ||||||
|  |             ) | ||||||
|             // Auth controller |             // Auth controller | ||||||
|             .route( |             .route( | ||||||
|                 "/api/auth/local", |                 "/api/auth/local", | ||||||
| @@ -337,6 +351,11 @@ async fn main() -> std::io::Result<()> { | |||||||
|                 web::delete().to(api_tokens_controller::delete), |                 web::delete().to(api_tokens_controller::delete), | ||||||
|             ) |             ) | ||||||
|             // Static assets |             // Static assets | ||||||
|  |             .route( | ||||||
|  |                 "/api/assets/{tail:.*}", | ||||||
|  |                 web::get().to(static_controller::serve_assets::serve_api_assets), | ||||||
|  |             ) | ||||||
|  |             // Static web frontend | ||||||
|             .route("/", web::get().to(static_controller::root_index)) |             .route("/", web::get().to(static_controller::root_index)) | ||||||
|             .route( |             .route( | ||||||
|                 "/{tail:.*}", |                 "/{tail:.*}", | ||||||
|   | |||||||
| @@ -1,133 +0,0 @@ | |||||||
| use crate::app_config::AppConfig; |  | ||||||
| use crate::constants; |  | ||||||
| use crate::libvirt_lib_structures::XMLUuid; |  | ||||||
| use crate::utils::files_utils; |  | ||||||
| use lazy_regex::regex; |  | ||||||
| use std::os::linux::fs::MetadataExt; |  | ||||||
| use std::path::{Path, PathBuf}; |  | ||||||
| use std::process::Command; |  | ||||||
|  |  | ||||||
| #[derive(thiserror::Error, Debug)] |  | ||||||
| enum DisksError { |  | ||||||
|     #[error("DiskParseError: {0}")] |  | ||||||
|     Parse(&'static str), |  | ||||||
|     #[error("DiskConfigError: {0}")] |  | ||||||
|     Config(&'static str), |  | ||||||
|     #[error("DiskCreateError")] |  | ||||||
|     Create, |  | ||||||
| } |  | ||||||
|  |  | ||||||
| /// Type of disk allocation |  | ||||||
| #[derive(Copy, Clone, Debug, serde::Serialize, serde::Deserialize)] |  | ||||||
| pub enum DiskAllocType { |  | ||||||
|     Fixed, |  | ||||||
|     Sparse, |  | ||||||
| } |  | ||||||
|  |  | ||||||
| #[derive(serde::Serialize, serde::Deserialize)] |  | ||||||
| pub struct Disk { |  | ||||||
|     /// Disk size, in megabytes |  | ||||||
|     pub size: usize, |  | ||||||
|     /// Disk name |  | ||||||
|     pub name: String, |  | ||||||
|     pub alloc_type: DiskAllocType, |  | ||||||
|     /// Set this variable to true to delete the disk |  | ||||||
|     pub delete: bool, |  | ||||||
| } |  | ||||||
|  |  | ||||||
| impl Disk { |  | ||||||
|     pub fn load_from_file(path: &str) -> anyhow::Result<Self> { |  | ||||||
|         let file = Path::new(path); |  | ||||||
|  |  | ||||||
|         if !file.is_file() { |  | ||||||
|             return Err(DisksError::Parse("Path is not a file!").into()); |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         let metadata = file.metadata()?; |  | ||||||
|  |  | ||||||
|         // Approximate estimation |  | ||||||
|         let is_sparse = metadata.len() / 512 >= metadata.st_blocks(); |  | ||||||
|  |  | ||||||
|         Ok(Self { |  | ||||||
|             size: metadata.len() as usize / (1000 * 1000), |  | ||||||
|             name: path.rsplit_once('/').unwrap().1.to_string(), |  | ||||||
|             alloc_type: match is_sparse { |  | ||||||
|                 true => DiskAllocType::Sparse, |  | ||||||
|                 false => DiskAllocType::Fixed, |  | ||||||
|             }, |  | ||||||
|             delete: false, |  | ||||||
|         }) |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     pub fn check_config(&self) -> anyhow::Result<()> { |  | ||||||
|         if constants::DISK_NAME_MIN_LEN > self.name.len() |  | ||||||
|             || constants::DISK_NAME_MAX_LEN < self.name.len() |  | ||||||
|         { |  | ||||||
|             return Err(DisksError::Config("Disk name length is invalid").into()); |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         if !regex!("^[a-zA-Z0-9]+$").is_match(&self.name) { |  | ||||||
|             return Err(DisksError::Config("Disk name contains invalid characters!").into()); |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         if self.size < constants::DISK_SIZE_MIN || self.size > constants::DISK_SIZE_MAX { |  | ||||||
|             return Err(DisksError::Config("Disk size is invalid!").into()); |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         Ok(()) |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     /// Get disk path |  | ||||||
|     pub fn disk_path(&self, id: XMLUuid) -> PathBuf { |  | ||||||
|         let domain_dir = AppConfig::get().vm_storage_path(id); |  | ||||||
|         domain_dir.join(&self.name) |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     /// Apply disk configuration |  | ||||||
|     pub fn apply_config(&self, id: XMLUuid) -> anyhow::Result<()> { |  | ||||||
|         self.check_config()?; |  | ||||||
|  |  | ||||||
|         let file = self.disk_path(id); |  | ||||||
|         files_utils::create_directory_if_missing(file.parent().unwrap())?; |  | ||||||
|  |  | ||||||
|         // Delete file if requested |  | ||||||
|         if self.delete { |  | ||||||
|             if !file.exists() { |  | ||||||
|                 log::debug!("File {file:?} does not exists, so it was not deleted"); |  | ||||||
|                 return Ok(()); |  | ||||||
|             } |  | ||||||
|  |  | ||||||
|             log::info!("Deleting {file:?}"); |  | ||||||
|             std::fs::remove_file(file)?; |  | ||||||
|             return Ok(()); |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         if file.exists() { |  | ||||||
|             log::debug!("File {file:?} does not exists, so it was not touched"); |  | ||||||
|             return Ok(()); |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         let mut cmd = Command::new("/usr/bin/dd"); |  | ||||||
|         cmd.arg("if=/dev/zero") |  | ||||||
|             .arg(format!("of={}", file.to_string_lossy())) |  | ||||||
|             .arg("bs=1M"); |  | ||||||
|  |  | ||||||
|         match self.alloc_type { |  | ||||||
|             DiskAllocType::Fixed => cmd.arg(format!("count={}", self.size)), |  | ||||||
|             DiskAllocType::Sparse => cmd.arg(format!("seek={}", self.size)).arg("count=0"), |  | ||||||
|         }; |  | ||||||
|  |  | ||||||
|         let res = cmd.output()?; |  | ||||||
|  |  | ||||||
|         if !res.status.success() { |  | ||||||
|             log::error!( |  | ||||||
|                 "Failed to create disk! stderr={} stdout={}", |  | ||||||
|                 String::from_utf8_lossy(&res.stderr), |  | ||||||
|                 String::from_utf8_lossy(&res.stdout) |  | ||||||
|             ); |  | ||||||
|             return Err(DisksError::Create.into()); |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         Ok(()) |  | ||||||
|     } |  | ||||||
| } |  | ||||||
							
								
								
									
										10
									
								
								virtweb_backend/src/utils/exec_utils.rs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								virtweb_backend/src/utils/exec_utils.rs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,10 @@ | |||||||
|  | use std::path::Path; | ||||||
|  |  | ||||||
|  | /// Check the existence of a required program | ||||||
|  | pub fn check_program(name: &str, description: &str) { | ||||||
|  |     let path = Path::new(name); | ||||||
|  |  | ||||||
|  |     if !path.exists() { | ||||||
|  |         panic!("{name} does not exist! {description}"); | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										208
									
								
								virtweb_backend/src/utils/file_disks_utils.rs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										208
									
								
								virtweb_backend/src/utils/file_disks_utils.rs
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,208 @@ | |||||||
|  | use crate::app_config::AppConfig; | ||||||
|  | use crate::constants; | ||||||
|  | use crate::libvirt_lib_structures::XMLUuid; | ||||||
|  | use crate::utils::files_utils; | ||||||
|  | use lazy_regex::regex; | ||||||
|  | use std::os::linux::fs::MetadataExt; | ||||||
|  | use std::path::{Path, PathBuf}; | ||||||
|  | use std::process::Command; | ||||||
|  |  | ||||||
|  | #[derive(thiserror::Error, Debug)] | ||||||
|  | enum DisksError { | ||||||
|  |     #[error("DiskParseError: {0}")] | ||||||
|  |     Parse(&'static str), | ||||||
|  |     #[error("DiskConfigError: {0}")] | ||||||
|  |     Config(&'static str), | ||||||
|  |     #[error("DiskCreateError")] | ||||||
|  |     Create, | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /// Type of disk allocation | ||||||
|  | #[derive(Copy, Clone, Debug, serde::Serialize, serde::Deserialize)] | ||||||
|  | pub enum DiskAllocType { | ||||||
|  |     Fixed, | ||||||
|  |     Sparse, | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /// Disk allocation type | ||||||
|  | #[derive(serde::Serialize, serde::Deserialize)] | ||||||
|  | #[serde(tag = "format")] | ||||||
|  | pub enum DiskFormat { | ||||||
|  |     Raw { | ||||||
|  |         /// Type of disk allocation | ||||||
|  |         alloc_type: DiskAllocType, | ||||||
|  |     }, | ||||||
|  |     QCow2, | ||||||
|  | } | ||||||
|  |  | ||||||
|  | #[derive(serde::Serialize, serde::Deserialize)] | ||||||
|  | pub struct FileDisk { | ||||||
|  |     /// Disk name | ||||||
|  |     pub name: String, | ||||||
|  |     /// Disk size, in megabytes | ||||||
|  |     pub size: usize, | ||||||
|  |     /// Disk format | ||||||
|  |     #[serde(flatten)] | ||||||
|  |     pub format: DiskFormat, | ||||||
|  |     /// Set this variable to true to delete the disk | ||||||
|  |     pub delete: bool, | ||||||
|  | } | ||||||
|  |  | ||||||
|  | impl FileDisk { | ||||||
|  |     pub fn load_from_file(path: &str) -> anyhow::Result<Self> { | ||||||
|  |         let file = Path::new(path); | ||||||
|  |  | ||||||
|  |         if !file.is_file() { | ||||||
|  |             return Err(DisksError::Parse("Path is not a file!").into()); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         let metadata = file.metadata()?; | ||||||
|  |         let name = file.file_stem().and_then(|s| s.to_str()).unwrap_or("disk"); | ||||||
|  |         let ext = file.extension().and_then(|s| s.to_str()).unwrap_or("raw"); | ||||||
|  |  | ||||||
|  |         // Approximate raw file estimation | ||||||
|  |         let is_raw_sparse = metadata.len() / 512 >= metadata.st_blocks(); | ||||||
|  |  | ||||||
|  |         let format = match ext { | ||||||
|  |             "qcow2" => DiskFormat::QCow2, | ||||||
|  |             "raw" => DiskFormat::Raw { | ||||||
|  |                 alloc_type: match is_raw_sparse { | ||||||
|  |                     true => DiskAllocType::Sparse, | ||||||
|  |                     false => DiskAllocType::Fixed, | ||||||
|  |                 }, | ||||||
|  |             }, | ||||||
|  |             _ => anyhow::bail!("Unsupported disk extension: {ext}!"), | ||||||
|  |         }; | ||||||
|  |  | ||||||
|  |         Ok(Self { | ||||||
|  |             name: name.to_string(), | ||||||
|  |             size: match format { | ||||||
|  |                 DiskFormat::Raw { .. } => metadata.len() as usize / (1000 * 1000), | ||||||
|  |                 DiskFormat::QCow2 => qcow_virt_size(path)? / (1000 * 1000), | ||||||
|  |             }, | ||||||
|  |             format, | ||||||
|  |             delete: false, | ||||||
|  |         }) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     pub fn check_config(&self) -> anyhow::Result<()> { | ||||||
|  |         if constants::DISK_NAME_MIN_LEN > self.name.len() | ||||||
|  |             || constants::DISK_NAME_MAX_LEN < self.name.len() | ||||||
|  |         { | ||||||
|  |             return Err(DisksError::Config("Disk name length is invalid").into()); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         if !regex!("^[a-zA-Z0-9]+$").is_match(&self.name) { | ||||||
|  |             return Err(DisksError::Config("Disk name contains invalid characters!").into()); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         // Check disk size | ||||||
|  |         if !(constants::DISK_SIZE_MIN..=constants::DISK_SIZE_MAX).contains(&self.size) { | ||||||
|  |             return Err(DisksError::Config("Disk size is invalid!").into()); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         Ok(()) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     /// Get disk path | ||||||
|  |     pub fn disk_path(&self, id: XMLUuid) -> PathBuf { | ||||||
|  |         let domain_dir = AppConfig::get().vm_storage_path(id); | ||||||
|  |         let file_name = match self.format { | ||||||
|  |             DiskFormat::Raw { .. } => self.name.to_string(), | ||||||
|  |             DiskFormat::QCow2 => format!("{}.qcow2", self.name), | ||||||
|  |         }; | ||||||
|  |         domain_dir.join(&file_name) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     /// Apply disk configuration | ||||||
|  |     pub fn apply_config(&self, id: XMLUuid) -> anyhow::Result<()> { | ||||||
|  |         self.check_config()?; | ||||||
|  |  | ||||||
|  |         let file = self.disk_path(id); | ||||||
|  |         files_utils::create_directory_if_missing(file.parent().unwrap())?; | ||||||
|  |  | ||||||
|  |         // Delete file if requested | ||||||
|  |         if self.delete { | ||||||
|  |             if !file.exists() { | ||||||
|  |                 log::debug!("File {file:?} does not exists, so it was not deleted"); | ||||||
|  |                 return Ok(()); | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             log::info!("Deleting {file:?}"); | ||||||
|  |             std::fs::remove_file(file)?; | ||||||
|  |             return Ok(()); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         if file.exists() { | ||||||
|  |             log::debug!("File {file:?} does not exists, so it was not touched"); | ||||||
|  |             return Ok(()); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         // Prepare command to create file | ||||||
|  |         let res = match self.format { | ||||||
|  |             DiskFormat::Raw { alloc_type } => { | ||||||
|  |                 let mut cmd = Command::new("/usr/bin/dd"); | ||||||
|  |                 cmd.arg("if=/dev/zero") | ||||||
|  |                     .arg(format!("of={}", file.to_string_lossy())) | ||||||
|  |                     .arg("bs=1M"); | ||||||
|  |  | ||||||
|  |                 match alloc_type { | ||||||
|  |                     DiskAllocType::Fixed => cmd.arg(format!("count={}", self.size)), | ||||||
|  |                     DiskAllocType::Sparse => cmd.arg(format!("seek={}", self.size)).arg("count=0"), | ||||||
|  |                 }; | ||||||
|  |  | ||||||
|  |                 cmd.output()? | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             DiskFormat::QCow2 => { | ||||||
|  |                 let mut cmd = Command::new(constants::QEMU_IMAGE_PROGRAM); | ||||||
|  |                 cmd.arg("create") | ||||||
|  |                     .arg("-f") | ||||||
|  |                     .arg("qcow2") | ||||||
|  |                     .arg(file) | ||||||
|  |                     .arg(format!("{}M", self.size)); | ||||||
|  |  | ||||||
|  |                 cmd.output()? | ||||||
|  |             } | ||||||
|  |         }; | ||||||
|  |  | ||||||
|  |         // Execute Linux command | ||||||
|  |         if !res.status.success() { | ||||||
|  |             log::error!( | ||||||
|  |                 "Failed to create disk! stderr={} stdout={}", | ||||||
|  |                 String::from_utf8_lossy(&res.stderr), | ||||||
|  |                 String::from_utf8_lossy(&res.stdout) | ||||||
|  |             ); | ||||||
|  |             return Err(DisksError::Create.into()); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         Ok(()) | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | #[derive(serde::Deserialize)] | ||||||
|  | struct QCowInfoOutput { | ||||||
|  |     #[serde(rename = "virtual-size")] | ||||||
|  |     virtual_size: usize, | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /// Get QCow2 virtual size | ||||||
|  | fn qcow_virt_size(path: &str) -> anyhow::Result<usize> { | ||||||
|  |     // Run qemu-img | ||||||
|  |     let mut cmd = Command::new(constants::QEMU_IMAGE_PROGRAM); | ||||||
|  |     cmd.args(["info", path, "--output", "json", "--force-share"]); | ||||||
|  |     let output = cmd.output()?; | ||||||
|  |     if !output.status.success() { | ||||||
|  |         anyhow::bail!( | ||||||
|  |             "{} info failed, status: {}, stderr: {}", | ||||||
|  |             constants::QEMU_IMAGE_PROGRAM, | ||||||
|  |             output.status, | ||||||
|  |             String::from_utf8_lossy(&output.stderr) | ||||||
|  |         ); | ||||||
|  |     } | ||||||
|  |     let res_json = String::from_utf8(output.stdout)?; | ||||||
|  |  | ||||||
|  |     // Decode JSON | ||||||
|  |     let decoded: QCowInfoOutput = serde_json::from_str(&res_json)?; | ||||||
|  |     Ok(decoded.virtual_size) | ||||||
|  | } | ||||||
| @@ -1,4 +1,5 @@ | |||||||
| pub mod disks_utils; | pub mod exec_utils; | ||||||
|  | pub mod file_disks_utils; | ||||||
| pub mod files_utils; | pub mod files_utils; | ||||||
| pub mod net_utils; | pub mod net_utils; | ||||||
| pub mod rand_utils; | pub mod rand_utils; | ||||||
|   | |||||||
| @@ -1,6 +1,8 @@ | |||||||
|  | use crate::constants; | ||||||
| use nix::sys::socket::{AddressFamily, SockaddrLike}; | use nix::sys::socket::{AddressFamily, SockaddrLike}; | ||||||
| use std::collections::HashMap; | use std::collections::HashMap; | ||||||
| use std::net::{IpAddr, Ipv4Addr, Ipv6Addr}; | use std::net::{IpAddr, Ipv4Addr, Ipv6Addr}; | ||||||
|  | use std::process::Command; | ||||||
| use std::str::FromStr; | use std::str::FromStr; | ||||||
| use sysinfo::Networks; | use sysinfo::Networks; | ||||||
|  |  | ||||||
| @@ -68,7 +70,7 @@ pub fn net_list() -> Vec<String> { | |||||||
|  |  | ||||||
| /// Get the list of available network interfaces associated with their IP address | /// Get the list of available network interfaces associated with their IP address | ||||||
| pub fn net_list_and_ips() -> anyhow::Result<HashMap<String, Vec<IpAddr>>> { | pub fn net_list_and_ips() -> anyhow::Result<HashMap<String, Vec<IpAddr>>> { | ||||||
|     let addrs = nix::ifaddrs::getifaddrs().unwrap(); |     let addrs = nix::ifaddrs::getifaddrs()?; | ||||||
|  |  | ||||||
|     let mut res = HashMap::new(); |     let mut res = HashMap::new(); | ||||||
|  |  | ||||||
| @@ -136,6 +138,31 @@ pub fn net_list_and_ips() -> anyhow::Result<HashMap<String, Vec<IpAddr>>> { | |||||||
|     Ok(res) |     Ok(res) | ||||||
| } | } | ||||||
|  |  | ||||||
|  | #[derive(serde::Deserialize)] | ||||||
|  | struct IPBridgeInfo { | ||||||
|  |     ifname: String, | ||||||
|  | } | ||||||
|  |  | ||||||
|  | /// Get the list of bridge interfaces | ||||||
|  | pub fn bridges_list() -> anyhow::Result<Vec<String>> { | ||||||
|  |     let mut cmd = Command::new(constants::IP_PROGRAM); | ||||||
|  |     cmd.args(["-json", "link", "show", "type", "bridge"]); | ||||||
|  |     let output = cmd.output()?; | ||||||
|  |     if !output.status.success() { | ||||||
|  |         anyhow::bail!( | ||||||
|  |             "{} failed, status: {}, stderr: {}", | ||||||
|  |             constants::IP_PROGRAM, | ||||||
|  |             output.status, | ||||||
|  |             String::from_utf8_lossy(&output.stderr) | ||||||
|  |         ); | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     // Parse JSON result | ||||||
|  |     let res: Vec<IPBridgeInfo> = serde_json::from_str(&String::from_utf8_lossy(&output.stdout))?; | ||||||
|  |  | ||||||
|  |     Ok(res.iter().map(|ip| ip.ifname.clone()).collect()) | ||||||
|  | } | ||||||
|  |  | ||||||
| #[cfg(test)] | #[cfg(test)] | ||||||
| mod tests { | mod tests { | ||||||
|     use crate::utils::net_utils::{ |     use crate::utils::net_utils::{ | ||||||
|   | |||||||
							
								
								
									
										47
									
								
								virtweb_docs/BRIDGE.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										47
									
								
								virtweb_docs/BRIDGE.md
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,47 @@ | |||||||
|  | # Bridges | ||||||
|  |  | ||||||
|  | Bridges can be used to connect virtual machines to networks. | ||||||
|  |  | ||||||
|  | ## Setup Bridge on Ubuntu | ||||||
|  |  | ||||||
|  | 1. Install dependencies: | ||||||
|  |  | ||||||
|  | ```bash | ||||||
|  | sudo apt install bridge-utils | ||||||
|  | ``` | ||||||
|  |  | ||||||
|  | 2. Adapt your netplan configuration to set the following: | ||||||
|  |  | ||||||
|  | ```yaml | ||||||
|  | network: | ||||||
|  |   version: 2 | ||||||
|  |   renderer: networkd | ||||||
|  |   ethernets: | ||||||
|  |     enp2s0: | ||||||
|  |       dhcp4: no | ||||||
|  |   bridges: | ||||||
|  |     br0: # Bridge name | ||||||
|  |       dhcp4: yes | ||||||
|  |       interfaces: | ||||||
|  |          - enp2s0 # Set to your interface | ||||||
|  | ``` | ||||||
|  |  | ||||||
|  |  | ||||||
|  | 3. Apply netplan configuration: | ||||||
|  |  | ||||||
|  | ```bash | ||||||
|  | sudo netplan apply | ||||||
|  | ``` | ||||||
|  |  | ||||||
|  |  | ||||||
|  | 4. Get the state and the list of bridges in the system: | ||||||
|  |  | ||||||
|  | ```bash | ||||||
|  | sudo brctl show | ||||||
|  |  | ||||||
|  | # Or | ||||||
|  | ip link show type bridge | ||||||
|  | ``` | ||||||
|  |  | ||||||
|  | ## Reference | ||||||
|  | [How to Configure Network Bridge in Ubuntu](https://www.tecmint.com/create-network-bridge-in-ubuntu/) | ||||||
							
								
								
									
										11
									
								
								virtweb_docs/REFERENCE.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								virtweb_docs/REFERENCE.md
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,11 @@ | |||||||
|  | ## References | ||||||
|  |  | ||||||
|  | ### LibVirt XML documentation | ||||||
|  | * Online: https://libvirt.org/format.html | ||||||
|  |  | ||||||
|  | * Offline with Ubuntu: | ||||||
|  |  | ||||||
|  | ```bash | ||||||
|  | sudo apt install libvirt-doc | ||||||
|  | firefox /usr/share/doc/libvirt-doc/html/index.html | ||||||
|  | ``` | ||||||
| @@ -61,7 +61,7 @@ STORAGE=/home/virtweb/storage | |||||||
| HYPERVISOR_URI=qemu:///system | HYPERVISOR_URI=qemu:///system | ||||||
| ``` | ``` | ||||||
|  |  | ||||||
| > Note: `HYPERVISOR_URI=qemu:///system` is used to sepcify that we want to use the main hypervisor. | > Note: `HYPERVISOR_URI=qemu:///system` is used to specify that we want to use the main hypervisor. | ||||||
|  |  | ||||||
| ## Register Virtweb service | ## Register Virtweb service | ||||||
| Before registering service, check that the configuration works correctly: | Before registering service, check that the configuration works correctly: | ||||||
|   | |||||||
							
								
								
									
										1657
									
								
								virtweb_frontend/package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										1657
									
								
								virtweb_frontend/package-lock.json
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -13,41 +13,40 @@ | |||||||
|     "@emotion/react": "^11.14.0", |     "@emotion/react": "^11.14.0", | ||||||
|     "@emotion/styled": "^11.14.0", |     "@emotion/styled": "^11.14.0", | ||||||
|     "@fontsource/roboto": "^5.2.5", |     "@fontsource/roboto": "^5.2.5", | ||||||
|     "@mdi/js": "^7.2.96", |     "@mdi/js": "^7.4.47", | ||||||
|     "@mdi/react": "^1.6.1", |     "@mdi/react": "^1.6.1", | ||||||
|     "@mui/icons-material": "^7.0.0", |     "@mui/icons-material": "^7.1.0", | ||||||
|     "@mui/material": "^7.0.0", |     "@mui/material": "^7.1.0", | ||||||
|     "@mui/x-charts": "^7.28.0", |     "@mui/x-charts": "^8.3.1", | ||||||
|     "@mui/x-data-grid": "^7.28.1", |     "@mui/x-data-grid": "^8.3.1", | ||||||
|     "date-and-time": "^3.6.0", |     "date-and-time": "^3.6.0", | ||||||
|     "filesize": "^10.1.6", |     "filesize": "^10.1.6", | ||||||
|     "humanize-duration": "^3.29.0", |     "humanize-duration": "^3.32.2", | ||||||
|     "mui-file-input": "^7.0.0", |     "react": "^19.1.0", | ||||||
|     "react": "^19.0.0", |     "react-dom": "^19.1.0", | ||||||
|     "react-dom": "^19.0.0", |     "react-router-dom": "^7.6.0", | ||||||
|     "react-router-dom": "^7.4.0", |  | ||||||
|     "react-syntax-highlighter": "^15.6.1", |     "react-syntax-highlighter": "^15.6.1", | ||||||
|     "react-vnc": "^3.0.7", |     "react-vnc": "^3.1.0", | ||||||
|     "uuid": "^11.1.0", |     "uuid": "^11.1.0", | ||||||
|     "xml-formatter": "^3.6.0" |     "xml-formatter": "^3.6.6" | ||||||
|   }, |   }, | ||||||
|   "devDependencies": { |   "devDependencies": { | ||||||
|     "@eslint/js": "^9.21.0", |     "@eslint/js": "^9.27.0", | ||||||
|     "@types/humanize-duration": "^3.27.1", |     "@types/humanize-duration": "^3.27.4", | ||||||
|     "@types/jest": "^29.5.14", |     "@types/jest": "^29.5.14", | ||||||
|     "@types/react": "^19.0.12", |     "@types/react": "^19.1.5", | ||||||
|     "@types/react-dom": "^19.0.4", |     "@types/react-dom": "^19.1.5", | ||||||
|     "@types/react-syntax-highlighter": "^15.5.13", |     "@types/react-syntax-highlighter": "^15.5.13", | ||||||
|     "@types/uuid": "^10.0.0", |     "@types/uuid": "^10.0.0", | ||||||
|     "@vitejs/plugin-react": "^4.3.4", |     "@vitejs/plugin-react": "^4.4.1", | ||||||
|     "eslint": "^9.21.0", |     "eslint": "^9.27.0", | ||||||
|     "eslint-plugin-react-dom": "^1.38.3", |     "eslint-plugin-react-dom": "^1.49.0", | ||||||
|     "eslint-plugin-react-hooks": "^5.1.0", |     "eslint-plugin-react-hooks": "^5.1.0", | ||||||
|     "eslint-plugin-react-refresh": "^0.4.19", |     "eslint-plugin-react-refresh": "^0.4.20", | ||||||
|     "eslint-plugin-react-x": "^1.38.3", |     "eslint-plugin-react-x": "^1.49.0", | ||||||
|     "globals": "^15.15.0", |     "globals": "^16.1.0", | ||||||
|     "typescript": "^5.8.2", |     "typescript": "^5.8.3", | ||||||
|     "typescript-eslint": "^8.24.1", |     "typescript-eslint": "^8.32.1", | ||||||
|     "vite": "^6.2.3" |     "vite": "^6.3.5" | ||||||
|   } |   } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -5,6 +5,15 @@ export interface IsoFile { | |||||||
|   size: number; |   size: number; | ||||||
| } | } | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * ISO catalog entries | ||||||
|  |  */ | ||||||
|  | export interface ISOCatalogEntry { | ||||||
|  |   name: string; | ||||||
|  |   url: string; | ||||||
|  |   image: string; | ||||||
|  | } | ||||||
|  |  | ||||||
| export class IsoFilesApi { | export class IsoFilesApi { | ||||||
|   /** |   /** | ||||||
|    * Upload a new ISO file to the server |    * Upload a new ISO file to the server | ||||||
| @@ -74,4 +83,23 @@ export class IsoFilesApi { | |||||||
|       uri: `/iso/${file.filename}`, |       uri: `/iso/${file.filename}`, | ||||||
|     }); |     }); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|  |   /** | ||||||
|  |    * Get iso catalog | ||||||
|  |    */ | ||||||
|  |   static async Catalog(): Promise<ISOCatalogEntry[]> { | ||||||
|  |     return ( | ||||||
|  |       await APIClient.exec({ | ||||||
|  |         method: "GET", | ||||||
|  |         uri: "/assets/iso_catalog.json", | ||||||
|  |       }) | ||||||
|  |     ).data; | ||||||
|  |   } | ||||||
|  |  | ||||||
|  |   /** | ||||||
|  |    * Get catalog image URL | ||||||
|  |    */ | ||||||
|  |   static CatalogImageURL(entry: ISOCatalogEntry): string { | ||||||
|  |     return APIClient.backendURL() + entry.image; | ||||||
|  |   } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -217,4 +217,16 @@ export class ServerApi { | |||||||
|       }) |       }) | ||||||
|     ).data; |     ).data; | ||||||
|   } |   } | ||||||
|  |  | ||||||
|  |   /** | ||||||
|  |    * Get host networks bridges list | ||||||
|  |    */ | ||||||
|  |   static async GetNetworksBridgesList(): Promise<string[]> { | ||||||
|  |     return ( | ||||||
|  |       await APIClient.exec({ | ||||||
|  |         method: "GET", | ||||||
|  |         uri: "/server/bridges", | ||||||
|  |       }) | ||||||
|  |     ).data; | ||||||
|  |   } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -17,12 +17,11 @@ export type VMState = | |||||||
|   | "PowerManagementSuspended" |   | "PowerManagementSuspended" | ||||||
|   | "Other"; |   | "Other"; | ||||||
|  |  | ||||||
| export type DiskAllocType = "Sparse" | "Fixed"; | export type VMFileDisk = BaseFileVMDisk & (RawVMDisk | QCow2Disk); | ||||||
|  |  | ||||||
| export interface VMDisk { | export interface BaseFileVMDisk { | ||||||
|   size: number; |   size: number; | ||||||
|   name: string; |   name: string; | ||||||
|   alloc_type: DiskAllocType; |  | ||||||
|   delete: boolean; |   delete: boolean; | ||||||
|  |  | ||||||
|   // application attribute |   // application attribute | ||||||
| @@ -30,6 +29,17 @@ export interface VMDisk { | |||||||
|   deleteType?: "keepfile" | "deletefile"; |   deleteType?: "keepfile" | "deletefile"; | ||||||
| } | } | ||||||
|  |  | ||||||
|  | export type DiskAllocType = "Sparse" | "Fixed"; | ||||||
|  |  | ||||||
|  | interface RawVMDisk { | ||||||
|  |   format: "Raw"; | ||||||
|  |   alloc_type: DiskAllocType; | ||||||
|  | } | ||||||
|  |  | ||||||
|  | interface QCow2Disk { | ||||||
|  |   format: "QCow2"; | ||||||
|  | } | ||||||
|  |  | ||||||
| export interface VMNetInterfaceFilterParams { | export interface VMNetInterfaceFilterParams { | ||||||
|   name: string; |   name: string; | ||||||
|   value: string; |   value: string; | ||||||
| @@ -40,7 +50,11 @@ export interface VMNetInterfaceFilter { | |||||||
|   parameters: VMNetInterfaceFilterParams[]; |   parameters: VMNetInterfaceFilterParams[]; | ||||||
| } | } | ||||||
|  |  | ||||||
| export type VMNetInterface = (VMNetUserspaceSLIRPStack | VMNetDefinedNetwork) & | export type VMNetInterface = ( | ||||||
|  |   | VMNetUserspaceSLIRPStack | ||||||
|  |   | VMNetDefinedNetwork | ||||||
|  |   | VMNetBridge | ||||||
|  | ) & | ||||||
|   VMNetInterfaceBase; |   VMNetInterfaceBase; | ||||||
|  |  | ||||||
| export interface VMNetInterfaceBase { | export interface VMNetInterfaceBase { | ||||||
| @@ -57,6 +71,11 @@ export interface VMNetDefinedNetwork { | |||||||
|   network: string; |   network: string; | ||||||
| } | } | ||||||
|  |  | ||||||
|  | export interface VMNetBridge { | ||||||
|  |   type: "Bridge"; | ||||||
|  |   bridge: string; | ||||||
|  | } | ||||||
|  |  | ||||||
| interface VMInfoInterface { | interface VMInfoInterface { | ||||||
|   name: string; |   name: string; | ||||||
|   uuid?: string; |   uuid?: string; | ||||||
| @@ -70,9 +89,10 @@ interface VMInfoInterface { | |||||||
|   number_vcpu: number; |   number_vcpu: number; | ||||||
|   vnc_access: boolean; |   vnc_access: boolean; | ||||||
|   iso_files: string[]; |   iso_files: string[]; | ||||||
|   disks: VMDisk[]; |   file_disks: VMFileDisk[]; | ||||||
|   networks: VMNetInterface[]; |   networks: VMNetInterface[]; | ||||||
|   tpm_module: boolean; |   tpm_module: boolean; | ||||||
|  |   oem_strings: string[]; | ||||||
| } | } | ||||||
|  |  | ||||||
| export class VMInfo implements VMInfoInterface { | export class VMInfo implements VMInfoInterface { | ||||||
| @@ -88,9 +108,10 @@ export class VMInfo implements VMInfoInterface { | |||||||
|   memory: number; |   memory: number; | ||||||
|   vnc_access: boolean; |   vnc_access: boolean; | ||||||
|   iso_files: string[]; |   iso_files: string[]; | ||||||
|   disks: VMDisk[]; |   file_disks: VMFileDisk[]; | ||||||
|   networks: VMNetInterface[]; |   networks: VMNetInterface[]; | ||||||
|   tpm_module: boolean; |   tpm_module: boolean; | ||||||
|  |   oem_strings: string[]; | ||||||
|  |  | ||||||
|   constructor(int: VMInfoInterface) { |   constructor(int: VMInfoInterface) { | ||||||
|     this.name = int.name; |     this.name = int.name; | ||||||
| @@ -105,9 +126,10 @@ export class VMInfo implements VMInfoInterface { | |||||||
|     this.memory = int.memory; |     this.memory = int.memory; | ||||||
|     this.vnc_access = int.vnc_access; |     this.vnc_access = int.vnc_access; | ||||||
|     this.iso_files = int.iso_files; |     this.iso_files = int.iso_files; | ||||||
|     this.disks = int.disks; |     this.file_disks = int.file_disks; | ||||||
|     this.networks = int.networks; |     this.networks = int.networks; | ||||||
|     this.tpm_module = int.tpm_module; |     this.tpm_module = int.tpm_module; | ||||||
|  |     this.oem_strings = int.oem_strings; | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   static NewEmpty(): VMInfo { |   static NewEmpty(): VMInfo { | ||||||
| @@ -119,9 +141,10 @@ export class VMInfo implements VMInfoInterface { | |||||||
|       number_vcpu: 1, |       number_vcpu: 1, | ||||||
|       vnc_access: true, |       vnc_access: true, | ||||||
|       iso_files: [], |       iso_files: [], | ||||||
|       disks: [], |       file_disks: [], | ||||||
|       networks: [], |       networks: [], | ||||||
|       tpm_module: true, |       tpm_module: true, | ||||||
|  |       oem_strings: [], | ||||||
|     }); |     }); | ||||||
|   } |   } | ||||||
|  |  | ||||||
| @@ -194,8 +217,8 @@ export class VMApi { | |||||||
|    */ |    */ | ||||||
|   static async UpdateSingle(vm: VMInfo): Promise<VMInfo> { |   static async UpdateSingle(vm: VMInfo): Promise<VMInfo> { | ||||||
|     // Process disks list, looking for removal |     // Process disks list, looking for removal | ||||||
|     vm.disks = vm.disks.filter((d) => d.deleteType !== "keepfile"); |     vm.file_disks = vm.file_disks.filter((d) => d.deleteType !== "keepfile"); | ||||||
|     vm.disks.forEach((d) => { |     vm.file_disks.forEach((d) => { | ||||||
|       if (d.deleteType === "deletefile") d.delete = true; |       if (d.deleteType === "deletefile") d.delete = true; | ||||||
|     }); |     }); | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										75
									
								
								virtweb_frontend/src/dialogs/IsoCatalogDialog.tsx
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										75
									
								
								virtweb_frontend/src/dialogs/IsoCatalogDialog.tsx
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,75 @@ | |||||||
|  | import { | ||||||
|  |   Button, | ||||||
|  |   Dialog, | ||||||
|  |   DialogActions, | ||||||
|  |   DialogContent, | ||||||
|  |   DialogTitle, | ||||||
|  |   List, | ||||||
|  |   ListItem, | ||||||
|  |   ListItemAvatar, | ||||||
|  |   ListItemButton, | ||||||
|  |   ListItemText, | ||||||
|  | } from "@mui/material"; | ||||||
|  | import React from "react"; | ||||||
|  | import { ISOCatalogEntry, IsoFilesApi } from "../api/IsoFilesApi"; | ||||||
|  | import { AsyncWidget } from "../widgets/AsyncWidget"; | ||||||
|  |  | ||||||
|  | export function IsoCatalogDialog(p: { | ||||||
|  |   open: boolean; | ||||||
|  |   onClose: () => void; | ||||||
|  | }): React.ReactElement { | ||||||
|  |   const [catalog, setCatalog] = React.useState<ISOCatalogEntry[] | undefined>(); | ||||||
|  |  | ||||||
|  |   const load = async () => { | ||||||
|  |     setCatalog(await IsoFilesApi.Catalog()); | ||||||
|  |   }; | ||||||
|  |  | ||||||
|  |   return ( | ||||||
|  |     <Dialog open={p.open} onClose={p.onClose}> | ||||||
|  |       <DialogTitle>ISO catalog</DialogTitle> | ||||||
|  |       <DialogContent> | ||||||
|  |         <AsyncWidget | ||||||
|  |           loadKey={1} | ||||||
|  |           load={load} | ||||||
|  |           errMsg="Failed to load catalog" | ||||||
|  |           build={() => <IsoCatalogDialogInner catalog={catalog!} />} | ||||||
|  |         /> | ||||||
|  |       </DialogContent> | ||||||
|  |       <DialogActions> | ||||||
|  |         <Button autoFocus onClick={p.onClose}> | ||||||
|  |           Close | ||||||
|  |         </Button> | ||||||
|  |       </DialogActions> | ||||||
|  |     </Dialog> | ||||||
|  |   ); | ||||||
|  | } | ||||||
|  |  | ||||||
|  | export function IsoCatalogDialogInner(p: { | ||||||
|  |   catalog: ISOCatalogEntry[]; | ||||||
|  | }): React.ReactElement { | ||||||
|  |   return ( | ||||||
|  |     <List dense> | ||||||
|  |       {p.catalog.map((entry) => ( | ||||||
|  |         <a | ||||||
|  |           key={entry.name} | ||||||
|  |           href={entry.url} | ||||||
|  |           target="_blank" | ||||||
|  |           rel="noopener" | ||||||
|  |           style={{ color: "inherit", textDecoration: "none" }} | ||||||
|  |         > | ||||||
|  |           <ListItem> | ||||||
|  |             <ListItemButton> | ||||||
|  |               <ListItemAvatar> | ||||||
|  |                 <img | ||||||
|  |                   src={IsoFilesApi.CatalogImageURL(entry)} | ||||||
|  |                   style={{ width: "2em" }} | ||||||
|  |                 /> | ||||||
|  |               </ListItemAvatar> | ||||||
|  |               <ListItemText primary={entry.name} /> | ||||||
|  |             </ListItemButton> | ||||||
|  |           </ListItem> | ||||||
|  |         </a> | ||||||
|  |       ))} | ||||||
|  |     </List> | ||||||
|  |   ); | ||||||
|  | } | ||||||
| @@ -1,4 +1,7 @@ | |||||||
| import DeleteIcon from "@mui/icons-material/Delete"; | import DeleteIcon from "@mui/icons-material/Delete"; | ||||||
|  | import DownloadIcon from "@mui/icons-material/Download"; | ||||||
|  | import MenuBookIcon from "@mui/icons-material/MenuBook"; | ||||||
|  | import RefreshIcon from "@mui/icons-material/Refresh"; | ||||||
| import { | import { | ||||||
|   Alert, |   Alert, | ||||||
|   Button, |   Button, | ||||||
| @@ -9,24 +12,25 @@ import { | |||||||
|   Tooltip, |   Tooltip, | ||||||
|   Typography, |   Typography, | ||||||
| } from "@mui/material"; | } from "@mui/material"; | ||||||
| import DownloadIcon from "@mui/icons-material/Download"; |  | ||||||
| import { DataGrid, GridColDef } from "@mui/x-data-grid"; | import { DataGrid, GridColDef } from "@mui/x-data-grid"; | ||||||
| import { filesize } from "filesize"; | import { filesize } from "filesize"; | ||||||
| import { MuiFileInput } from "mui-file-input"; |  | ||||||
| import React from "react"; | import React from "react"; | ||||||
| import { IsoFile, IsoFilesApi } from "../api/IsoFilesApi"; | import { IsoFile, IsoFilesApi } from "../api/IsoFilesApi"; | ||||||
| import { ServerApi } from "../api/ServerApi"; | import { ServerApi } from "../api/ServerApi"; | ||||||
|  | import { IsoCatalogDialog } from "../dialogs/IsoCatalogDialog"; | ||||||
| import { useAlert } from "../hooks/providers/AlertDialogProvider"; | import { useAlert } from "../hooks/providers/AlertDialogProvider"; | ||||||
|  | import { useConfirm } from "../hooks/providers/ConfirmDialogProvider"; | ||||||
| import { useLoadingMessage } from "../hooks/providers/LoadingMessageProvider"; | import { useLoadingMessage } from "../hooks/providers/LoadingMessageProvider"; | ||||||
| import { useSnackbar } from "../hooks/providers/SnackbarProvider"; | import { useSnackbar } from "../hooks/providers/SnackbarProvider"; | ||||||
|  | import { downloadBlob } from "../utils/FilesUtils"; | ||||||
| import { AsyncWidget } from "../widgets/AsyncWidget"; | import { AsyncWidget } from "../widgets/AsyncWidget"; | ||||||
|  | import { FileInput } from "../widgets/forms/FileInput"; | ||||||
| import { VirtWebPaper } from "../widgets/VirtWebPaper"; | import { VirtWebPaper } from "../widgets/VirtWebPaper"; | ||||||
| import { VirtWebRouteContainer } from "../widgets/VirtWebRouteContainer"; | import { VirtWebRouteContainer } from "../widgets/VirtWebRouteContainer"; | ||||||
| import { useConfirm } from "../hooks/providers/ConfirmDialogProvider"; |  | ||||||
| import { downloadBlob } from "../utils/FilesUtils"; |  | ||||||
|  |  | ||||||
| export function IsoFilesRoute(): React.ReactElement { | export function IsoFilesRoute(): React.ReactElement { | ||||||
|   const [list, setList] = React.useState<IsoFile[] | undefined>(); |   const [list, setList] = React.useState<IsoFile[] | undefined>(); | ||||||
|  |   const [isoCatalog, setIsoCatalog] = React.useState(false); | ||||||
|  |  | ||||||
|   const loadKey = React.useRef(1); |   const loadKey = React.useRef(1); | ||||||
|  |  | ||||||
| @@ -40,19 +44,41 @@ export function IsoFilesRoute(): React.ReactElement { | |||||||
|   }; |   }; | ||||||
|  |  | ||||||
|   return ( |   return ( | ||||||
|     <AsyncWidget |     <> | ||||||
|       loadKey={loadKey.current} |       <AsyncWidget | ||||||
|       errMsg="Failed to load ISO files list!" |         loadKey={loadKey.current} | ||||||
|       load={load} |         errMsg="Failed to load ISO files list!" | ||||||
|       ready={list !== undefined} |         load={load} | ||||||
|       build={() => ( |         ready={list !== undefined} | ||||||
|         <VirtWebRouteContainer label="ISO files management"> |         build={() => ( | ||||||
|           <UploadIsoFileCard onFileUploaded={reload} /> |           <VirtWebRouteContainer | ||||||
|           <UploadIsoFileFromUrlCard onFileUploaded={reload} /> |             label="ISO files management" | ||||||
|           <IsoFilesList list={list!} onReload={reload} /> |             actions={ | ||||||
|         </VirtWebRouteContainer> |               <span> | ||||||
|       )} |                 <Tooltip title="Open the ISO catalog"> | ||||||
|     /> |                   <IconButton onClick={() => { setIsoCatalog(true); }}> | ||||||
|  |                     <MenuBookIcon /> | ||||||
|  |                   </IconButton> | ||||||
|  |                 </Tooltip> | ||||||
|  |                 <Tooltip title="Refresh ISO list"> | ||||||
|  |                   <IconButton onClick={reload}> | ||||||
|  |                     <RefreshIcon /> | ||||||
|  |                   </IconButton> | ||||||
|  |                 </Tooltip> | ||||||
|  |               </span> | ||||||
|  |             } | ||||||
|  |           > | ||||||
|  |             <UploadIsoFileCard onFileUploaded={reload} /> | ||||||
|  |             <UploadIsoFileFromUrlCard onFileUploaded={reload} /> | ||||||
|  |             <IsoFilesList list={list!} onReload={reload} /> | ||||||
|  |           </VirtWebRouteContainer> | ||||||
|  |         )} | ||||||
|  |       /> | ||||||
|  |       <IsoCatalogDialog | ||||||
|  |         open={isoCatalog} | ||||||
|  |         onClose={() => { setIsoCatalog(false); }} | ||||||
|  |       /> | ||||||
|  |     </> | ||||||
|   ); |   ); | ||||||
| } | } | ||||||
|  |  | ||||||
| @@ -104,7 +130,7 @@ function UploadIsoFileCard(p: { | |||||||
|  |  | ||||||
|   if (uploadProgress !== null) { |   if (uploadProgress !== null) { | ||||||
|     return ( |     return ( | ||||||
|       <VirtWebPaper label="File upload"> |       <VirtWebPaper label="File upload" noHorizontalMargin> | ||||||
|         <Typography variant="body1"> |         <Typography variant="body1"> | ||||||
|           Upload in progress ({Math.floor(uploadProgress * 100)}%)... |           Upload in progress ({Math.floor(uploadProgress * 100)}%)... | ||||||
|         </Typography> |         </Typography> | ||||||
| @@ -114,9 +140,9 @@ function UploadIsoFileCard(p: { | |||||||
|   } |   } | ||||||
|  |  | ||||||
|   return ( |   return ( | ||||||
|     <VirtWebPaper label="File upload"> |     <VirtWebPaper label="File upload" noHorizontalMargin> | ||||||
|       <div style={{ display: "flex", alignItems: "center" }}> |       <div style={{ display: "flex", alignItems: "center" }}> | ||||||
|         <MuiFileInput |         <FileInput | ||||||
|           value={value} |           value={value} | ||||||
|           onChange={handleChange} |           onChange={handleChange} | ||||||
|           style={{ flex: 1 }} |           style={{ flex: 1 }} | ||||||
| @@ -162,7 +188,7 @@ function UploadIsoFileFromUrlCard(p: { | |||||||
|   }; |   }; | ||||||
|  |  | ||||||
|   return ( |   return ( | ||||||
|     <VirtWebPaper label="File upload from URL"> |     <VirtWebPaper label="File upload from URL" noHorizontalMargin> | ||||||
|       <div style={{ display: "flex", alignItems: "center" }}> |       <div style={{ display: "flex", alignItems: "center" }}> | ||||||
|         <TextField |         <TextField | ||||||
|           label="URL" |           label="URL" | ||||||
| @@ -279,38 +305,31 @@ function IsoFilesList(p: { | |||||||
|  |  | ||||||
|   return ( |   return ( | ||||||
|     <> |     <> | ||||||
|       <VirtWebPaper label="Files list"> |       {/* Download notification */} | ||||||
|         {/* Download notification */} |       {dlProgress !== undefined && ( | ||||||
|         {dlProgress !== undefined && ( |         <Alert severity="info"> | ||||||
|           <Alert severity="info"> |           <div | ||||||
|             <div |             style={{ | ||||||
|               style={{ |               display: "flex", | ||||||
|                 display: "flex", |               flexDirection: "row", | ||||||
|                 flexDirection: "row", |               alignItems: "center", | ||||||
|                 alignItems: "center", |               overflow: "hidden", | ||||||
|                 overflow: "hidden", |             }} | ||||||
|               }} |           > | ||||||
|             > |             <Typography variant="body1"> | ||||||
|               <Typography variant="body1"> |               Downloading... {dlProgress}% | ||||||
|                 Downloading... {dlProgress}% |             </Typography> | ||||||
|               </Typography> |             <CircularProgress | ||||||
|               <CircularProgress |               variant="determinate" | ||||||
|                 variant="determinate" |               size={"1.5rem"} | ||||||
|                 size={"1.5rem"} |               style={{ marginLeft: "10px" }} | ||||||
|                 style={{ marginLeft: "10px" }} |               value={dlProgress} | ||||||
|                 value={dlProgress} |             /> | ||||||
|               /> |           </div> | ||||||
|             </div> |         </Alert> | ||||||
|           </Alert> |       )} | ||||||
|         )} |       {/* ISO files list table */} | ||||||
|  |       <DataGrid getRowId={(c) => c.filename} rows={p.list} columns={columns} /> | ||||||
|         {/* Files list table */} |  | ||||||
|         <DataGrid |  | ||||||
|           getRowId={(c) => c.filename} |  | ||||||
|           rows={p.list} |  | ||||||
|           columns={columns} |  | ||||||
|         /> |  | ||||||
|       </VirtWebPaper> |  | ||||||
|     </> |     </> | ||||||
|   ); |   ); | ||||||
| } | } | ||||||
|   | |||||||
| @@ -13,7 +13,7 @@ import { | |||||||
|   List, |   List, | ||||||
|   ListItemButton, |   ListItemButton, | ||||||
|   ListItemIcon, |   ListItemIcon, | ||||||
|   ListItemText |   ListItemText, | ||||||
| } from "@mui/material"; | } from "@mui/material"; | ||||||
| import { Outlet, useLocation } from "react-router-dom"; | import { Outlet, useLocation } from "react-router-dom"; | ||||||
| import { RouterLink } from "./RouterLink"; | import { RouterLink } from "./RouterLink"; | ||||||
| @@ -82,7 +82,15 @@ export function BaseAuthenticatedPage(): React.ReactElement { | |||||||
|             icon={<Icon path={mdiInformation} size={1} />} |             icon={<Icon path={mdiInformation} size={1} />} | ||||||
|           /> |           /> | ||||||
|         </List> |         </List> | ||||||
|         <div style={{ flex: 1 }}> |         <div | ||||||
|  |           style={{ | ||||||
|  |             flexGrow: 1, | ||||||
|  |             flexShrink: 0, | ||||||
|  |             flexBasis: 0, | ||||||
|  |             minWidth: 0, | ||||||
|  |             display: "flex", | ||||||
|  |           }} | ||||||
|  |         > | ||||||
|           <Outlet /> |           <Outlet /> | ||||||
|         </div> |         </div> | ||||||
|       </Box> |       </Box> | ||||||
|   | |||||||
| @@ -2,10 +2,19 @@ import { Paper, Typography } from "@mui/material"; | |||||||
| import React, { PropsWithChildren } from "react"; | import React, { PropsWithChildren } from "react"; | ||||||
|  |  | ||||||
| export function VirtWebPaper( | export function VirtWebPaper( | ||||||
|   p: { label: string | React.ReactElement } & PropsWithChildren |   p: { | ||||||
|  |     label: string | React.ReactElement; | ||||||
|  |     noHorizontalMargin?: boolean; | ||||||
|  |   } & PropsWithChildren | ||||||
| ): React.ReactElement { | ): React.ReactElement { | ||||||
|   return ( |   return ( | ||||||
|     <Paper elevation={2} style={{ padding: "10px", margin: "20px" }}> |     <Paper | ||||||
|  |       elevation={2} | ||||||
|  |       style={{ | ||||||
|  |         padding: "10px", | ||||||
|  |         margin: p.noHorizontalMargin ? "20px 0px" : "20px", | ||||||
|  |       }} | ||||||
|  |     > | ||||||
|       <Typography |       <Typography | ||||||
|         variant="subtitle1" |         variant="subtitle1" | ||||||
|         style={{ marginBottom: "10px", fontWeight: "bold" }} |         style={{ marginBottom: "10px", fontWeight: "bold" }} | ||||||
|   | |||||||
| @@ -8,7 +8,18 @@ export function VirtWebRouteContainer( | |||||||
|   } & PropsWithChildren |   } & PropsWithChildren | ||||||
| ): React.ReactElement { | ): React.ReactElement { | ||||||
|   return ( |   return ( | ||||||
|     <div style={{ margin: "50px" }}> |     <div | ||||||
|  |       style={{ | ||||||
|  |         margin: "50px", | ||||||
|  |         flex: "1", | ||||||
|  |         flexGrow: 1, | ||||||
|  |         flexShrink: 0, | ||||||
|  |         flexBasis: 0, | ||||||
|  |         minWidth: 0, | ||||||
|  |         display: "flex", | ||||||
|  |         flexDirection: "column", | ||||||
|  |       }} | ||||||
|  |     > | ||||||
|       <div |       <div | ||||||
|         style={{ |         style={{ | ||||||
|           display: "flex", |           display: "flex", | ||||||
|   | |||||||
							
								
								
									
										77
									
								
								virtweb_frontend/src/widgets/forms/FileInput.tsx
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										77
									
								
								virtweb_frontend/src/widgets/forms/FileInput.tsx
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,77 @@ | |||||||
|  | import AttachFileIcon from "@mui/icons-material/AttachFile"; | ||||||
|  | import ClearIcon from "@mui/icons-material/Clear"; | ||||||
|  | import { | ||||||
|  |   IconButton, | ||||||
|  |   InputAdornment, | ||||||
|  |   OutlinedInputProps, | ||||||
|  |   TextField, | ||||||
|  |   TextFieldSlotsAndSlotProps, | ||||||
|  |   Tooltip, | ||||||
|  | } from "@mui/material"; | ||||||
|  | import { filesize } from "filesize"; | ||||||
|  | import React from "react"; | ||||||
|  |  | ||||||
|  | export function FileInput( | ||||||
|  |   p: { | ||||||
|  |     label?: string; | ||||||
|  |     value: File | null; | ||||||
|  |     onChange: (file: File | null) => void; | ||||||
|  |     style?: React.CSSProperties; | ||||||
|  |   } & TextFieldSlotsAndSlotProps<OutlinedInputProps> | ||||||
|  | ): React.ReactElement { | ||||||
|  |   const fileInput = React.useRef<HTMLInputElement>(null); | ||||||
|  |  | ||||||
|  |   return ( | ||||||
|  |     <TextField | ||||||
|  |       onClick={() => fileInput.current?.click()} | ||||||
|  |       {...p} | ||||||
|  |       value={""} | ||||||
|  |       onChange={console.log} | ||||||
|  |       type="file" | ||||||
|  |       slotProps={{ | ||||||
|  |         input: { | ||||||
|  |           startAdornment: ( | ||||||
|  |             <> | ||||||
|  |               <InputAdornment position="start"> | ||||||
|  |                 <AttachFileIcon /> | ||||||
|  |                    | ||||||
|  |                 {p.value ? p.value.name : "Insert a file"} | ||||||
|  |               </InputAdornment> | ||||||
|  |             </> | ||||||
|  |           ), | ||||||
|  |           endAdornment: p.value ? ( | ||||||
|  |             <InputAdornment position="end"> | ||||||
|  |               {filesize(p.value.size)} | ||||||
|  |               <Tooltip | ||||||
|  |                 title="Remove attached file" | ||||||
|  |                 onClick={(e) => { | ||||||
|  |                   e.stopPropagation(); | ||||||
|  |                 }} | ||||||
|  |               > | ||||||
|  |                 <IconButton | ||||||
|  |                   onClick={(e) => { | ||||||
|  |                     e.stopPropagation(); | ||||||
|  |                     p.onChange(null); | ||||||
|  |                   }} | ||||||
|  |                 > | ||||||
|  |                   <ClearIcon /> | ||||||
|  |                 </IconButton> | ||||||
|  |               </Tooltip> | ||||||
|  |             </InputAdornment> | ||||||
|  |           ) : undefined, | ||||||
|  |  | ||||||
|  |           onChange: (e) => { | ||||||
|  |             const files = (e.target as any).files; | ||||||
|  |             p.onChange(files.length > 0 ? files[0] : null); | ||||||
|  |           }, | ||||||
|  |         }, | ||||||
|  |         htmlInput: { | ||||||
|  |           ref: fileInput, | ||||||
|  |           style: { opacity: 0 }, | ||||||
|  |         }, | ||||||
|  |       }} | ||||||
|  |       placeholder={"Insert a file"} | ||||||
|  |       variant="outlined" | ||||||
|  |     /> | ||||||
|  |   ); | ||||||
|  | } | ||||||
							
								
								
									
										89
									
								
								virtweb_frontend/src/widgets/forms/OEMStringFormWidget.tsx
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										89
									
								
								virtweb_frontend/src/widgets/forms/OEMStringFormWidget.tsx
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,89 @@ | |||||||
|  | /* eslint-disable react-x/no-array-index-key */ | ||||||
|  | import AddIcon from "@mui/icons-material/Add"; | ||||||
|  | import ClearIcon from "@mui/icons-material/Clear"; | ||||||
|  | import { | ||||||
|  |   Alert, | ||||||
|  |   IconButton, | ||||||
|  |   InputAdornment, | ||||||
|  |   TextField, | ||||||
|  |   Tooltip, | ||||||
|  | } from "@mui/material"; | ||||||
|  | import { VMInfo } from "../../api/VMApi"; | ||||||
|  | import { useConfirm } from "../../hooks/providers/ConfirmDialogProvider"; | ||||||
|  | import { EditSection } from "./EditSection"; | ||||||
|  |  | ||||||
|  | export function OEMStringFormWidget(p: { | ||||||
|  |   vm: VMInfo; | ||||||
|  |   editable: boolean; | ||||||
|  |   onChange?: () => void; | ||||||
|  | }): React.ReactElement { | ||||||
|  |   const confirm = useConfirm(); | ||||||
|  |  | ||||||
|  |   const handleDeleteOEMString = async (num: number) => { | ||||||
|  |     if (!(await confirm("Do you really want to delete this entry?"))) return; | ||||||
|  |     p.vm.oem_strings.splice(num, 1); | ||||||
|  |     p.onChange?.(); | ||||||
|  |   }; | ||||||
|  |  | ||||||
|  |   return ( | ||||||
|  |     <EditSection | ||||||
|  |       title="SMBIOS OEM Strings" | ||||||
|  |       actions={ | ||||||
|  |         p.editable ? ( | ||||||
|  |           <Tooltip title="Add a new string entry"> | ||||||
|  |             <IconButton | ||||||
|  |               onClick={() => { | ||||||
|  |                 p.vm.oem_strings.push(""); | ||||||
|  |                 p.onChange?.(); | ||||||
|  |               }} | ||||||
|  |             > | ||||||
|  |               <AddIcon /> | ||||||
|  |             </IconButton> | ||||||
|  |           </Tooltip> | ||||||
|  |         ) : ( | ||||||
|  |           <></> | ||||||
|  |         ) | ||||||
|  |       } | ||||||
|  |     > | ||||||
|  |       <Alert severity="info"> | ||||||
|  |         You can use the{" "} | ||||||
|  |         <a | ||||||
|  |           href="https://www.nongnu.org/dmidecode/" | ||||||
|  |           target="_blank" | ||||||
|  |           rel="noreferrer noopener" | ||||||
|  |           style={{ color: "inherit" }} | ||||||
|  |         > | ||||||
|  |           <i>dmidecode</i> | ||||||
|  |         </a>{" "} | ||||||
|  |         tool on Linux to extract these strings on the guest. | ||||||
|  |       </Alert> | ||||||
|  |  | ||||||
|  |       {p.vm.oem_strings.map((s, num) => ( | ||||||
|  |         <TextField | ||||||
|  |           key={num} | ||||||
|  |           fullWidth | ||||||
|  |           disabled={!p.editable} | ||||||
|  |           value={s} | ||||||
|  |           onChange={(e) => { | ||||||
|  |             p.vm.oem_strings[num] = e.target.value; | ||||||
|  |             p.onChange?.(); | ||||||
|  |           }} | ||||||
|  |           style={{ marginTop: "5px" }} | ||||||
|  |           slotProps={{ | ||||||
|  |             input: { | ||||||
|  |               endAdornment: p.editable ? ( | ||||||
|  |                 <InputAdornment position="end"> | ||||||
|  |                   <Tooltip title="Remove entry"> | ||||||
|  |                     <IconButton onClick={() => handleDeleteOEMString(num)}> | ||||||
|  |                       <ClearIcon /> | ||||||
|  |                     </IconButton> | ||||||
|  |                   </Tooltip> | ||||||
|  |                 </InputAdornment> | ||||||
|  |               ) : undefined, | ||||||
|  |             }, | ||||||
|  |           }} | ||||||
|  |         /> | ||||||
|  |       ))} | ||||||
|  |     </EditSection> | ||||||
|  |   ); | ||||||
|  | } | ||||||
| @@ -14,7 +14,7 @@ import { | |||||||
| } from "@mui/material"; | } from "@mui/material"; | ||||||
| import { filesize } from "filesize"; | import { filesize } from "filesize"; | ||||||
| import { ServerApi } from "../../api/ServerApi"; | import { ServerApi } from "../../api/ServerApi"; | ||||||
| import { VMDisk, VMInfo } from "../../api/VMApi"; | import { VMFileDisk, VMInfo } from "../../api/VMApi"; | ||||||
| import { useConfirm } from "../../hooks/providers/ConfirmDialogProvider"; | import { useConfirm } from "../../hooks/providers/ConfirmDialogProvider"; | ||||||
| import { SelectInput } from "./SelectInput"; | import { SelectInput } from "./SelectInput"; | ||||||
| import { TextInput } from "./TextInput"; | import { TextInput } from "./TextInput"; | ||||||
| @@ -25,11 +25,11 @@ export function VMDisksList(p: { | |||||||
|   editable: boolean; |   editable: boolean; | ||||||
| }): React.ReactElement { | }): React.ReactElement { | ||||||
|   const addNewDisk = () => { |   const addNewDisk = () => { | ||||||
|     p.vm.disks.push({ |     p.vm.file_disks.push({ | ||||||
|       alloc_type: "Sparse", |       format: "QCow2", | ||||||
|       size: 10000, |       size: 10000, | ||||||
|       delete: false, |       delete: false, | ||||||
|       name: `disk${p.vm.disks.length}`, |       name: `disk${p.vm.file_disks.length}`, | ||||||
|       new: true, |       new: true, | ||||||
|     }); |     }); | ||||||
|     p.onChange?.(); |     p.onChange?.(); | ||||||
| @@ -38,7 +38,7 @@ export function VMDisksList(p: { | |||||||
|   return ( |   return ( | ||||||
|     <> |     <> | ||||||
|       {/* disks list */} |       {/* disks list */} | ||||||
|       {p.vm.disks.map((d, num) => ( |       {p.vm.file_disks.map((d, num) => ( | ||||||
|         <DiskInfo |         <DiskInfo | ||||||
|           // eslint-disable-next-line react-x/no-array-index-key |           // eslint-disable-next-line react-x/no-array-index-key | ||||||
|           key={num} |           key={num} | ||||||
| @@ -46,7 +46,7 @@ export function VMDisksList(p: { | |||||||
|           disk={d} |           disk={d} | ||||||
|           onChange={p.onChange} |           onChange={p.onChange} | ||||||
|           removeFromList={() => { |           removeFromList={() => { | ||||||
|             p.vm.disks.splice(num, 1); |             p.vm.file_disks.splice(num, 1); | ||||||
|             p.onChange?.(); |             p.onChange?.(); | ||||||
|           }} |           }} | ||||||
|         /> |         /> | ||||||
| @@ -59,7 +59,7 @@ export function VMDisksList(p: { | |||||||
|  |  | ||||||
| function DiskInfo(p: { | function DiskInfo(p: { | ||||||
|   editable: boolean; |   editable: boolean; | ||||||
|   disk: VMDisk; |   disk: VMFileDisk; | ||||||
|   onChange?: () => void; |   onChange?: () => void; | ||||||
|   removeFromList: () => void; |   removeFromList: () => void; | ||||||
| }): React.ReactElement { | }): React.ReactElement { | ||||||
| @@ -126,25 +126,30 @@ function DiskInfo(p: { | |||||||
|             </> |             </> | ||||||
|           } |           } | ||||||
|           secondary={`${filesize(p.disk.size * 1000 * 1000)} - ${ |           secondary={`${filesize(p.disk.size * 1000 * 1000)} - ${ | ||||||
|             p.disk.alloc_type |             p.disk.format | ||||||
|           }`} |           }${p.disk.format == "Raw" ? " - " + p.disk.alloc_type : ""}`} | ||||||
|         /> |         /> | ||||||
|       </ListItem> |       </ListItem> | ||||||
|     ); |     ); | ||||||
|  |  | ||||||
|   return ( |   return ( | ||||||
|     <Paper elevation={3} style={{ margin: "10px", padding: "10px" }}> |     <Paper elevation={3} style={{ margin: "10px", padding: "10px" }}> | ||||||
|       <TextInput |       <div style={{ display: "flex", justifyContent: "space-between" }}> | ||||||
|         editable={true} |         <TextInput | ||||||
|         label="Disk name" |           editable={true} | ||||||
|         size={ServerApi.Config.constraints.disk_name_size} |           label="Disk name" | ||||||
|         checkValue={(v) => /^[a-zA-Z0-9]+$/.test(v)} |           size={ServerApi.Config.constraints.disk_name_size} | ||||||
|         value={p.disk.name} |           checkValue={(v) => /^[a-zA-Z0-9]+$/.test(v)} | ||||||
|         onValueChange={(v) => { |           value={p.disk.name} | ||||||
|           p.disk.name = v ?? ""; |           onValueChange={(v) => { | ||||||
|           p.onChange?.(); |             p.disk.name = v ?? ""; | ||||||
|         }} |             p.onChange?.(); | ||||||
|       /> |           }} | ||||||
|  |         /> | ||||||
|  |         <IconButton onClick={p.removeFromList}> | ||||||
|  |           <DeleteIcon /> | ||||||
|  |         </IconButton> | ||||||
|  |       </div> | ||||||
|  |  | ||||||
|       <TextInput |       <TextInput | ||||||
|         editable={true} |         editable={true} | ||||||
| @@ -158,7 +163,21 @@ function DiskInfo(p: { | |||||||
|         type="number" |         type="number" | ||||||
|       /> |       /> | ||||||
|  |  | ||||||
|       <div style={{ display: "flex", justifyContent: "space-between" }}> |       <SelectInput | ||||||
|  |         editable={true} | ||||||
|  |         label="Disk format" | ||||||
|  |         options={[ | ||||||
|  |           { label: "Raw file", value: "Raw" }, | ||||||
|  |           { label: "QCow2", value: "QCow2" }, | ||||||
|  |         ]} | ||||||
|  |         value={p.disk.format} | ||||||
|  |         onValueChange={(v) => { | ||||||
|  |           p.disk.format = v as any; | ||||||
|  |           p.onChange?.(); | ||||||
|  |         }} | ||||||
|  |       /> | ||||||
|  |  | ||||||
|  |       {p.disk.format === "Raw" && ( | ||||||
|         <SelectInput |         <SelectInput | ||||||
|           editable={true} |           editable={true} | ||||||
|           label="File allocation type" |           label="File allocation type" | ||||||
| @@ -168,15 +187,11 @@ function DiskInfo(p: { | |||||||
|           ]} |           ]} | ||||||
|           value={p.disk.alloc_type} |           value={p.disk.alloc_type} | ||||||
|           onValueChange={(v) => { |           onValueChange={(v) => { | ||||||
|             p.disk.alloc_type = v as any; |             if (p.disk.format === "Raw") p.disk.alloc_type = v as any; | ||||||
|             p.onChange?.(); |             p.onChange?.(); | ||||||
|           }} |           }} | ||||||
|         /> |         /> | ||||||
|  |       )} | ||||||
|         <IconButton onClick={p.removeFromList}> |  | ||||||
|           <DeleteIcon /> |  | ||||||
|         </IconButton> |  | ||||||
|       </div> |  | ||||||
|     </Paper> |     </Paper> | ||||||
|   ); |   ); | ||||||
| } | } | ||||||
|   | |||||||
| @@ -29,6 +29,7 @@ export function VMNetworksList(p: { | |||||||
|   onChange?: () => void; |   onChange?: () => void; | ||||||
|   editable: boolean; |   editable: boolean; | ||||||
|   networksList: NetworkInfo[]; |   networksList: NetworkInfo[]; | ||||||
|  |   bridgesList: string[]; | ||||||
|   networkFiltersList: NWFilter[]; |   networkFiltersList: NWFilter[]; | ||||||
| }): React.ReactElement { | }): React.ReactElement { | ||||||
|   const addNew = () => { |   const addNew = () => { | ||||||
| @@ -72,6 +73,7 @@ function NetworkInfoWidget(p: { | |||||||
|   onChange?: () => void; |   onChange?: () => void; | ||||||
|   removeFromList: () => void; |   removeFromList: () => void; | ||||||
|   networksList: NetworkInfo[]; |   networksList: NetworkInfo[]; | ||||||
|  |   bridgesList: string[]; | ||||||
|   networkFiltersList: NWFilter[]; |   networkFiltersList: NWFilter[]; | ||||||
| }): React.ReactElement { | }): React.ReactElement { | ||||||
|   const confirm = useConfirm(); |   const confirm = useConfirm(); | ||||||
| @@ -130,6 +132,11 @@ function NetworkInfoWidget(p: { | |||||||
|                     value: "DefinedNetwork", |                     value: "DefinedNetwork", | ||||||
|                     description: "Attach to a defined network", |                     description: "Attach to a defined network", | ||||||
|                   }, |                   }, | ||||||
|  |                   { | ||||||
|  |                     label: "Host bridge", | ||||||
|  |                     value: "Bridge", | ||||||
|  |                     description: "Attach to an host's bridge", | ||||||
|  |                   }, | ||||||
|                 ]} |                 ]} | ||||||
|               /> |               /> | ||||||
|             ) : ( |             ) : ( | ||||||
| @@ -149,31 +156,53 @@ function NetworkInfoWidget(p: { | |||||||
|           }} |           }} | ||||||
|         /> |         /> | ||||||
|  |  | ||||||
|  |         {/* Defined network selection */} | ||||||
|         {p.network.type === "DefinedNetwork" && ( |         {p.network.type === "DefinedNetwork" && ( | ||||||
|  |           <SelectInput | ||||||
|  |             editable={p.editable} | ||||||
|  |             label="Defined network" | ||||||
|  |             options={p.networksList.map((n) => { | ||||||
|  |               const chars = [n.forward_mode.toString()]; | ||||||
|  |               if (n.ip_v4) chars.push("IPv4"); | ||||||
|  |               if (n.ip_v6) chars.push("IPv6"); | ||||||
|  |               if (n.description) chars.push(n.description); | ||||||
|  |  | ||||||
|  |               return { | ||||||
|  |                 label: n.name, | ||||||
|  |                 value: n.name, | ||||||
|  |                 description: chars.join(" - "), | ||||||
|  |               }; | ||||||
|  |             })} | ||||||
|  |             value={p.network.network} | ||||||
|  |             onValueChange={(v) => { | ||||||
|  |               if (p.network.type === "DefinedNetwork") | ||||||
|  |                 p.network.network = v as any; | ||||||
|  |               p.onChange?.(); | ||||||
|  |             }} | ||||||
|  |           /> | ||||||
|  |         )} | ||||||
|  |  | ||||||
|  |         {/* Bridge selection */} | ||||||
|  |         {p.network.type === "Bridge" && ( | ||||||
|  |           <SelectInput | ||||||
|  |             editable={p.editable} | ||||||
|  |             label="Host bridge" | ||||||
|  |             options={p.bridgesList.map((n) => { | ||||||
|  |               return { | ||||||
|  |                 label: n, | ||||||
|  |                 value: n, | ||||||
|  |               }; | ||||||
|  |             })} | ||||||
|  |             value={p.network.bridge} | ||||||
|  |             onValueChange={(v) => { | ||||||
|  |               if (p.network.type === "Bridge") p.network.bridge = v as any; | ||||||
|  |               p.onChange?.(); | ||||||
|  |             }} | ||||||
|  |           /> | ||||||
|  |         )} | ||||||
|  |  | ||||||
|  |         {p.network.type !== "UserspaceSLIRPStack" && ( | ||||||
|           <> |           <> | ||||||
|             <SelectInput |  | ||||||
|               editable={p.editable} |  | ||||||
|               label="Defined network" |  | ||||||
|               options={p.networksList.map((n) => { |  | ||||||
|                 const chars = [n.forward_mode.toString()]; |  | ||||||
|                 if (n.ip_v4) chars.push("IPv4"); |  | ||||||
|                 if (n.ip_v6) chars.push("IPv6"); |  | ||||||
|                 if (n.description) chars.push(n.description); |  | ||||||
|  |  | ||||||
|                 return { |  | ||||||
|                   label: n.name, |  | ||||||
|                   value: n.name, |  | ||||||
|                   description: chars.join(" - "), |  | ||||||
|                 }; |  | ||||||
|               })} |  | ||||||
|               value={p.network.network} |  | ||||||
|               onValueChange={(v) => { |  | ||||||
|                 if (p.network.type === "DefinedNetwork") |  | ||||||
|                   p.network.network = v as any; |  | ||||||
|                 p.onChange?.(); |  | ||||||
|               }} |  | ||||||
|             /> |  | ||||||
|  |  | ||||||
|             {/* Network Filter */} |             {/* Network Filter */} | ||||||
|             <NWFilterSelectInput |             <NWFilterSelectInput | ||||||
|               editable={p.editable} |               editable={p.editable} | ||||||
|   | |||||||
| @@ -725,6 +725,11 @@ export function TokenRightsEditor(p: { | |||||||
|           right={{ verb: "GET", path: "/api/server/networks" }} |           right={{ verb: "GET", path: "/api/server/networks" }} | ||||||
|           label="Get list of network cards" |           label="Get list of network cards" | ||||||
|         /> |         /> | ||||||
|  |         <RouteRight | ||||||
|  |           {...p} | ||||||
|  |           right={{ verb: "GET", path: "/api/server/bridges" }} | ||||||
|  |           label="Get list of network bridges" | ||||||
|  |         /> | ||||||
|       </RightsSection> |       </RightsSection> | ||||||
|     </> |     </> | ||||||
|   ); |   ); | ||||||
|   | |||||||
| @@ -19,6 +19,7 @@ import { TabsWidget } from "../TabsWidget"; | |||||||
| import { XMLAsyncWidget } from "../XMLWidget"; | import { XMLAsyncWidget } from "../XMLWidget"; | ||||||
| import { CheckboxInput } from "../forms/CheckboxInput"; | import { CheckboxInput } from "../forms/CheckboxInput"; | ||||||
| import { EditSection } from "../forms/EditSection"; | import { EditSection } from "../forms/EditSection"; | ||||||
|  | import { OEMStringFormWidget } from "../forms/OEMStringFormWidget"; | ||||||
| import { ResAutostartInput } from "../forms/ResAutostartInput"; | import { ResAutostartInput } from "../forms/ResAutostartInput"; | ||||||
| import { SelectInput } from "../forms/SelectInput"; | import { SelectInput } from "../forms/SelectInput"; | ||||||
| import { TextInput } from "../forms/TextInput"; | import { TextInput } from "../forms/TextInput"; | ||||||
| @@ -37,6 +38,7 @@ interface DetailsProps { | |||||||
| export function VMDetails(p: DetailsProps): React.ReactElement { | export function VMDetails(p: DetailsProps): React.ReactElement { | ||||||
|   const [groupsList, setGroupsList] = React.useState<string[] | undefined>(); |   const [groupsList, setGroupsList] = React.useState<string[] | undefined>(); | ||||||
|   const [isoList, setIsoList] = React.useState<IsoFile[] | undefined>(); |   const [isoList, setIsoList] = React.useState<IsoFile[] | undefined>(); | ||||||
|  |   const [bridgesList, setBridgesList] = React.useState<string[] | undefined>(); | ||||||
|   const [vcpuCombinations, setVCPUCombinations] = React.useState< |   const [vcpuCombinations, setVCPUCombinations] = React.useState< | ||||||
|     number[] | undefined |     number[] | undefined | ||||||
|   >(); |   >(); | ||||||
| @@ -50,6 +52,7 @@ export function VMDetails(p: DetailsProps): React.ReactElement { | |||||||
|   const load = async () => { |   const load = async () => { | ||||||
|     setGroupsList(await GroupApi.GetList()); |     setGroupsList(await GroupApi.GetList()); | ||||||
|     setIsoList(await IsoFilesApi.GetList()); |     setIsoList(await IsoFilesApi.GetList()); | ||||||
|  |     setBridgesList(await ServerApi.GetNetworksBridgesList()); | ||||||
|     setVCPUCombinations(await ServerApi.NumberVCPUs()); |     setVCPUCombinations(await ServerApi.NumberVCPUs()); | ||||||
|     setNetworksList(await NetworkApi.GetList()); |     setNetworksList(await NetworkApi.GetList()); | ||||||
|     setNetworkFiltersList(await NWFilterApi.GetList()); |     setNetworkFiltersList(await NWFilterApi.GetList()); | ||||||
| @@ -64,6 +67,7 @@ export function VMDetails(p: DetailsProps): React.ReactElement { | |||||||
|         <VMDetailsInner |         <VMDetailsInner | ||||||
|           groupsList={groupsList!} |           groupsList={groupsList!} | ||||||
|           isoList={isoList!} |           isoList={isoList!} | ||||||
|  |           bridgesList={bridgesList!} | ||||||
|           vcpuCombinations={vcpuCombinations!} |           vcpuCombinations={vcpuCombinations!} | ||||||
|           networksList={networksList!} |           networksList={networksList!} | ||||||
|           networkFiltersList={networkFiltersList!} |           networkFiltersList={networkFiltersList!} | ||||||
| @@ -78,6 +82,7 @@ enum VMTab { | |||||||
|   General = 0, |   General = 0, | ||||||
|   Storage, |   Storage, | ||||||
|   Network, |   Network, | ||||||
|  |   Advanced, | ||||||
|   XML, |   XML, | ||||||
|   Danger, |   Danger, | ||||||
| } | } | ||||||
| @@ -85,6 +90,7 @@ enum VMTab { | |||||||
| type DetailsInnerProps = DetailsProps & { | type DetailsInnerProps = DetailsProps & { | ||||||
|   groupsList: string[]; |   groupsList: string[]; | ||||||
|   isoList: IsoFile[]; |   isoList: IsoFile[]; | ||||||
|  |   bridgesList: string[]; | ||||||
|   vcpuCombinations: number[]; |   vcpuCombinations: number[]; | ||||||
|   networksList: NetworkInfo[]; |   networksList: NetworkInfo[]; | ||||||
|   networkFiltersList: NWFilter[]; |   networkFiltersList: NWFilter[]; | ||||||
| @@ -102,6 +108,8 @@ function VMDetailsInner(p: DetailsInnerProps): React.ReactElement { | |||||||
|           { label: "General", value: VMTab.General, visible: true }, |           { label: "General", value: VMTab.General, visible: true }, | ||||||
|           { label: "Storage", value: VMTab.Storage, visible: true }, |           { label: "Storage", value: VMTab.Storage, visible: true }, | ||||||
|           { label: "Network", value: VMTab.Network, visible: true }, |           { label: "Network", value: VMTab.Network, visible: true }, | ||||||
|  |           { label: "Avanced", value: VMTab.Advanced, visible: true }, | ||||||
|  |  | ||||||
|           { |           { | ||||||
|             label: "XML", |             label: "XML", | ||||||
|             value: VMTab.XML, |             value: VMTab.XML, | ||||||
| @@ -119,6 +127,7 @@ function VMDetailsInner(p: DetailsInnerProps): React.ReactElement { | |||||||
|       {currTab === VMTab.General && <VMDetailsTabGeneral {...p} />} |       {currTab === VMTab.General && <VMDetailsTabGeneral {...p} />} | ||||||
|       {currTab === VMTab.Storage && <VMDetailsTabStorage {...p} />} |       {currTab === VMTab.Storage && <VMDetailsTabStorage {...p} />} | ||||||
|       {currTab === VMTab.Network && <VMDetailsTabNetwork {...p} />} |       {currTab === VMTab.Network && <VMDetailsTabNetwork {...p} />} | ||||||
|  |       {currTab === VMTab.Advanced && <VMDetailsTabAdvanced {...p} />} | ||||||
|       {currTab === VMTab.XML && <VMDetailsTabXML {...p} />} |       {currTab === VMTab.XML && <VMDetailsTabXML {...p} />} | ||||||
|       {currTab === VMTab.Danger && <VMDetailsTabDanger {...p} />} |       {currTab === VMTab.Danger && <VMDetailsTabDanger {...p} />} | ||||||
|     </> |     </> | ||||||
| @@ -334,8 +343,8 @@ function VMDetailsTabGeneral(p: DetailsInnerProps): React.ReactElement { | |||||||
| function VMDetailsTabStorage(p: DetailsInnerProps): React.ReactElement { | function VMDetailsTabStorage(p: DetailsInnerProps): React.ReactElement { | ||||||
|   return ( |   return ( | ||||||
|     <Grid container spacing={2}> |     <Grid container spacing={2}> | ||||||
|       {(p.editable || p.vm.disks.length > 0) && ( |       {(p.editable || p.vm.file_disks.length > 0) && ( | ||||||
|         <EditSection title="Disks storage"> |         <EditSection title="File disks storage"> | ||||||
|           <VMDisksList {...p} /> |           <VMDisksList {...p} /> | ||||||
|         </EditSection> |         </EditSection> | ||||||
|       )} |       )} | ||||||
| @@ -361,6 +370,15 @@ function VMDetailsTabNetwork(p: DetailsInnerProps): React.ReactElement { | |||||||
|   return <VMNetworksList {...p} />; |   return <VMNetworksList {...p} />; | ||||||
| } | } | ||||||
|  |  | ||||||
|  | function VMDetailsTabAdvanced(p: DetailsInnerProps): React.ReactElement { | ||||||
|  |   return ( | ||||||
|  |     <Grid container spacing={2}> | ||||||
|  |       {/* OEM strings */} | ||||||
|  |       <OEMStringFormWidget {...p} /> | ||||||
|  |     </Grid> | ||||||
|  |   ); | ||||||
|  | } | ||||||
|  |  | ||||||
| function VMDetailsTabXML(p: DetailsInnerProps): React.ReactElement { | function VMDetailsTabXML(p: DetailsInnerProps): React.ReactElement { | ||||||
|   return ( |   return ( | ||||||
|     <XMLAsyncWidget |     <XMLAsyncWidget | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user