From ad2839e5626f4682547f4f1ae8336a4ea8d180db Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 17 Jul 2023 11:51:55 +0200 Subject: [PATCH 01/58] wip: turn network into routes and new virtual networks --- lib/Ravada.pm | 48 ++++++++++++ lib/Ravada/Domain.pm | 2 +- lib/Ravada/Front.pm | 4 +- lib/Ravada/{Network.pm => Route.pm} | 6 +- lib/Ravada/VM.pm | 73 +++++++++++++++++- lib/Ravada/VM/KVM.pm | 75 ++++++++++++++++++- lib/Ravada/VM/Void.pm | 20 ++++- lib/Ravada/WebSocket.pm | 14 ++++ public/js/admin.js | 28 +++++-- script/rvd_front | 10 +-- t/70_networks.t | 14 ++-- t/kvm/p10_password.t | 12 +-- t/lib/Test/Ravada.pm | 29 +++++++ t/mojo/30_settings.t | 10 +-- t/vm/v10_volatile.t | 2 +- templates/bootstrap/navigation.html.ep | 2 +- ..._networks.html.ep => admin_routes.html.ep} | 10 +-- ...{network_new.html.ep => route_new.html.ep} | 0 18 files changed, 313 insertions(+), 46 deletions(-) rename lib/Ravada/{Network.pm => Route.pm} (96%) rename templates/main/{admin_networks.html.ep => admin_routes.html.ep} (83%) rename templates/main/{network_new.html.ep => route_new.html.ep} (100%) diff --git a/lib/Ravada.pm b/lib/Ravada.pm index 46f1affc6..eec3e0ac5 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -1635,6 +1635,10 @@ sub _add_indexes_generic($self) { ,"UNIQUE (name)" ] + ,virtual_networks => [ + "unique(id_vm,internal_id)" + ,"index(date_changed)" + ] ); my $if_not_exists = ''; $if_not_exists = ' IF NOT EXISTS ' if $CONNECTOR->dbh->{Driver}{Name} =~ /sqlite|mariadb/i; @@ -1806,6 +1810,7 @@ sub _add_grants($self) { $self->_add_grant('view_all',0,"The user can start and access the screen of any virtual machine"); $self->_add_grant('create_disk',0,'can create disk volumes'); $self->_add_grant('quota_disk',0,'disk space limit',1); + $self->_add_grant('create_networks',0,'can create virtual networks',1); } sub _add_grant($self, $grant, $allowed, $description, $is_int = 0, $default_admin=1) { @@ -1883,6 +1888,7 @@ sub _enable_grants($self) { ,'start_limit', 'start_many' ,'view_all' ,'create_disk', 'quota_disk' + ,'create_networks' ); my $sth = $CONNECTOR->dbh->prepare("SELECT id,name FROM grant_types"); @@ -2356,6 +2362,23 @@ sub _sql_create_tables($self) { } ] + , + [virtual_networks => { + id => 'integer PRIMARY KEY AUTO_INCREMENT', + ,id_vm => 'integer NOT NULL references `vms` (`id`) ON DELETE CASCADE', + ,name => 'varchar(200)' + ,id_owner => 'integer NOT NULL references `users` (`id`) ON DELETE CASCADE', + ,is_active => 'integer not null' + ,internal_id => 'char(80) not null' + ,autostart => 'integer not null' + ,bridge => 'char(80)' + ,'ip_address' => 'char(20)' + ,'ip_netmask' => 'char(20)' + ,'dhcp_start' => 'integer' + ,'dhcp_end' => 'integer' + ,date_changed => 'timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP' + } + ] ); for my $new_table (@tables ) { @@ -5660,6 +5683,7 @@ sub _refresh_active_vms ($self) { next; } $active_vm{$vm->id} = 1; + $vm->list_virtual_networks(); } return \%active_vm; } @@ -6148,6 +6172,9 @@ sub _req_method { ,remove_files => \&_cmd_remove_files ,update_iso_urls => \&_cmd_update_iso_urls + ,create_network => \&_cmd_create_network + ,remove_network => \&_cmd_remove_network + ); return $methods{$cmd}; } @@ -6565,6 +6592,27 @@ sub _cmd_remove_files($self, $request) { $vm->remove_file(@file); } +sub _cmd_create_network($self, $request) { + my $user=Ravada::Auth::SQL->search_by_id($request->args('id_owner')); + die "Error: ".$user->name." not authorized\n" + unless $user->can_create_networks; + + my $id = $request->args('id_vm'); + my $vm = Ravada::VM->open($id); + $vm->create_network($request->args('data'),$request->args('uid')); +} + +sub _cmd_remove_network($self, $request) { + my $user=Ravada::Auth::SQL->search_by_id($request->args('id_owner')); + die "Error: ".$user->name." not authorized\n" + unless $user->can_create_networks; + + my $id = $request->args('id_vm'); + my $vm = Ravada::VM->open($id); + $vm->remove_network($id,$request->args('uid')); +} + + sub _cmd_active_storage_pool($self, $request) { my $user = Ravada::Auth::SQL->search_by_id($request->args('uid')); die "Error: ".$user->name." not authorized to manage storage pools" diff --git a/lib/Ravada/Domain.pm b/lib/Ravada/Domain.pm index d2b8e98ba..4a86c1f5d 100644 --- a/lib/Ravada/Domain.pm +++ b/lib/Ravada/Domain.pm @@ -342,7 +342,7 @@ sub _around_start($orig, $self, @arg) { if ( Ravada::setting(undef,"/backend/display_password") ) { # We'll see if we set it from the network, defaults to 0 meanwhile my $set_password = 0; - my $network = Ravada::Network->new(address => $remote_ip); + my $network = Ravada::Route->new(address => $remote_ip); $set_password = 1 if $network->requires_password(); $arg{set_password} = $set_password; } diff --git a/lib/Ravada/Front.pm b/lib/Ravada/Front.pm index 470a2f60c..2f7a5d022 100644 --- a/lib/Ravada/Front.pm +++ b/lib/Ravada/Front.pm @@ -20,7 +20,7 @@ use Ravada; use Ravada::Auth::LDAP; use Ravada::Front::Domain; use Ravada::Front::Domain::KVM; -use Ravada::Network; +use Ravada::Route; use feature qw(signatures); no warnings "experimental::signatures"; @@ -1200,7 +1200,7 @@ sub list_bases_anonymous { my $self = shift; my $ip = shift or confess "Missing remote IP"; - my $net = Ravada::Network->new(address => $ip); + my $net = Ravada::Route->new(address => $ip); my $sth = $CONNECTOR->dbh->prepare( "SELECT id, name, id_base, is_public, file_screenshot " diff --git a/lib/Ravada/Network.pm b/lib/Ravada/Route.pm similarity index 96% rename from lib/Ravada/Network.pm rename to lib/Ravada/Route.pm index 129eec17f..10d4e14c0 100644 --- a/lib/Ravada/Network.pm +++ b/lib/Ravada/Route.pm @@ -1,11 +1,11 @@ -package Ravada::Network; +package Ravada::Route; use strict; use warnings; =head1 NAME -Ravada::Network - Networks management library for Ravada +Ravada::Route - Routes management library for Ravada =cut @@ -31,7 +31,7 @@ our $CONNECTOR; =head1 Description - my $net = Ravada::Network->new(address => '127.0.0.1/32'); + my $net = Ravada::Route->new(address => '127.0.0.1/32'); if ( $net->allowed( $domain->id ) ) { =cut diff --git a/lib/Ravada/VM.pm b/lib/Ravada/VM.pm index 82c2b52a2..b10657b49 100644 --- a/lib/Ravada/VM.pm +++ b/lib/Ravada/VM.pm @@ -128,6 +128,13 @@ has 'netssh' => ( , lazy => 1 , clearer => 'clear_netssh' ); + +has 'has_networking' => ( + isa => 'Bool' + , is => 'ro' + , default => 0 +); + ############################################################ # # Method Modifiers definition @@ -148,6 +155,10 @@ after 'disconnect' => \&_post_disconnect; around '_list_used_volumes' => \&_around_list_used_volumes; +around 'create_network' => \&_around_create_network; +around 'remove_network' => \&_around_remove_network; +around 'list_virtual_networks' => \&_around_list_networks; + ############################################################# # # method modifiers @@ -590,7 +601,7 @@ sub _add_instance_db($self, $id_domain) { sub _define_spice_password($self, $remote_ip) { my $spice_password = Ravada::Utils::random_name(4); if ($remote_ip) { - my $network = Ravada::Network->new(address => $remote_ip); + my $network = Ravada::Route->new(address => $remote_ip); $spice_password = undef if !$network->requires_password; } return $spice_password; @@ -1416,6 +1427,66 @@ sub _around_ping($orig, $self, $option=undef, $cache=1) { return $ping; } +sub _insert_network($self, $net) { + $net->{id_owner} = Ravada::Utils::user_daemon->id + if !exists $net->{id_owner}; + + my $sql = "INSERT INTO virtual_networks (" + .join(",",sort keys %$net).")" + ." VALUES(".join(",",map { '?' } keys %$net).")"; + my $sth = $self->_dbh->prepare($sql); + $sth->execute(map { $net->{$_} } sort keys %$net); +} + +sub _update_network($self, $net) { + my $sth = $self->_dbh->prepare("SELECT * FROM virtual_networks " + ." WHERE id_vm=? AND internal_id=?" + ); + $sth->execute($self->id,$net->{internal_id}); + my $db_net = $sth->fetchrow_hashref(); + if (!$db_net) { + return $self->_insert_network($net); + } + delete $db_net->{date_changed}; + delete $db_net->{id}; +} + +sub _around_create_network($orig, $self,$data, $id_owner) { + my $owner = Ravada::Auth::SQL->search_by_id($id_owner) or confess "Unknown user id: $id_owner"; + die "Error: Access denied: ".$owner->name." can not create networks" + unless $owner->can_create_networks(); + + $data->{is_active}=1 if !exists $data->{is_active}; + $data->{autostart}=1 if !exists $data->{autostart}; + my $ip = $data->{ip_address}; + $ip =~ s/(.*)\..*/$1/; + $data->{dhcp_start}="$ip.2" if !exists $data->{dhcp_start}; + $data->{dhcp_end}="$ip.254" if !exists $data->{dhcp_end}; + $self->$orig($data); + $data->{id_owner} = $id_owner; + $self->_insert_network($data); +} + +sub _around_remove_network($orig, $self, $user, $id_net) { + die "Error: Access denied: ".$user->name." can not remove networks" + unless $user->can_create_networks(); + + my ($net) = grep { $_->{id} == $id_net } $self->list_networks(); + + die "Error: network id $id_net not found" if !$net; + + $self->$orig($net->{name}); +} + + +sub _around_list_networks($orig, $self) { + my @list = $orig->($self); + for my $net ( @list ) { + $self->_update_network($net); + } + return @list; +} + =head2 is_active Returns if the domain is active. The active state is cached for some seconds. diff --git a/lib/Ravada/VM/KVM.pm b/lib/Ravada/VM/KVM.pm index 6fd216f9b..b21613402 100644 --- a/lib/Ravada/VM/KVM.pm +++ b/lib/Ravada/VM/KVM.pm @@ -54,6 +54,12 @@ has type => ( ,default => 'KVM' ); +has has_networking => ( + isa => 'Bool' + , is => 'ro' + , default => 1 +); + #########################################################################3 # @@ -2660,13 +2666,13 @@ sub _xml_add_graphics_streaming { $listen->setAttribute(mode => 'filter'); } -=head2 list_networks +=head2 list_routes Returns a list of networks known to this VM. Each element is a Ravada::NetInterface object =cut -sub list_networks { +sub list_routes { my $self = shift; $self->connect() if !$self->vm; @@ -2915,4 +2921,69 @@ sub get_library_version($self) { return $self->vm->get_library_version(); } +sub list_virtual_networks($self) { + my @networks; + for my $net ($self->vm->list_all_networks()) { + my $doc = XML::LibXML->load_xml(string => $net->get_xml_description); + my ($ip_doc) = $doc->findnodes("/network/ip"); + my $ip = $ip_doc->getAttribute('address'); + my $netmask = $ip_doc->getAttribute('netmask'); + my $data= { + is_active => $net->is_active() + ,autostart => $net->get_autostart() + ,bridge => $net->get_bridge_name() + ,id_vm => $self->id + ,name => $net->get_name + ,ip_address => $ip + ,ip_netmask => $netmask + ,internal_id => ''.$net->get_uuid_string + }; + my ($dhcp_range) = $ip_doc->findnodes("dhcp/range"); + my ($start,$end); + if ($dhcp_range) { + ($start) = $dhcp_range->getAttribute('start') =~ /.*\.(\d+)/; + ($end) = $dhcp_range->getAttribute('end')=~ /.*\.(\d+)/; + $data->{dhcp_start} = $start if defined $start; + $data->{dhcp_end} = $end if defined $end; + } + push @networks,($data); + } + return @networks; +} + +sub create_network($self, $data) { + + my $xml = XML::LibXML->load_xml(string => + "$data->{name}" + ); + my ($xml_net) = $xml->findnodes("/network"); + + my $forward = $xml_net->addNewChild(undef,'forward'); + $forward->setAttribute('mode' => 'nat'); + + my $ip = $xml_net->addNewChild(undef,'ip'); + $ip->setAttribute('address' => $data->{ip_address}); + $ip->setAttribute('netmask' => $data->{ip_netmask}); + + if ($data->{dhcp_start} || $data->{dhcp_end}) { + my $dhcp = $ip->addNewChild(undef, 'dhcp'); + my $range = $dhcp->addNewChild(undef,'range'); + $range->setAttribute('start' => $data->{dhcp_start}); + $range->setAttribute('end' => $data->{dhcp_end}); + } + + $self->vm->define_network($xml->toString()); + + my $new_network=$self->vm->get_network_by_name($data->{name}); + my $xml2=XML::LibXML->load_xml(string =>$new_network->get_xml_description()); + my ($uuid) = $xml2->findnodes("/network/uuid/text()"); + $data->{internal_id} = $uuid; +} + +sub remove_network($self, $name) { +} + + + + 1; diff --git a/lib/Ravada/VM/Void.pm b/lib/Ravada/VM/Void.pm index 08f6b6c01..067a729bf 100644 --- a/lib/Ravada/VM/Void.pm +++ b/lib/Ravada/VM/Void.pm @@ -336,10 +336,28 @@ sub search_domain { return; } -sub list_networks { +sub list_routes { return Ravada::NetInterface::Void->new(); } +sub list_virtual_networks { + return (); +} + +sub create_network($self, $data) { + my $file_out = $self->dir_img."/networks/".$data->{name}."yml"; + die "Error: network $data->{name} already created" + if $self->file_exists($file_out); + open my $out,">",$file_out or die "$! $file_out"; + close $out; +} + +sub remove_network($self, $name) { + my $file_out = $self->dir_img."/networks/$name.yml"; + unlink $file_out or die "$! $file_out" if $self->file_exists($file_out); +} + + sub search_volume($self, $pattern) { return $self->_search_volume_remote($pattern) if !$self->is_local; diff --git a/lib/Ravada/WebSocket.pm b/lib/Ravada/WebSocket.pm index 6bed72470..6c3ffa86f 100644 --- a/lib/Ravada/WebSocket.pm +++ b/lib/Ravada/WebSocket.pm @@ -49,6 +49,7 @@ my %SUB = ( ,list_next_bookings_today => \&_list_next_bookings_today ,log_active_domains => \&_log_active_domains + ,list_networks => \&_list_networks ); our %TABLE_CHANNEL = ( @@ -60,6 +61,7 @@ our %TABLE_CHANNEL = ( ,list_requests => 'requests' ,machine_info => 'domains' ,log_active_domains => 'log_active_domains' + ,list_networks => 'virtual_networks' ); my $A_WHILE; @@ -381,6 +383,18 @@ sub _log_active_domains($rvd, $args) { return Ravada::Front::Log::list_active_recent($unit,$time); } +sub _list_networks($rvd, $args) { + my @networks; + my $sth = $rvd->_dbh->prepare( + "SELECT * FROM virtual_networks ORDER BY name " + ); + $sth->execute(); + while (my $row = $sth->fetchrow_hashref) { + push @networks,($row); + } + return \@networks; +} + sub _its_been_a_while_channel($channel) { if (!$A_WHILE{$channel} || time -$A_WHILE{$channel} > 5) { $A_WHILE{$channel} = time; diff --git a/public/js/admin.js b/public/js/admin.js index 62d6a6a72..d357e0a93 100644 --- a/public/js/admin.js +++ b/public/js/admin.js @@ -7,6 +7,7 @@ ravadaApp.directive("solShowMachine", swMach) .controller("usersPage", usersPageC) .controller("messagesPage", messagesPageC) .controller("manage_nodes",manage_nodes) + .controller("manage_routes",manage_routes) .controller("manage_networks",manage_networks) .controller("settings_node",settings_node) .controller("settings_storage",settings_storage) @@ -863,17 +864,17 @@ ravadaApp.directive("solShowMachine", swMach) $interval($scope.list_nodes,30 * 1000); }; - function manage_networks($scope, $http, $interval, $timeout) { - list_networks= function() { - $http.get('/list_networks.json').then(function(response) { + function manage_routes($scope, $http, $interval, $timeout) { + list_routes = function() { + $http.get('/list_routes.json').then(function(response) { for (var i=0; i sub($c) { }; -get '/list_networks.json' => sub { +get '/list_routes.json' => sub { my $c = shift; - $c->render(json => [ Ravada::Network->list_networks ]); + $c->render(json => [ Ravada::Route->list_networks ]); }; get '/network/info/#id' => sub($c) { @@ -492,9 +492,9 @@ sub _add_admin_libs($c) { push @{$c->stash->{css}}, '/css/admin.css'; } -any '/network/new' => sub($c) { +any '/route/new' => sub($c) { _add_admin_libs($c); - return $c->render(template => "/main/network_new"); + return $c->render(template => "/main/route_new"); }; post '/v1/network/set' => sub($c) { diff --git a/t/70_networks.t b/t/70_networks.t index 194068b79..a32492c51 100644 --- a/t/70_networks.t +++ b/t/70_networks.t @@ -10,7 +10,7 @@ no warnings "experimental::signatures"; use feature qw(signatures); use_ok('Ravada'); -use_ok('Ravada::Network'); +use_ok('Ravada::Route'); use lib 't/lib'; use Test::Ravada; @@ -28,7 +28,7 @@ sub test_allow_all { my $domain = shift; my $ip = '192.168.1.2/32'; - my $net = Ravada::Network->new(address => $ip); + my $net = Ravada::Route->new(address => $ip); ok(!$net->allowed($domain->id),"Expecting not allowed from unknown network"); #check list bases, default allowed @@ -53,7 +53,7 @@ sub test_allow_all { ok(!$net->allowed_anonymous($domain->id),"Expecting denied anonymous from known network"); ok($net->allowed($domain->id),"Expecting allowed from known network"); - my $net2 = Ravada::Network->new(address => '192.168.1.22/32'); + my $net2 = Ravada::Route->new(address => '192.168.1.22/32'); ok($net2->allowed($domain->id),"Expecting allowed from known network"); ok(!$net2->allowed_anonymous($domain->id),"Expecting denied anonymous from known network"); { # test list bases anonymous @@ -68,7 +68,7 @@ sub test_allow_domain { my $domain = shift; my $ip = '10.1.1.1/32'; - my $net = Ravada::Network->new(address => $ip); + my $net = Ravada::Route->new(address => $ip); ok(!$net->allowed($domain->id),"Expecting not allowed from unknown network"); { # test list bases anonymous @@ -197,7 +197,7 @@ sub test_deny_all { my $ip = '10.0.0.2/32'; - my $net = Ravada::Network->new(address => $ip); + my $net = Ravada::Route->new(address => $ip); ok(!$net->allowed($domain->id),"Expecting not allowed from unknown network"); { # test list bases anonymous @@ -318,11 +318,11 @@ $domain->is_public(1); test_conflict_allowed(); -my $net = Ravada::Network->new(address => '127.0.0.1/32'); +my $net = Ravada::Route->new(address => '127.0.0.1/32'); ok($net->allowed($domain->id)); deny_everything_any(); -my $net2 = Ravada::Network->new(address => '10.0.0.0/32'); +my $net2 = Ravada::Route->new(address => '10.0.0.0/32'); ok(!$net2->allowed($domain->id), "Address unknown should not be allowed to anything"); test_allow_all($domain); diff --git a/t/kvm/p10_password.t b/t/kvm/p10_password.t index 4b397bac6..000354614 100644 --- a/t/kvm/p10_password.t +++ b/t/kvm/p10_password.t @@ -16,13 +16,15 @@ init(); my @VMS = vm_names(); my $USER = create_user("foo","bar", 1); +use_ok('Ravada::Route'); + ####################################################### sub test_domain_no_password { my $vm_name = shift; my $vm = rvd_back->search_vm($vm_name); - my $net = Ravada::Network->new(address => '127.0.0.1/32'); + my $net = Ravada::Route->new(address => '127.0.0.1/32'); ok(!$net->requires_password); my $domain_name = new_domain_name(); @@ -43,7 +45,7 @@ sub test_domain_no_password { } is($domain->is_active,0) or return; - my $net2 = Ravada::Network->new(address => '10.0.0.1/32'); + my $net2 = Ravada::Route->new(address => '10.0.0.1/32'); ok(!$net2->requires_password,"Expecting net requires password "); $domain->start(user => $USER, remote_ip => '10.0.0.1'); @@ -69,7 +71,7 @@ sub test_domain_password2 { my $vm_name = shift; my $vm = rvd_back->search_vm($vm_name); - my $net = Ravada::Network->new(address => '127.0.0.1/32'); + my $net = Ravada::Route->new(address => '127.0.0.1/32'); ok(!$net->requires_password) or return; my $domain_name = new_domain_name(); @@ -90,7 +92,7 @@ sub test_domain_password2 { } is($domain->is_active,0) or return; - my $net2 = Ravada::Network->new(address => '10.0.0.1/32'); + my $net2 = Ravada::Route->new(address => '10.0.0.1/32'); ok($net2->requires_password,"Expecting net requires password ") or return; @@ -117,7 +119,7 @@ sub test_domain_password2 { sub test_domain_password1($vm_name, $requires_password=1) { my $vm = rvd_back->search_vm($vm_name); - my $net2 = Ravada::Network->new(address => '10.0.0.1/32'); + my $net2 = Ravada::Route->new(address => '10.0.0.1/32'); ok($net2->requires_password,"Expecting net requires password ") or return; diff --git a/t/lib/Test/Ravada.pm b/t/lib/Test/Ravada.pm index b0be1e64d..bdb78dc76 100644 --- a/t/lib/Test/Ravada.pm +++ b/t/lib/Test/Ravada.pm @@ -1423,6 +1423,30 @@ sub _qemu_storage_pool { return $pool_name; } +sub remove_qemu_networks($vm=undef) { + return if !$VM_VALID{'KVM'} || $>; + if (!defined $vm) { + eval { $vm = rvd_back->search_vm('KVM') }; + if ($@ && $@ !~ /Missing qemu-img/) { + warn $@; + } + if ( !$vm ) { + $VM_VALID{'KVM'} = 0; + return; + } + } + + my $base = base_domain_name(); + $vm->connect(); + for my $network ( $vm->vm->list_all_networks) { + my $name = $network->get_name; + next if $name !~ /^$base/; + $network->destroy() if $network->is_active; + $network->undefine(); + } + +} + sub remove_qemu_pools($vm=undef) { return if !$VM_VALID{'KVM'} || $>; return if defined $vm && $vm->type eq 'Void'; @@ -1488,6 +1512,10 @@ sub remove_old_pools { remove_qemu_pools(); } +sub remove_old_networks { + remove_qemu_networks(); +} + sub _remove_old_entries($table) { my $sth = connector()->dbh->prepare("DELETE FROM $table" ." WHERE name like ? " @@ -1522,6 +1550,7 @@ sub clean($ldap=undef) { remove_old_domains(); remove_old_disks(); remove_old_pools(); + remove_old_networks(); _remove_old_entries('vms'); _remove_old_entries('networks'); _remove_old_groups_ldap(); diff --git a/t/mojo/30_settings.t b/t/mojo/30_settings.t index 244d9f3df..006bd40db 100644 --- a/t/mojo/30_settings.t +++ b/t/mojo/30_settings.t @@ -146,7 +146,7 @@ sub test_exists_network($id_network, $field, $name) { } sub _remove_network($address) { - my @list_networks = Ravada::Network::list_networks(); + my @list_networks = Ravada::Route::list_networks(); my ($found) = grep { $_->{address} eq $address} @list_networks; return if !$found; @@ -170,7 +170,7 @@ sub test_networks($vm_name) { exit if !$t->success; - my @list_networks = Ravada::Network::list_networks(); + my @list_networks = Ravada::Route::list_networks(); my ($found) = grep { $_->{name} eq $name } @list_networks; ok($found,"Expecting $name in list vms ".Dumper(\@list_networks)) or return; my $id_network = $found->{id}; @@ -183,7 +183,7 @@ sub test_networks($vm_name) { ); is($t->tx->res->code(),200) or die $t->tx->res->body; - @list_networks = Ravada::Network::list_networks(); + @list_networks = Ravada::Route::list_networks(); ($found) = grep { $_->{id} == $id_network } @list_networks; is($found->{name}, $name2) or die Dumper($found); @@ -194,7 +194,7 @@ sub test_networks($vm_name) { } ); - @list_networks = Ravada::Network::list_networks(); + @list_networks = Ravada::Route::list_networks(); ($found) = grep { $_->{id} == $id_network } @list_networks; is($found->{name}, $new_name) or die Dumper(\@list_networks); @@ -207,7 +207,7 @@ sub test_networks($vm_name) { $t->get_ok("/v1/network/remove/".$found->{id}); is($t->tx->res->code(),200) or die $t->tx->res->body; - ok(! grep { $_->{id} == $found->{id} } Ravada::Network::list_networks()); + ok(! grep { $_->{id} == $found->{id} } Ravada::Route::list_networks()); } diff --git a/t/vm/v10_volatile.t b/t/vm/v10_volatile.t index a41de96c1..a3efdc752 100644 --- a/t/vm/v10_volatile.t +++ b/t/vm/v10_volatile.t @@ -13,7 +13,7 @@ no warnings "experimental::signatures"; use feature qw(signatures); use_ok('Ravada'); -use_ok('Ravada::Network'); +use_ok('Ravada::Route'); use lib 't/lib'; use Test::Ravada; diff --git a/templates/bootstrap/navigation.html.ep b/templates/bootstrap/navigation.html.ep index dbf6ceeef..15c2efc2d 100644 --- a/templates/bootstrap/navigation.html.ep +++ b/templates/bootstrap/navigation.html.ep @@ -41,7 +41,7 @@ navbar-dark bg-dark fixed-top navbar-expand-lg navbar-inverse"> % } % if ($_user->is_admin) {  <%=l 'Nodes' %> -  <%=l 'Networks' %> +  <%=l 'Routes' %>  <%=l 'Storage' %> % }  <%=l 'Messages' %> diff --git a/templates/main/admin_networks.html.ep b/templates/main/admin_routes.html.ep similarity index 83% rename from templates/main/admin_networks.html.ep rename to templates/main/admin_routes.html.ep index 28fcb576d..9b8fbfbd5 100644 --- a/templates/main/admin_networks.html.ep +++ b/templates/main/admin_routes.html.ep @@ -4,14 +4,14 @@
%= include 'bootstrap/navigation' -
+
-

<%=l 'Networks' %>

+

<%=l 'Routes' %>

- <%=l 'New Network' %> + class="btn btn-success" href="/route/new"> + <%=l 'New Route' %>

@@ -22,7 +22,7 @@ <%=l 'requires password' %>
-
diff --git a/templates/main/network_new.html.ep b/templates/main/route_new.html.ep similarity index 100% rename from templates/main/network_new.html.ep rename to templates/main/route_new.html.ep From 9b0deb57dcf8fa9cb18902a6dc8b4ac83e7d7fcd Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 17 Jul 2023 16:55:23 +0200 Subject: [PATCH 02/58] wip: rename network to route --- public/js/admin.js | 54 +++++++++---------- script/rvd_front | 14 +++-- templates/main/admin_routes.html.ep | 2 +- templates/main/network_remove.html.ep | 8 --- ...achines.html.ep => route_machines.html.ep} | 6 +-- templates/main/route_new.html.ep | 6 +-- ..._options.html.ep => route_options.html.ep} | 28 +++++----- templates/main/route_remove.html.ep | 8 +++ templates/main/settings_generic_tabs.html.ep | 2 +- 9 files changed, 66 insertions(+), 62 deletions(-) delete mode 100644 templates/main/network_remove.html.ep rename templates/main/{network_machines.html.ep => route_machines.html.ep} (91%) rename templates/main/{network_options.html.ep => route_options.html.ep} (72%) create mode 100644 templates/main/route_remove.html.ep diff --git a/public/js/admin.js b/public/js/admin.js index d357e0a93..122b23f7e 100644 --- a/public/js/admin.js +++ b/public/js/admin.js @@ -11,7 +11,7 @@ ravadaApp.directive("solShowMachine", swMach) .controller("manage_networks",manage_networks) .controller("settings_node",settings_node) .controller("settings_storage",settings_storage) - .controller("settings_network",settings_network) + .controller("settings_route",settings_route) .controller("new_node", newNodeCtrl) .controller("new_storage", new_storage) .controller("settings_global", settings_global_ctrl) @@ -877,7 +877,7 @@ ravadaApp.directive("solShowMachine", swMach) var value = $scope.routes[id][field]; var args = { 'id': id }; args[field] = value; - $http.post('/v1/network/set' + $http.post('/v2/route/set' , JSON.stringify( args )) .then(function(response) { }); @@ -1136,11 +1136,11 @@ ravadaApp.directive("solShowMachine", swMach) }; - function settings_network($scope, $http, $timeout) { + function settings_route($scope, $http, $timeout) { var url_ws; $scope.init = function(id_network) { if (typeof id_network == 'undefined') { - $scope.network = { + $scope.route= { 'name': '' ,'all_domains': 1 }; @@ -1150,30 +1150,30 @@ ravadaApp.directive("solShowMachine", swMach) } } $scope.check_no_domains = function() { - if ( $scope.network.no_domains == 1 ){ - $scope.network.all_domains = 0; + if ( $scope.route.no_domains == 1 ){ + $scope.route.all_domains = 0; } }; $scope.check_all_domains = function() { - if ( $scope.network.all_domains == 1 ){ - $scope.network.no_domains = 0; + if ( $scope.route.all_domains == 1 ){ + $scope.route.no_domains = 0; } }; $scope.update_network= function(field) { - var data = $scope.network; + var data = $scope.route; if (typeof field != 'undefined') { var data = {}; - data[field] = $scope.network[field]; + data[field] = $scope.route[field]; } $scope.saved = false; $scope.error = ''; - $http.post('/v1/network/set/' + $http.post('/v2/route/set/' , JSON.stringify(data)) // , JSON.stringify({ value: $scope.network[field]})) .then(function(response) { if (response.data.ok == 1){ $scope.saved = true; - if (!$scope.network.id) { + if (!$scope.route.id) { $scope.new_saved = true; } } @@ -1185,19 +1185,19 @@ ravadaApp.directive("solShowMachine", swMach) $scope.load_network = function(id_network) { $scope.error = ''; $scope.saved = false; - $http.get('/network/info/'+id_network+'.json').then(function(response) { - $scope.network = response.data; + $http.get('/route/info/'+id_network).then(function(response) { + $scope.route = response.data; $scope.formNetwork.$setPristine(); - $scope.network._old_name = $scope.network.name; + $scope.route._old_name = $scope.route.name; }); }; $scope.list_domains_network = function(id_network) { - $http.get('/network/list_domains/'+id_network).then(function(response) { + $http.get('/route/list_domains/'+id_network).then(function(response) { $scope.machines = response.data; }); }; $scope.set_network_domain= function(id_domain, field, allowed) { - $http.get("/network/set/"+$scope.network.id+ "/" + field+ "/" +id_domain+"/" + $http.get("/route/set/"+$scope.route.id+ "/" + field+ "/" +id_domain+"/" +allowed) .then(function(response) { }); @@ -1208,26 +1208,26 @@ ravadaApp.directive("solShowMachine", swMach) }); }; - $scope.remove_network = function(id_network) { - if ($scope.network.name == 'default') { - $scope.error = $scope.network.name + " network can't be removed"; + $scope.remove_route = function(id_network) { + if ($scope.route.name == 'default') { + $scope.error = $scope.route.name + " network can't be removed"; return; } - $http.get('/v1/network/remove/'+id_network).then(function(response) { - $scope.message = "Network "+$scope.network.name+" removed"; - $scope.network ={}; + console.log(id_network); + $http.get('/v2/route/remove/'+id_network).then(function(response) { + window.location.assign('/admin/routes'); }); }; $scope.check_duplicate = function(field) { var args = {}; - if (typeof ($scope.network['id']) != 'undefined') { - args['id'] = $scope.network['id']; + if (typeof ($scope.route['id']) != 'undefined') { + args['id'] = $scope.route['id']; } - args[field] = $scope.network[field]; + args[field] = $scope.route[field]; $http.post("/v1/exists/networks",JSON.stringify(args)) .then(function(response) { - $scope.network["_duplicated_"+field]=response.data.id; + $scope.route["_duplicated_"+field]=response.data.id; }); }; $scope.new_saved = false; diff --git a/script/rvd_front b/script/rvd_front index 387ed3e5a..27435afce 100644 --- a/script/rvd_front +++ b/script/rvd_front @@ -470,20 +470,21 @@ get '/list_routes.json' => sub { $c->render(json => [ Ravada::Route->list_networks ]); }; -get '/network/info/#id' => sub($c) { +get '/route/info/#id' => sub($c) { my $sth = $RAVADA->_dbh->prepare("SELECT * from networks WHERE id=?"); $sth->execute($c->stash('id')); my $row = $sth->fetchrow_hashref; return $c->render(json => $row); }; -get '/v1/network/remove/#id' => sub($c) { +get '/v2/route/remove/#id' => sub($c) { my $sth = $RAVADA->_dbh->prepare("DELETE from networks WHERE id=?"); $sth->execute($c->stash('id')); + $USER->send_message("Network ".$c->stash('id')." removed"); return $c->render(json => { ok => 1 }); }; -get '/network/list_domains/#id' => sub($c) { +get '/route/list_domains/#id' => sub($c) { return $c->render( json => $RAVADA->list_bases_network($c->stash('id'))); }; @@ -497,14 +498,14 @@ any '/route/new' => sub($c) { return $c->render(template => "/main/route_new"); }; -post '/v1/network/set' => sub($c) { +post '/v2/route/set' => sub($c) { return access_denied($c) if !$USER->is_admin; my $arg = decode_json($c->req->body); return _update_fields($c, "networks", $arg); }; -get '/network/set/#id/#field/#id_domain/#value' => sub ($c) { +get '/v2/route/set/#id/#field/#id_domain/#value' => sub ($c) { my $id_network = $c->stash('id'); my $field = $c->stash('field'); my $id_domain = $c->stash('id_domain'); @@ -570,12 +571,15 @@ post '/v1/exists/:item' => sub($c) { $query .= " AND id <> $id " if defined $id; + my $sth = $RAVADA->_dbh->prepare("SELECT id FROM $table WHERE $query "); $sth->execute(map { $arg->{$_} } @fields ); my $row = $sth->fetchrow_hashref; $row->{id} = undef if !exists $row->{id}; + warn Dumper([$query, \@fields, $arg, $row]); + return $c->render(json => $row ); }; diff --git a/templates/main/admin_routes.html.ep b/templates/main/admin_routes.html.ep index 9b8fbfbd5..afed4cbe9 100644 --- a/templates/main/admin_routes.html.ep +++ b/templates/main/admin_routes.html.ep @@ -26,7 +26,7 @@ class="row" >
- {{network.name}} + {{network.name}}
{{network.address}}
-

<%=l 'New network' %>

+

<%=l 'New Route' %>

-%= include '/main/network_options' +%= include '/main/route_options'
{{error}} diff --git a/templates/main/network_options.html.ep b/templates/main/route_options.html.ep similarity index 72% rename from templates/main/network_options.html.ep rename to templates/main/route_options.html.ep index d03ed5842..910c7daa5 100644 --- a/templates/main/network_options.html.ep +++ b/templates/main/route_options.html.ep @@ -3,13 +3,13 @@
<%=l 'name' %>
- <%=l 'Network name is required' %> - + <%=l 'This name is duplicated' %>
@@ -18,19 +18,19 @@
<%=l 'address' %>
- <%=l 'Network address is required.' %> <%=l 'Invalid IP network address. Expecting a.b.c.d/e' %> - <%=l 'This address is duplicated' %> + <%=l 'This address is duplicated' %>
<%=l 'password' %>
-
@@ -42,7 +42,7 @@ <%=l 'All machines' %>
- @@ -53,7 +53,7 @@
<%=l 'No machines' %>
- @@ -65,19 +65,19 @@
- + ng-click="load_network(route.id)"><%=l 'Cancel' %>
-
+
<%=l 'Set either' %> <%=l 'all machines' %> <%=l 'or' %> <%=l 'no machines' %> <%=l 'for users in this network' %>
@@ -87,6 +87,6 @@
- <%=l 'Network' %> {{network.name}} <%=l 'saved.' %> + <%=l 'Network' %> {{route.name}} <%=l 'saved.' %>
diff --git a/templates/main/route_remove.html.ep b/templates/main/route_remove.html.ep new file mode 100644 index 000000000..8fcfd8243 --- /dev/null +++ b/templates/main/route_remove.html.ep @@ -0,0 +1,8 @@ +
+ <%=l 'Are you sure you want to remove the' %> <%= $item %> {{route.name}} + + + +
+ +
{{message}}
diff --git a/templates/main/settings_generic_tabs.html.ep b/templates/main/settings_generic_tabs.html.ep index 925f3246f..1cb64e090 100644 --- a/templates/main/settings_generic_tabs.html.ep +++ b/templates/main/settings_generic_tabs.html.ep @@ -1,6 +1,6 @@ % my %tabs_item = ( % node => ['options' , 'bases', 'remove' , 'hostdev'] -% ,network => ['options', 'machines', 'remove'] +% ,route => ['options', 'machines', 'remove'] % ,storage => ['list', 'options', 'purge'] % ); % my $tabs = $tabs_item{$item}; From b2b41c1b6a3f8388c22f8898e344abecb6934993 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 21 Jul 2023 16:15:45 +0200 Subject: [PATCH 03/58] wip: network management --- lib/Ravada.pm | 7 ++++--- lib/Ravada/Request.pm | 3 +++ lib/Ravada/VM.pm | 10 +++++++--- lib/Ravada/VM/KVM.pm | 6 ++++++ script/rvd_front | 13 +++++++++++++ templates/bootstrap/navigation.html.ep | 4 ++++ templates/main/settings_generic_tabs.html.ep | 1 + 7 files changed, 38 insertions(+), 6 deletions(-) diff --git a/lib/Ravada.pm b/lib/Ravada.pm index eec3e0ac5..5a59d6d85 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -1638,6 +1638,7 @@ sub _add_indexes_generic($self) { ,virtual_networks => [ "unique(id_vm,internal_id)" ,"index(date_changed)" + ,"index(id_owner)" ] ); my $if_not_exists = ''; @@ -6593,7 +6594,7 @@ sub _cmd_remove_files($self, $request) { } sub _cmd_create_network($self, $request) { - my $user=Ravada::Auth::SQL->search_by_id($request->args('id_owner')); + my $user=Ravada::Auth::SQL->search_by_id($request->args('uid')); die "Error: ".$user->name." not authorized\n" unless $user->can_create_networks; @@ -6603,13 +6604,13 @@ sub _cmd_create_network($self, $request) { } sub _cmd_remove_network($self, $request) { - my $user=Ravada::Auth::SQL->search_by_id($request->args('id_owner')); + my $user=Ravada::Auth::SQL->search_by_id($request->args('uid')); die "Error: ".$user->name." not authorized\n" unless $user->can_create_networks; my $id = $request->args('id_vm'); my $vm = Ravada::VM->open($id); - $vm->remove_network($id,$request->args('uid')); + $vm->remove_network($user, $request->args('id')); } diff --git a/lib/Ravada/Request.pm b/lib/Ravada/Request.pm index 890b63fc8..0d65f588a 100644 --- a/lib/Ravada/Request.pm +++ b/lib/Ravada/Request.pm @@ -163,6 +163,9 @@ our %VALID_ARG = ( ,update_iso_urls => { uid => 1 } ,list_unused_volumes => {uid => 1, id_vm => 1, start => 2, limit => 2 } ,remove_files => { uid => 1, id_vm => 1, files => 1 } + + ,create_network => { uid => 1, id_vm => 1, data => 1 } + ,remove_network => { uid => 1, id_vm => 1, id => 1 } ); $VALID_ARG{shutdown} = $VALID_ARG{shutdown_domain}; diff --git a/lib/Ravada/VM.pm b/lib/Ravada/VM.pm index b10657b49..c6e114e42 100644 --- a/lib/Ravada/VM.pm +++ b/lib/Ravada/VM.pm @@ -1436,6 +1436,8 @@ sub _insert_network($self, $net) { ." VALUES(".join(",",map { '?' } keys %$net).")"; my $sth = $self->_dbh->prepare($sql); $sth->execute(map { $net->{$_} } sort keys %$net); + + $net->{id} = Ravada::Utils::last_insert_id($$CONNECTOR->dbh); } sub _update_network($self, $net) { @@ -1445,10 +1447,12 @@ sub _update_network($self, $net) { $sth->execute($self->id,$net->{internal_id}); my $db_net = $sth->fetchrow_hashref(); if (!$db_net) { - return $self->_insert_network($net); + $self->_insert_network($net); + } else { + $net->{id} = $db_net->{id}; } delete $db_net->{date_changed}; - delete $db_net->{id}; + # delete $db_net->{id}; } sub _around_create_network($orig, $self,$data, $id_owner) { @@ -1471,7 +1475,7 @@ sub _around_remove_network($orig, $self, $user, $id_net) { die "Error: Access denied: ".$user->name." can not remove networks" unless $user->can_create_networks(); - my ($net) = grep { $_->{id} == $id_net } $self->list_networks(); + my ($net) = grep { $_->{id} eq $id_net } $self->list_virtual_networks(); die "Error: network id $id_net not found" if !$net; diff --git a/lib/Ravada/VM/KVM.pm b/lib/Ravada/VM/KVM.pm index b21613402..319f3ecec 100644 --- a/lib/Ravada/VM/KVM.pm +++ b/lib/Ravada/VM/KVM.pm @@ -2981,6 +2981,12 @@ sub create_network($self, $data) { } sub remove_network($self, $name) { + my $net = $self->vm->get_network_by_name($name); + die "Error: This network can not be removed ".$net->get_name + if $net->get_name eq 'default'; + + $net->destroy() if $net->is_active; + $net->undefine(); } diff --git a/script/rvd_front b/script/rvd_front index 27435afce..31b8ab792 100644 --- a/script/rvd_front +++ b/script/rvd_front @@ -354,6 +354,19 @@ get '/admin/storage' => sub($c) { }; +get '/admin/networks' => sub($c) { + + _add_admin_libs($c); + _select_vm($c); + + $c->stash(tab => ($c->param('tab') or '')); + $c->stash('item' => 'network'); + $c->stash('id' => $c->stash('id_vm')); + + return $c->render( template => '/main/settings_generic' ); + +}; + any '/admin/#type' => sub { my $c = shift; diff --git a/templates/bootstrap/navigation.html.ep b/templates/bootstrap/navigation.html.ep index 15c2efc2d..0658e98e1 100644 --- a/templates/bootstrap/navigation.html.ep +++ b/templates/bootstrap/navigation.html.ep @@ -44,6 +44,10 @@ navbar-dark bg-dark fixed-top navbar-expand-lg navbar-inverse">  <%=l 'Routes' %>  <%=l 'Storage' %> % } + +% if ($_user->can_create_networks) { +  <%=l 'Networks' %> +% }  <%=l 'Messages' %> % if ($monitoring) {  <%=l 'Monitoring' %> diff --git a/templates/main/settings_generic_tabs.html.ep b/templates/main/settings_generic_tabs.html.ep index 1cb64e090..1bdf56034 100644 --- a/templates/main/settings_generic_tabs.html.ep +++ b/templates/main/settings_generic_tabs.html.ep @@ -2,6 +2,7 @@ % node => ['options' , 'bases', 'remove' , 'hostdev'] % ,route => ['options', 'machines', 'remove'] % ,storage => ['list', 'options', 'purge'] +% ,network => ['list', 'options', 'remove'] % ); % my $tabs = $tabs_item{$item}; From e4b554ee242129fc31dbbf946fd2c3797ad63b71 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 24 Jul 2023 14:01:19 +0200 Subject: [PATCH 04/58] wip: frontend manage virtual networks --- lib/Ravada.pm | 1 + lib/Ravada/Front.pm | 14 +++ public/js/admin.js | 33 +++-- script/rvd_front | 11 +- t/vm/networking.t | 122 +++++++++++++++++++ templates/main/admin_networks.html.ep | 47 +++++++ templates/main/network_options.html.ep | 1 + templates/main/network_remove.html.ep | 8 ++ templates/main/settings_generic_tabs.html.ep | 2 +- 9 files changed, 223 insertions(+), 16 deletions(-) create mode 100644 t/vm/networking.t create mode 100644 templates/main/admin_networks.html.ep create mode 100644 templates/main/network_options.html.ep create mode 100644 templates/main/network_remove.html.ep diff --git a/lib/Ravada.pm b/lib/Ravada.pm index 5a59d6d85..10f263616 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -1637,6 +1637,7 @@ sub _add_indexes_generic($self) { ] ,virtual_networks => [ "unique(id_vm,internal_id)" + ,"unique(id_vm,name)" ,"index(date_changed)" ,"index(id_owner)" ] diff --git a/lib/Ravada/Front.pm b/lib/Ravada/Front.pm index 2f7a5d022..a6764fa3c 100644 --- a/lib/Ravada/Front.pm +++ b/lib/Ravada/Front.pm @@ -1680,6 +1680,20 @@ sub list_storage_pools($self, $uid, $id_vm, $active=undef) { return _filter_active($pools, $active); } +sub list_networks($self, $id_vm) { + my $sth = $CONNECTOR->dbh->prepare( + "SELECT * FROM virtual_networks " + ." WHERE id_vm=?" + ." ORDER BY name" + ); + $sth->execute($id_vm); + my @networks; + while ( my $row = $sth->fetchrow_hashref ) { + push @networks,($row); + } + return \@networks; +} + sub _filter_active($pools, $active) { return $pools if !defined $active; diff --git a/public/js/admin.js b/public/js/admin.js index 122b23f7e..b5f56988b 100644 --- a/public/js/admin.js +++ b/public/js/admin.js @@ -9,6 +9,7 @@ ravadaApp.directive("solShowMachine", swMach) .controller("manage_nodes",manage_nodes) .controller("manage_routes",manage_routes) .controller("manage_networks",manage_networks) + .controller("settings_network",settings_network) .controller("settings_node",settings_node) .controller("settings_storage",settings_storage) .controller("settings_route",settings_route) @@ -863,6 +864,20 @@ ravadaApp.directive("solShowMachine", swMach) $scope.list_nodes(); $interval($scope.list_nodes,30 * 1000); }; + function manage_networks($scope, $http, $interval, $timeout) { + $scope.init = function(id_vm) { + $scope.list_networks(id_vm); + } + $scope.list_networks = function(id_vm) { + $http.get('/vm/list_networks/'+id_vm).then(function(response) { + for (var i=0; i sub($c) { _add_admin_libs($c); _select_vm($c); - $c->stash(tab => ($c->param('tab') or '')); - $c->stash('item' => 'network'); - $c->stash('id' => $c->stash('id_vm')); - - return $c->render( template => '/main/settings_generic' ); + return $c->render( template => '/main/admin_networks' ); }; @@ -483,6 +479,11 @@ get '/list_routes.json' => sub { $c->render(json => [ Ravada::Route->list_networks ]); }; +get '/vm/list_networks/(:id_vm)' => sub { + my $c = shift; + $c->render(json => Ravada::Front->list_networks($c->stash('id_vm')) ); +}; + get '/route/info/#id' => sub($c) { my $sth = $RAVADA->_dbh->prepare("SELECT * from networks WHERE id=?"); $sth->execute($c->stash('id')); diff --git a/t/vm/networking.t b/t/vm/networking.t new file mode 100644 index 000000000..18d622456 --- /dev/null +++ b/t/vm/networking.t @@ -0,0 +1,122 @@ +use warnings; +use strict; + +use Carp qw(confess); +use Data::Dumper; +use Test::More; + +no warnings "experimental::signatures"; +use feature qw(signatures); + +use lib 't/lib'; +use Test::Ravada; +######################################################################## + +sub test_list_networks($vm) { + my @list = $vm->list_virtual_networks(); + my ($default)= grep { $_->{name} eq 'default' } @list; + ok($default); + + for my $net ( @list ) { + my ($found) = _search_network(internal_id=>$net->{internal_id}); + is($found->{name}, $net->{name}); + ($found) = _search_network(id_vm => $net->{id_vm}, name => $net->{name}); + is($found->{internal_id}, $net->{internal_id}); + } + +} + +sub _search_network(%args) { + my $sql = "SELECT * FROM virtual_networks " + ." WHERE ".join(" AND ",map { "$_=?" } sort keys %args); + my $sth = connector->dbh->prepare($sql); + $sth->execute(map { $args{$_} } sort keys %args); + my $found = $sth->fetchrow_hashref; + return $found; +} + +sub test_add_network($vm) { + my $name = new_domain_name; + my $net = { + name => $name + ,id_vm => $vm->id + ,ip_address => '203.0.113.1' + ,ip_netmask => '255.255.255.0' + }; + my $user = create_user(); + my $req = Ravada::Request->create_network( + uid => $user->id + ,id_vm => $vm->id + ,data => $net + ); + wait_request(check_error => 0); + like($req->error,qr/not authorized/); + + $req = Ravada::Request->create_network( + uid => user_admin->id + ,id_vm => $vm->id + ,data => $net + ); + wait_request(); + my($new) = grep { $_->{name} eq $name } $vm->list_virtual_networks(); + ok($new,"Expecting new network $name created") or return; + + is($new->{dhcp_start},2); + is($new->{dhcp_end},254); + ok($new->{internal_id}); + return $new; +} + +sub test_remove_network($vm, $net) { + my $user = create_user(); + my $req = Ravada::Request->remove_network( + uid => $user->id + ,id => $net->{id} + ,id_vm => $vm->id + ); + wait_request(check_error => 0); + like($req->error,qr/not authorized/); + user_admin->make_admin($user->id); + $req->status('requested'); + + wait_request(debug => 1); + + my($new) = grep { $_->{name} eq $net->{name} } $vm->list_virtual_networks(); + ok(!$new,"Expecting removed network $net->{name}") or exit; +} + +######################################################################## + +init(); +clean(); + +for my $vm_name ( vm_names() ) { + diag("testing $vm_name"); + + SKIP: { + + my $msg = "SKIPPED test: No $vm_name VM found "; + my $vm; + if ($vm_name eq 'KVM' && $>) { + $msg = "SKIPPED: Test must run as root"; + } else { + $vm = Ravada::VM->open( type => $vm_name ); + } + + diag($msg) if !$vm; + skip $msg,10 if !$vm; + + is($vm->has_networking,1) if $vm_name eq 'KVM'; + next if !$vm->has_networking(); + + test_list_networks($vm); + my $net = test_add_network($vm); + + test_remove_network($vm,$net); + } +} + +end(); + +done_testing(); + diff --git a/templates/main/admin_networks.html.ep b/templates/main/admin_networks.html.ep new file mode 100644 index 000000000..931f7ab84 --- /dev/null +++ b/templates/main/admin_networks.html.ep @@ -0,0 +1,47 @@ + + +%= include 'bootstrap/header' + +
+ %= include 'bootstrap/navigation' +
+
+
+

<%=l 'Networks' %>

+
+

+ <%=l 'New Network' %> +

+
+
+
+
+ +
+
+
+ {{network.name}} +
+
{{network.address}}
+ +
+
+
+
+ +%= include $footer +%= include 'bootstrap/scripts' + + diff --git a/templates/main/network_options.html.ep b/templates/main/network_options.html.ep new file mode 100644 index 000000000..55bdd0693 --- /dev/null +++ b/templates/main/network_options.html.ep @@ -0,0 +1 @@ +options diff --git a/templates/main/network_remove.html.ep b/templates/main/network_remove.html.ep new file mode 100644 index 000000000..9043f8044 --- /dev/null +++ b/templates/main/network_remove.html.ep @@ -0,0 +1,8 @@ +
+ <%=l 'Are you sure you want to remove the' %> <%= $item %> {{network.name}} + + + +
+ +
{{message}}
diff --git a/templates/main/settings_generic_tabs.html.ep b/templates/main/settings_generic_tabs.html.ep index 1bdf56034..b1eb10153 100644 --- a/templates/main/settings_generic_tabs.html.ep +++ b/templates/main/settings_generic_tabs.html.ep @@ -2,7 +2,7 @@ % node => ['options' , 'bases', 'remove' , 'hostdev'] % ,route => ['options', 'machines', 'remove'] % ,storage => ['list', 'options', 'purge'] -% ,network => ['list', 'options', 'remove'] +% ,network => ['options','remove'] % ); % my $tabs = $tabs_item{$item}; From d39f5f94c4cfd12eeea135e8d1cfa8f361bdd450 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 24 Jul 2023 16:52:13 +0200 Subject: [PATCH 05/58] wip: list networks --- public/js/admin.js | 25 ++++++-- script/rvd_front | 18 ++++++ templates/main/network_options.html.ep | 82 +++++++++++++++++++++++++- 3 files changed, 119 insertions(+), 6 deletions(-) diff --git a/public/js/admin.js b/public/js/admin.js index b5f56988b..20bd95806 100644 --- a/public/js/admin.js +++ b/public/js/admin.js @@ -905,13 +905,28 @@ ravadaApp.directive("solShowMachine", swMach) function settings_network($scope, $http, $interval, $timeout) { $scope.init = function(id) { - console.log($scope.network); + $scope.load_network(id); }; - $scope.network = { - 'id': 1 - ,'name': 'default' - ,'_old_name': 'default' + $scope.load_network = function(id) { + $http.get('/v2/network/info/'+id) + .then(function(response) { + $scope.network = response.data; + $scope.network._old_name = $scope.network.name; + }); + + }; + + $scope.update_network = function() { + $http.post('/v2/network/set/' + , JSON.stringify($scope.network)) + .then(function(response) { + if (response.data.ok == 1){ + $scope.saved = true; + } + $scope.error = response.data.error; + }); }; + } diff --git a/script/rvd_front b/script/rvd_front index 98e87b71e..9087c8c95 100644 --- a/script/rvd_front +++ b/script/rvd_front @@ -502,6 +502,24 @@ get '/route/list_domains/#id' => sub($c) { return $c->render( json => $RAVADA->list_bases_network($c->stash('id'))); }; +get '/v2/network/info/#id' => sub($c) { + my $sth = $RAVADA->_dbh->prepare("SELECT * from virtual_networks WHERE id=?"); + $sth->execute($c->stash('id')); + my $row = $sth->fetchrow_hashref; + return $c->render(json => $row); +}; + +post '/v2/network/set' => sub($c) { + return access_denied($c) if !$USER->is_admin; + + my $arg = decode_json($c->req->body); + Ravada::Request->change_network( + uid => $USER->id + ,data => $arg + ); + return $c->render(json => { ok => 1 }); +}; + sub _add_admin_libs($c) { push @{$c->stash->{js}}, '/js/admin.js?v='.$RAVADA->version; push @{$c->stash->{css}}, '/css/admin.css'; diff --git a/templates/main/network_options.html.ep b/templates/main/network_options.html.ep index 55bdd0693..e8ba259b8 100644 --- a/templates/main/network_options.html.ep +++ b/templates/main/network_options.html.ep @@ -1 +1,81 @@ -options +
+
+ +
+
<%=l 'Name' %>
+
+ +
+
+ +
+
<%=l 'Bridge' %>
+
+ +
+
+ +
+
<%=l 'DHCP start' %>
+
+ +
+
+ +
+
<%=l 'DHCP start' %>
+
+ +
+
+ +
+
<%=l 'IP address' %>
+
+ +
+
+ +
+
<%=l 'Netmask' %>
+
+ +
+
+ +
+
<%=l 'Auto Start' %>
+
+ +
+
+ +
+
<%=l 'Active' %>
+
+ +
+
+ +
+
+
+ + +
+
+ + +
+
+ From 53f84d252944adff4f71362c4f1ca235f130dc52 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 24 Jul 2023 17:13:57 +0200 Subject: [PATCH 06/58] wip: change network --- lib/Ravada.pm | 14 +++++++++++--- lib/Ravada/Request.pm | 3 ++- t/vm/networking.t | 16 ++++++++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/lib/Ravada.pm b/lib/Ravada.pm index 10f263616..52e826a83 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -6176,6 +6176,7 @@ sub _req_method { ,create_network => \&_cmd_create_network ,remove_network => \&_cmd_remove_network + ,change_network => \&_cmd_change_network ); return $methods{$cmd}; @@ -6609,11 +6610,18 @@ sub _cmd_remove_network($self, $request) { die "Error: ".$user->name." not authorized\n" unless $user->can_create_networks; - my $id = $request->args('id_vm'); - my $vm = Ravada::VM->open($id); - $vm->remove_network($user, $request->args('id')); + my $id = $request->args('id'); + my $sth = $CONNECTOR->dbh->prepare( + "SELECT id_vm FROM virtual_networks WHERE id=?") + $sth->execute($id); + my ($id_vm) = $sth->fetchrow; + + my $vm = Ravada::VM->open($id_vm); + $vm->remove_network($user, $id); } +sub _cmd_change_network($self, $request) { +} sub _cmd_active_storage_pool($self, $request) { my $user = Ravada::Auth::SQL->search_by_id($request->args('uid')); diff --git a/lib/Ravada/Request.pm b/lib/Ravada/Request.pm index 0d65f588a..b187c8070 100644 --- a/lib/Ravada/Request.pm +++ b/lib/Ravada/Request.pm @@ -165,7 +165,8 @@ our %VALID_ARG = ( ,remove_files => { uid => 1, id_vm => 1, files => 1 } ,create_network => { uid => 1, id_vm => 1, data => 1 } - ,remove_network => { uid => 1, id_vm => 1, id => 1 } + ,remove_network => { uid => 1, id => 1 } + ,change_network => { uid => 1, data => 1 } ); $VALID_ARG{shutdown} = $VALID_ARG{shutdown_domain}; diff --git a/t/vm/networking.t b/t/vm/networking.t index 18d622456..ad1c82d56 100644 --- a/t/vm/networking.t +++ b/t/vm/networking.t @@ -85,6 +85,20 @@ sub test_remove_network($vm, $net) { ok(!$new,"Expecting removed network $net->{name}") or exit; } +sub test_change_network($net) { + my %net2 = %$net; + $net2{dhcp_end} = 100; + my $req = Ravada::Request->change_network( + uid => user_admin->id + ,data => \%net2 + ); + wait_request(); + my $vm = Ravada::VM->open($net->{id_vm}); + + my($new) = grep { $_->{name} eq $net->{name} } $vm->list_virtual_networks(); + is($new->{dhcp_end},$net2{dhcp_end}); +} + ######################################################################## init(); @@ -112,6 +126,8 @@ for my $vm_name ( vm_names() ) { test_list_networks($vm); my $net = test_add_network($vm); + test_change_network($net); + test_remove_network($vm,$net); } } From 06a6e4537a9e58ab433c69c4ad10724553052965 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Wed, 26 Jul 2023 15:40:38 +0200 Subject: [PATCH 07/58] wip: change and remove network --- lib/Ravada.pm | 21 ++++- lib/Ravada/Request.pm | 1 + lib/Ravada/VM.pm | 32 +++++++ lib/Ravada/VM/KVM.pm | 82 +++++++++++++++- lib/Ravada/VM/Void.pm | 2 + public/js/admin.js | 4 - t/vm/networking.t | 126 +++++++++++++++++++++++-- templates/main/network_options.html.ep | 18 ++-- 8 files changed, 261 insertions(+), 25 deletions(-) diff --git a/lib/Ravada.pm b/lib/Ravada.pm index 52e826a83..44eca5f06 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -2376,8 +2376,8 @@ sub _sql_create_tables($self) { ,bridge => 'char(80)' ,'ip_address' => 'char(20)' ,'ip_netmask' => 'char(20)' - ,'dhcp_start' => 'integer' - ,'dhcp_end' => 'integer' + ,'dhcp_start' => 'char(15)' + ,'dhcp_end' => 'char(15)' ,date_changed => 'timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP' } ] @@ -6612,7 +6612,7 @@ sub _cmd_remove_network($self, $request) { my $id = $request->args('id'); my $sth = $CONNECTOR->dbh->prepare( - "SELECT id_vm FROM virtual_networks WHERE id=?") + "SELECT id_vm FROM virtual_networks WHERE id=?"); $sth->execute($id); my ($id_vm) = $sth->fetchrow; @@ -6621,6 +6621,21 @@ sub _cmd_remove_network($self, $request) { } sub _cmd_change_network($self, $request) { + my $user=Ravada::Auth::SQL->search_by_id($request->args('uid')); + my $data = $request->args('data'); + + my $sth = $CONNECTOR->dbh->prepare( + "SELECT * FROM virtual_networks WHERE id=?" + ); + $sth->execute($data->{id}); + my $network = $sth->fetchrow_hashref; + + die "Error: ".$user->name." not authorized\n" + unless $user->is_admin + || ( $user->can_create_networks && $network->{id_owner} == $user->id); + + my $vm = Ravada::VM->open($data->{id_vm}); + $vm->change_network($data); } sub _cmd_active_storage_pool($self, $request) { diff --git a/lib/Ravada/Request.pm b/lib/Ravada/Request.pm index b187c8070..3aa34436f 100644 --- a/lib/Ravada/Request.pm +++ b/lib/Ravada/Request.pm @@ -183,6 +183,7 @@ our %CMD_SEND_MESSAGE = map { $_ => 1 } shutdown_node reboot_node start_node compact purge start_domain + change_network ); our %CMD_NO_DUPLICATE = map { $_ => 1 } diff --git a/lib/Ravada/VM.pm b/lib/Ravada/VM.pm index c6e114e42..00fe2b352 100644 --- a/lib/Ravada/VM.pm +++ b/lib/Ravada/VM.pm @@ -158,6 +158,7 @@ around '_list_used_volumes' => \&_around_list_used_volumes; around 'create_network' => \&_around_create_network; around 'remove_network' => \&_around_remove_network; around 'list_virtual_networks' => \&_around_list_networks; +around 'change_network' => \&_around_change_network; ############################################################# # @@ -1480,14 +1481,45 @@ sub _around_remove_network($orig, $self, $user, $id_net) { die "Error: network id $id_net not found" if !$net; $self->$orig($net->{name}); + + my $sth = $self->_dbh->prepare("DELETE FROM virtual_networks WHERE id=?"); + $sth->execute($id_net); } +sub _around_change_network($orig, $self, $data) { + delete $data->{_old_name}; + delete $data->{date_changed}; + my %data2 = %$data; + delete $data->{id_owner}; + + my $changed = $orig->($self, $data); + return if !$changed; + + my $id = delete $data2{id}; + my $sql = ""; + for my $field (sort keys %data2) { + $sql .= ", " if $sql; + $sql .=" $field=? " + } + $sql = "UPDATE virtual_networks set $sql WHERE id=?"; + my $sth = $self->_dbh->prepare($sql); + my @values = map { $data2{$_} } sort keys %data2; + $sth->execute(@values, $id); +} sub _around_list_networks($orig, $self) { my @list = $orig->($self); for my $net ( @list ) { $self->_update_network($net); } + my $sth = $self->_dbh->prepare("SELECT id,name FROM virtual_networks"); + my $sth_delete = $self->_dbh->prepare("DELETE FROM virtual_networks where id=?"); + $sth->execute; + while (my ($id,$name) = $sth->fetchrow) { + my ($found) = grep {$_->{name} eq $name } @list; + next if $found; + $sth_delete->execute($id); + } return @list; } diff --git a/lib/Ravada/VM/KVM.pm b/lib/Ravada/VM/KVM.pm index 319f3ecec..1a31e8fb0 100644 --- a/lib/Ravada/VM/KVM.pm +++ b/lib/Ravada/VM/KVM.pm @@ -2941,8 +2941,8 @@ sub list_virtual_networks($self) { my ($dhcp_range) = $ip_doc->findnodes("dhcp/range"); my ($start,$end); if ($dhcp_range) { - ($start) = $dhcp_range->getAttribute('start') =~ /.*\.(\d+)/; - ($end) = $dhcp_range->getAttribute('end')=~ /.*\.(\d+)/; + $start = $dhcp_range->getAttribute('start'); + $end = $dhcp_range->getAttribute('end'); $data->{dhcp_start} = $start if defined $start; $data->{dhcp_end} = $end if defined $end; } @@ -2978,6 +2978,9 @@ sub create_network($self, $data) { my $xml2=XML::LibXML->load_xml(string =>$new_network->get_xml_description()); my ($uuid) = $xml2->findnodes("/network/uuid/text()"); $data->{internal_id} = $uuid; + + $new_network->create(); + $new_network->set_autostart(1); } sub remove_network($self, $name) { @@ -2989,7 +2992,82 @@ sub remove_network($self, $name) { $net->undefine(); } +sub change_network($self, $data) { + my $network = $self->vm->get_network_by_uuid($data->{internal_id}); + die "Error: Unknown network $data->{name}" if !$network; + + my $doc = XML::LibXML->load_xml(string => $network->get_xml_description); + my $changed = 0; + my $bridge = delete $data->{bridge}; + my ($bridge_xml) = $doc->findnodes("/network/bridge"); + if ($bridge_xml->getAttribute('name') ne $bridge) { + $bridge_xml->setAttribute(name => $bridge); + $changed++; + } + my $dhcp_start = delete $data->{dhcp_start}; + my $dhcp_end = delete $data->{dhcp_end}; + my ($dhcp_xml) = $doc->findnodes("/network/ip/dhcp/range"); + if ($dhcp_xml->getAttribute('start') ne $dhcp_start) { + $dhcp_xml->setAttribute('start' => $dhcp_start); + $changed++; + } + if ($dhcp_xml->getAttribute('end') ne $dhcp_end) { + $dhcp_xml->setAttribute('end' => $dhcp_end); + $changed++; + } + my $ip_address = delete $data->{ip_address}; + my ($ip_xml) = $doc->findnodes("/network/ip"); + if ($ip_address ne $ip_xml->getAttribute('address')) { + $ip_xml->setAttribute('address' => $ip_address); + $changed++; + } + my $ip_netmask = delete $data->{ip_netmask}; + if ($ip_netmask ne $ip_xml->getAttribute('netmask')) { + $ip_xml->setAttribute('netmask' => $ip_netmask); + $changed++; + } + my $name = delete $data->{name}; + my ($name_xml) = $doc->findnodes("/network/name/text()"); + if (''.$name_xml ne $name) { + die "Error: networks can not be renamed"; + } + + if ($changed) { + $network->destroy(); + $network= $self->vm->define_network($doc->toString); + $network->create(); + } + my $is_active = delete $data->{is_active}; + if (defined $is_active) { + if ($is_active && ! $network->is_active) { + $network->create(); + $changed++; + } + if (!$is_active && $network->is_active) { + $network->destroy; + $changed++; + } + } + my $autostart = delete $data->{autostart}; + if (defined $autostart) { + if ($autostart && ! $network->get_autostart) { + $network->set_autostart(1); + $changed++; + } + if (!$autostart && $network->get_autostart) { + $network->set_autostart(0); + $changed++; + } + } + + for ('id_vm','internal_id','id' ,'_old_name', 'date_changed') { + delete $data->{$_}; + } + die "Error: unexpected args ".Dumper($data) if keys %$data; + + return $changed; +} 1; diff --git a/lib/Ravada/VM/Void.pm b/lib/Ravada/VM/Void.pm index 067a729bf..c72019a0a 100644 --- a/lib/Ravada/VM/Void.pm +++ b/lib/Ravada/VM/Void.pm @@ -666,6 +666,8 @@ sub active_storage_pool($self, $name, $value) { $self->write_file($file_sp, Dump( \@list)); } +sub change_network {} + #########################################################################3 1; diff --git a/public/js/admin.js b/public/js/admin.js index 20bd95806..0bd44e584 100644 --- a/public/js/admin.js +++ b/public/js/admin.js @@ -920,10 +920,6 @@ ravadaApp.directive("solShowMachine", swMach) $http.post('/v2/network/set/' , JSON.stringify($scope.network)) .then(function(response) { - if (response.data.ok == 1){ - $scope.saved = true; - } - $scope.error = response.data.error; }); }; diff --git a/t/vm/networking.t b/t/vm/networking.t index ad1c82d56..d8ad54fea 100644 --- a/t/vm/networking.t +++ b/t/vm/networking.t @@ -61,9 +61,11 @@ sub test_add_network($vm) { my($new) = grep { $_->{name} eq $name } $vm->list_virtual_networks(); ok($new,"Expecting new network $name created") or return; - is($new->{dhcp_start},2); - is($new->{dhcp_end},254); + like($new->{dhcp_start},qr/.*\.2$/); + like($new->{dhcp_end},qr/.*\.254$/); ok($new->{internal_id}); + is($new->{is_active},1); + is($new->{autostart},1); return $new; } @@ -72,22 +74,30 @@ sub test_remove_network($vm, $net) { my $req = Ravada::Request->remove_network( uid => $user->id ,id => $net->{id} - ,id_vm => $vm->id ); wait_request(check_error => 0); like($req->error,qr/not authorized/); user_admin->make_admin($user->id); $req->status('requested'); - wait_request(debug => 1); + wait_request(debug => 0); my($new) = grep { $_->{name} eq $net->{name} } $vm->list_virtual_networks(); ok(!$new,"Expecting removed network $net->{name}") or exit; } +sub _check_network_changed($net, $field) { + my $sth = connector->dbh->prepare( + "SELECT * FROM virtual_networks WHERE id=?" + ); + $sth->execute($net->{id}); + my $row = $sth->fetchrow_hashref; + is($row->{$field},$net->{$field}, $field) or exit; +} + sub test_change_network($net) { my %net2 = %$net; - $net2{dhcp_end} = 100; + $net2{dhcp_end} =~ s/(.*)\.\d+$/$1.100/; my $req = Ravada::Request->change_network( uid => user_admin->id ,data => \%net2 @@ -96,7 +106,107 @@ sub test_change_network($net) { my $vm = Ravada::VM->open($net->{id_vm}); my($new) = grep { $_->{name} eq $net->{name} } $vm->list_virtual_networks(); - is($new->{dhcp_end},$net2{dhcp_end}); + is($new->{dhcp_end},$net2{dhcp_end}) or die $net->{name}; + + _check_network_changed($new,'dhcp_end'); + + for my $is (0, 1) { + $net2{is_active} = $is; + $req = Ravada::Request->change_network( + uid => user_admin->id + ,data => \%net2 + ); + wait_request(debug => 0); + + ($new) = grep { $_->{name} eq $net->{name} } $vm->list_virtual_networks(); + is($new->{is_active},$is); + _check_network_changed($new,'is_active'); + } + + $net2{autostart} = 0; + $req = Ravada::Request->change_network( + uid => user_admin->id + ,data => \%net2 + ); + wait_request(); + + ($new) = grep { $_->{name} eq $net->{name} } $vm->list_virtual_networks(); + is($new->{autostart},0); + _check_network_changed($new,'autostart'); + + my ($default) = grep { $_->{name} eq 'default' } $vm->list_virtual_networks(); + $net2{bridge} = $default->{bridge}; + $req = Ravada::Request->change_network( + uid => user_admin->id + ,data => \%net2 + ); + wait_request(check_error => 0); + + ($new) = grep { $_->{name} eq $net->{name} } $vm->list_virtual_networks(); + isnt($new->{bridge},$default->{bridge}); + _check_network_changed($new,'bridge') or exit; + + $net2{name} = new_domain_name(); + $req = Ravada::Request->change_network( + uid => user_admin->id + ,data => \%net2 + ); + wait_request(check_error => 0 ); + + like($req->error,qr/can not be renamed/); + +} + +sub test_change_network_internal($vm, $net) { + return if $vm->type ne 'KVM'; + + my $network = $vm->vm->get_network_by_name($net->{name}); + die "Error: I can't find network $net->{name}" if !$network; + + my $doc = XML::LibXML->load_xml( string => $network->get_xml_description ); + my ($range) = $doc->findnodes("/network/ip/dhcp/range"); + my $start_new = $range->getAttribute('start'); + my ($n) = $start_new =~ /.*\.(\d+)/; + $n++; + $start_new =~ s/(.*)\.(\d+)/$1.$n/; + $range->setAttribute('start' , $start_new); + + $network->destroy(); + $network= $vm->vm->define_network($doc->toString); + $network->create(); + + my $network2 = $vm->vm->get_network_by_name($net->{name}); + my ($range2) = $doc->findnodes("/network/ip/dhcp/range"); + is($range2->getAttribute('start'), $start_new) or exit; + + my ($net2) = grep { $_->{name} eq $net->{name} } $vm->list_virtual_networks(); + is($net2->{dhcp_start},$start_new) or exit; + +} + +sub test_disapeared_network($vm) { + return if $vm->type ne 'KVM'; + my $net = test_add_network($vm); + + my $network = $vm->vm->get_network_by_name($net->{name}); + $network->destroy() if $network->is_active; + $network->undefine(); + + my ($net2) = grep { $_->{name} eq $net->{name} } $vm->list_virtual_networks(); + ok(!$net2, "Expecting $net->{name} removed"); + + my $sth = connector->dbh->prepare("SELECT * FROM virtual_networks WHERE name=?"); + $sth->execute($net->{name}); + my $row = $sth->fetchrow_hashref; + ok(!$row,"Expected $net->{name} removed from db".Dumper($row)) or exit; + + my ($default) = grep { $_->{name} eq 'default' } $vm->list_virtual_networks(); + ok($default) or exit; + + $sth->execute('default'); + $row = $sth->fetchrow_hashref; + (!$row,"Expected $net->{name} removed from db".Dumper($row)) or exit; + } ######################################################################## @@ -123,9 +233,13 @@ for my $vm_name ( vm_names() ) { is($vm->has_networking,1) if $vm_name eq 'KVM'; next if !$vm->has_networking(); + test_disapeared_network($vm); + test_list_networks($vm); my $net = test_add_network($vm); + test_change_network_internal($vm, $net); + test_change_network($net); test_remove_network($vm,$net); diff --git a/templates/main/network_options.html.ep b/templates/main/network_options.html.ep index e8ba259b8..cf348b946 100644 --- a/templates/main/network_options.html.ep +++ b/templates/main/network_options.html.ep @@ -4,7 +4,7 @@
<%=l 'Name' %>
- +
@@ -18,16 +18,15 @@
<%=l 'DHCP start' %>
-
-
<%=l 'DHCP start' %>
+
<%=l 'DHCP end' %>
- +
@@ -49,7 +48,7 @@
<%=l 'Auto Start' %>
@@ -58,7 +57,7 @@
<%=l 'Active' %>
@@ -70,12 +69,11 @@ ng-click="load_network(network.id)"><%=l 'Cancel' %> + ng-disabled="!form_options.$valid" + ><%=l 'Save' %>
-
From 5a9d2a3875783cd7e2aad1d364a57e89b98666d8 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 27 Jul 2023 13:58:55 +0200 Subject: [PATCH 08/58] wip: create network --- lib/Ravada.pm | 2 +- lib/Ravada/Request.pm | 3 ++- lib/Ravada/VM.pm | 8 +++++--- public/js/admin.js | 13 ++++++++++++- script/rvd_front | 26 ++++++++++++++++++++++---- t/vm/networking.t | 2 +- templates/main/network_options.html.ep | 26 +++++++++++++------------- 7 files changed, 56 insertions(+), 24 deletions(-) diff --git a/lib/Ravada.pm b/lib/Ravada.pm index 44eca5f06..82649e3ae 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -6600,7 +6600,7 @@ sub _cmd_create_network($self, $request) { die "Error: ".$user->name." not authorized\n" unless $user->can_create_networks; - my $id = $request->args('id_vm'); + my $id = $request->args('id_vm') or die "Error: missing id_vm"; my $vm = Ravada::VM->open($id); $vm->create_network($request->args('data'),$request->args('uid')); } diff --git a/lib/Ravada/Request.pm b/lib/Ravada/Request.pm index 3aa34436f..ad7aa67da 100644 --- a/lib/Ravada/Request.pm +++ b/lib/Ravada/Request.pm @@ -183,7 +183,8 @@ our %CMD_SEND_MESSAGE = map { $_ => 1 } shutdown_node reboot_node start_node compact purge start_domain - change_network + + create_network change_network remove_network ); our %CMD_NO_DUPLICATE = map { $_ => 1 } diff --git a/lib/Ravada/VM.pm b/lib/Ravada/VM.pm index 00fe2b352..4ee136b59 100644 --- a/lib/Ravada/VM.pm +++ b/lib/Ravada/VM.pm @@ -1463,7 +1463,7 @@ sub _around_create_network($orig, $self,$data, $id_owner) { $data->{is_active}=1 if !exists $data->{is_active}; $data->{autostart}=1 if !exists $data->{autostart}; - my $ip = $data->{ip_address}; + my $ip = delete $data->{ip_address} or die "Error: missing ip address"; $ip =~ s/(.*)\..*/$1/; $data->{dhcp_start}="$ip.2" if !exists $data->{dhcp_start}; $data->{dhcp_end}="$ip.254" if !exists $data->{dhcp_end}; @@ -1512,9 +1512,11 @@ sub _around_list_networks($orig, $self) { for my $net ( @list ) { $self->_update_network($net); } - my $sth = $self->_dbh->prepare("SELECT id,name FROM virtual_networks"); + my $sth = $self->_dbh->prepare( + "SELECT id,name FROM virtual_networks " + ." WHERE id_vm=?"); my $sth_delete = $self->_dbh->prepare("DELETE FROM virtual_networks where id=?"); - $sth->execute; + $sth->execute($self->id); while (my ($id,$name) = $sth->fetchrow) { my ($found) = grep {$_->{name} eq $name } @list; next if $found; diff --git a/public/js/admin.js b/public/js/admin.js index 0bd44e584..13e948993 100644 --- a/public/js/admin.js +++ b/public/js/admin.js @@ -905,8 +905,19 @@ ravadaApp.directive("solShowMachine", swMach) function settings_network($scope, $http, $interval, $timeout) { $scope.init = function(id) { - $scope.load_network(id); + if ( id ) { + $scope.load_network(id); + } + }; + $scope.new_network = function(id_vm) { + $scope.network = { + 'id_vm': id_vm + ,'bridge': 'virbr2' + ,'ip_address': '10.10.0.0' + ,'ip_netmask': '255.255.255.0' + }; }; + $scope.load_network = function(id) { $http.get('/v2/network/info/'+id) .then(function(response) { diff --git a/script/rvd_front b/script/rvd_front index 9087c8c95..191347b2a 100644 --- a/script/rvd_front +++ b/script/rvd_front @@ -502,6 +502,14 @@ get '/route/list_domains/#id' => sub($c) { return $c->render( json => $RAVADA->list_bases_network($c->stash('id'))); }; +get '/network/new' => sub($c) { + return access_denied($c) unless $USER->can_create_networks(); + + _add_admin_libs($c); + _select_vm($c); + return $c->render(template => "/main/network_new"); +}; + get '/v2/network/info/#id' => sub($c) { my $sth = $RAVADA->_dbh->prepare("SELECT * from virtual_networks WHERE id=?"); $sth->execute($c->stash('id')); @@ -513,10 +521,20 @@ post '/v2/network/set' => sub($c) { return access_denied($c) if !$USER->is_admin; my $arg = decode_json($c->req->body); - Ravada::Request->change_network( - uid => $USER->id - ,data => $arg - ); + if ($arg->{id}) { + Ravada::Request->change_network( + uid => $USER->id + ,data => $arg + ); + } else { + my $id_vm = delete $arg->{id_vm}; + Ravada::Request->create_network( + uid => $USER->id + ,id_vm => $id_vm + ,data => $arg + ); + + } return $c->render(json => { ok => 1 }); }; diff --git a/t/vm/networking.t b/t/vm/networking.t index d8ad54fea..fb5a18760 100644 --- a/t/vm/networking.t +++ b/t/vm/networking.t @@ -205,7 +205,7 @@ sub test_disapeared_network($vm) { $sth->execute('default'); $row = $sth->fetchrow_hashref; - (!$row,"Expected $net->{name} removed from db".Dumper($row)) or exit; + ok($row,"Expected default not removed from db".Dumper($row)) or exit; } diff --git a/templates/main/network_options.html.ep b/templates/main/network_options.html.ep index cf348b946..dde137590 100644 --- a/templates/main/network_options.html.ep +++ b/templates/main/network_options.html.ep @@ -4,43 +4,43 @@
<%=l 'Name' %>
- +
<%=l 'Bridge' %>
- +
-
<%=l 'DHCP start' %>
-
- +
<%=l 'IP address' %>
+
+
-
<%=l 'DHCP end' %>
+
<%=l 'Netmask' %>
- +
-
<%=l 'IP address' %>
-
- +
<%=l 'DHCP start' %>
+
+
-
<%=l 'Netmask' %>
+
<%=l 'DHCP end' %>
- +
From 15a9676b31508629097205f25f2edc975af67b50 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 28 Jul 2023 10:54:18 +0200 Subject: [PATCH 09/58] wip: update network changes in db --- lib/Ravada/VM.pm | 20 ++++++++++++--- lib/Ravada/VM/KVM.pm | 2 ++ t/vm/networking.t | 59 ++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 76 insertions(+), 5 deletions(-) diff --git a/lib/Ravada/VM.pm b/lib/Ravada/VM.pm index 4ee136b59..460090bec 100644 --- a/lib/Ravada/VM.pm +++ b/lib/Ravada/VM.pm @@ -1432,6 +1432,8 @@ sub _insert_network($self, $net) { $net->{id_owner} = Ravada::Utils::user_daemon->id if !exists $net->{id_owner}; + $net->{id_vm} = $self->id; + my $sql = "INSERT INTO virtual_networks (" .join(",",sort keys %$net).")" ." VALUES(".join(",",map { '?' } keys %$net).")"; @@ -1443,13 +1445,25 @@ sub _insert_network($self, $net) { sub _update_network($self, $net) { my $sth = $self->_dbh->prepare("SELECT * FROM virtual_networks " - ." WHERE id_vm=? AND internal_id=?" + ." WHERE id_vm=? AND ( internal_id=? OR name = ?)" ); - $sth->execute($self->id,$net->{internal_id}); + $sth->execute($self->id,$net->{internal_id}, $net->{name}); my $db_net = $sth->fetchrow_hashref(); if (!$db_net) { $self->_insert_network($net); } else { + for my $field ( keys %$net ) { + die "Wrong field in virtual_networks table : '$field'" + if $field !~ /^[a-z]+[a-z0-9_]+$/; + + next if !defined $net->{đield} && !defined $db_net->{$field}; + next if defined $net->{field} && $net->{$field} eq $db_net->{$field}; + my $sth = $self->_dbh->prepare( + "UPDATE virtual_networks set $field=?" + ." WHERE id=?" + ); + $sth->execute($net->{$field}, $db_net->{id}); + } $net->{id} = $db_net->{id}; } delete $db_net->{date_changed}; @@ -1463,7 +1477,7 @@ sub _around_create_network($orig, $self,$data, $id_owner) { $data->{is_active}=1 if !exists $data->{is_active}; $data->{autostart}=1 if !exists $data->{autostart}; - my $ip = delete $data->{ip_address} or die "Error: missing ip address"; + my $ip = $data->{ip_address} or die "Error: missing ip address"; $ip =~ s/(.*)\..*/$1/; $data->{dhcp_start}="$ip.2" if !exists $data->{dhcp_start}; $data->{dhcp_end}="$ip.254" if !exists $data->{dhcp_end}; diff --git a/lib/Ravada/VM/KVM.pm b/lib/Ravada/VM/KVM.pm index 1a31e8fb0..dfbac7939 100644 --- a/lib/Ravada/VM/KVM.pm +++ b/lib/Ravada/VM/KVM.pm @@ -2953,6 +2953,8 @@ sub list_virtual_networks($self) { sub create_network($self, $data) { + confess if !$data->{name} || !$data->{ip_address}; + my $xml = XML::LibXML->load_xml(string => "$data->{name}" ); diff --git a/t/vm/networking.t b/t/vm/networking.t index fb5a18760..ddb425e2f 100644 --- a/t/vm/networking.t +++ b/t/vm/networking.t @@ -10,6 +10,8 @@ use feature qw(signatures); use lib 't/lib'; use Test::Ravada; + +my $N = 100; ######################################################################## sub test_list_networks($vm) { @@ -40,7 +42,7 @@ sub test_add_network($vm) { my $net = { name => $name ,id_vm => $vm->id - ,ip_address => '203.0.113.1' + ,ip_address => '192.0.'.$N++.'.1' ,ip_netmask => '255.255.255.0' }; my $user = create_user(); @@ -57,7 +59,7 @@ sub test_add_network($vm) { ,id_vm => $vm->id ,data => $net ); - wait_request(); + wait_request( debug => 0); my($new) = grep { $_->{name} eq $name } $vm->list_virtual_networks(); ok($new,"Expecting new network $name created") or return; @@ -184,6 +186,36 @@ sub test_change_network_internal($vm, $net) { } +sub test_changed_uuid($vm) { + return if $vm->type ne 'KVM'; + my $net = test_add_network($vm); + + my $network = $vm->vm->get_network_by_name($net->{name}); + my $doc = XML::LibXML->load_xml(string => $network->get_xml_description()); + + $network->destroy() if $network->is_active; + $network->undefine(); + + my ($uuid_xml) = $doc->findnodes("/network/uuid"); + $uuid_xml->removeChildNodes(); + my $new_uuid = $vm->_unique_uuid(); + $uuid_xml->appendText($new_uuid); + + $vm->vm->define_network($doc->toString()); + + my ($net2) = grep { $_->{name} eq $net->{name} } $vm->list_virtual_networks(); + ok($net2,"Expecting $net->{name} found"); + is($net2->{internal_id},$new_uuid) or die Dumper($net2); + + my $sth = connector->dbh->prepare("SELECT * FROM virtual_networks " + ." WHERE name=?" + ); + $sth->execute($net->{name}); + my $row = $sth->fetchrow_hashref; + is($row->{internal_id},$new_uuid) or exit; + +} + sub test_disapeared_network($vm) { return if $vm->type ne 'KVM'; my $net = test_add_network($vm); @@ -209,6 +241,26 @@ sub test_disapeared_network($vm) { } +sub test_add_down_network($vm) { + return if $vm->type ne 'KVM'; + + my $test = test_add_network($vm); + $test->{is_active} = 0; + my $req = Ravada::Request->change_network( + uid => user_admin->id + ,data => $test + ); + wait_request(); + + my $sth = connector->dbh->prepare("DELETE FROM virtual_networks " + ." WHERE name=? " + ); + $sth->execute($test->{name}); + + my ($net2) = grep { $_->{name} eq $test->{name} } $vm->list_virtual_networks(); + ok($net2,"Expecting $test->{name} network listed") or exit; +} + ######################################################################## init(); @@ -233,7 +285,10 @@ for my $vm_name ( vm_names() ) { is($vm->has_networking,1) if $vm_name eq 'KVM'; next if !$vm->has_networking(); + test_changed_uuid($vm); + test_disapeared_network($vm); + test_add_down_network($vm); test_list_networks($vm); my $net = test_add_network($vm); From ea2b714e07a6dc1df9ee258f8fcc4886b3ad5a07 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 28 Jul 2023 13:43:13 +0200 Subject: [PATCH 10/58] wip: new network --- templates/main/network_new.html.ep | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 templates/main/network_new.html.ep diff --git a/templates/main/network_new.html.ep b/templates/main/network_new.html.ep new file mode 100644 index 000000000..79eb53170 --- /dev/null +++ b/templates/main/network_new.html.ep @@ -0,0 +1,28 @@ + + +%= include 'bootstrap/header' + +
+ %= include 'bootstrap/navigation' +
+ +
+
+
+

<%=l 'New network' %>

+
+
+%= include '/main/network_options' +
+
+
+ +
+
+%= include $footer +%= include 'bootstrap/scripts' + + From f40f47fc9dbe54279df5b90ea7933ee711eac879 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 14 Sep 2023 12:33:48 +0200 Subject: [PATCH 11/58] wip: networks management --- script/rvd_front | 54 +++++++++++++++++++++++++++++--- templates/main/not_found.html.ep | 18 +++++++++++ 2 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 templates/main/not_found.html.ep diff --git a/script/rvd_front b/script/rvd_front index 191347b2a..be4ff2a17 100644 --- a/script/rvd_front +++ b/script/rvd_front @@ -507,7 +507,9 @@ get '/network/new' => sub($c) { _add_admin_libs($c); _select_vm($c); - return $c->render(template => "/main/network_new"); + $c->stash(item => 'network', id => undef, tab => undef); + + return $c->render( template => '/main/network_new' ); }; get '/v2/network/info/#id' => sub($c) { @@ -521,21 +523,28 @@ post '/v2/network/set' => sub($c) { return access_denied($c) if !$USER->is_admin; my $arg = decode_json($c->req->body); + my $req; + my %data; if ($arg->{id}) { - Ravada::Request->change_network( + $req = Ravada::Request->change_network( uid => $USER->id ,data => $arg ); } else { my $id_vm = delete $arg->{id_vm}; - Ravada::Request->create_network( + $req = Ravada::Request->create_network( uid => $USER->id ,id_vm => $id_vm ,data => $arg ); - + $RAVADA->wait_request($req); + my $out = {}; + eval { $out = decode_json($req->output) if $req->output }; + warn $@ if $@; + %data = %$out if $out && keys %$out; } - return $c->render(json => { ok => 1 }); + $data{error} = $req->error; + return $c->render(json => \%data); }; sub _add_admin_libs($c) { @@ -855,6 +864,19 @@ any '/(:item)/settings/(:id).html' => sub($c) { _add_admin_libs($c); $c->stash(tab => ($c->param('tab') or '')); + my $table = $c->stash('item')."s"; + $table = 'virtual_networks' if $table eq 'networks'; + + return access_denied($c) if $table !~ /^[a-z][a-z_]+$/i; + + my $sth = $RAVADA->_dbh->prepare( + "SELECT id,id_vm FROM $table WHERE id=?" + ); + $sth->execute($c->stash('id')); + my ($id2, $id_vm) = $sth->fetchrow; + return not_found($c) if !$id2; + + $c->stash('id_vm' => $id_vm); return $c->render( template => '/main/settings_generic' ); }; @@ -2981,6 +3003,28 @@ sub access_denied_json($c, $msg='Access denied') { return access_denied($c, $msg); } +sub not_found($c,$code=404, $msg="Not found") { + if (defined $c->stash('type') && $c->stash('type') eq 'json') { + return $c->render(json => { error => $msg }, status => $code); + } + my @css_snippets = ["\t.intro {\n\t\tbackground:" + ." url($CONFIG_FRONT->{login_bg_file})" + ." no-repeat bottom center scroll;\n\t}"]; + + return $c->render( + template => ($CONFIG_FRONT->{not_found} or '/main/not_found') + ,css => ['/css/main.css'] + ,csssnippets => @css_snippets + ,js => ['/js/main.js?v='.$RAVADA->version] + ,navbar_custom => 1 + ,error => $msg + ,can_login => ((! $USER) || ($USER->is_temporary)) + ,guide => $CONFIG_FRONT->{guide} + ,status => $code + ); + +} + sub access_denied { my $c = shift; my $msg = shift; diff --git a/templates/main/not_found.html.ep b/templates/main/not_found.html.ep new file mode 100644 index 000000000..d1b308f46 --- /dev/null +++ b/templates/main/not_found.html.ep @@ -0,0 +1,18 @@ + + +%= include 'bootstrap/header' + + %= include 'bootstrap/navigation' +
+
+
+ +

<%= $error %>

+
+
+
+ + %= include 'bootstrap/scripts' + %= include $footer + + From 371558205e0033b33329e42d0049f06b6ba2cb5e Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 14 Sep 2023 14:41:40 +0200 Subject: [PATCH 12/58] wip: generic network management --- lib/Ravada/VM.pm | 50 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 7 deletions(-) diff --git a/lib/Ravada/VM.pm b/lib/Ravada/VM.pm index 460090bec..67df5b2e2 100644 --- a/lib/Ravada/VM.pm +++ b/lib/Ravada/VM.pm @@ -155,6 +155,7 @@ after 'disconnect' => \&_post_disconnect; around '_list_used_volumes' => \&_around_list_used_volumes; +around 'new_network' => \&_around_new_network; around 'create_network' => \&_around_create_network; around 'remove_network' => \&_around_remove_network; around 'list_virtual_networks' => \&_around_list_networks; @@ -202,6 +203,8 @@ sub open { } else { $args{id} = shift; } + confess "Error: undefind id in ".Dumper(\%args) if !$args{id}; + my $class=ref($proto) || $proto; my $self = {}; @@ -1434,11 +1437,13 @@ sub _insert_network($self, $net) { $net->{id_vm} = $self->id; + my @fields = grep !/^_/, sort keys %$net; + my $sql = "INSERT INTO virtual_networks (" - .join(",",sort keys %$net).")" - ." VALUES(".join(",",map { '?' } keys %$net).")"; + .join(",",@fields).")" + ." VALUES(".join(",",map { '?' } @fields).")"; my $sth = $self->_dbh->prepare($sql); - $sth->execute(map { $net->{$_} } sort keys %$net); + $sth->execute(map { $net->{$_} } @fields); $net->{id} = Ravada::Utils::last_insert_id($$CONNECTOR->dbh); } @@ -1449,7 +1454,7 @@ sub _update_network($self, $net) { ); $sth->execute($self->id,$net->{internal_id}, $net->{name}); my $db_net = $sth->fetchrow_hashref(); - if (!$db_net) { + if (!$db_net || !$db_net->{id}) { $self->_insert_network($net); } else { for my $field ( keys %$net ) { @@ -1470,18 +1475,36 @@ sub _update_network($self, $net) { # delete $db_net->{id}; } -sub _around_create_network($orig, $self,$data, $id_owner) { +sub _around_new_network($orig, $self) { + my $data = $self->$orig(); + $data->{id_vm} = $self->id; + return $data; +} + +sub _around_create_network($orig, $self,$data, $id_owner, $request=undef) { my $owner = Ravada::Auth::SQL->search_by_id($id_owner) or confess "Unknown user id: $id_owner"; die "Error: Access denied: ".$owner->name." can not create networks" unless $owner->can_create_networks(); + for my $field (qw(name bridge)) { + next if !$data->{$field}; + my ($found) = grep { $_->{$field} eq $data->{$field} } + $self->list_virtual_networks(); + + die "Error: network $field=$data->{$field} already exists\n" + if $found; + } + $data->{is_active}=1 if !exists $data->{is_active}; $data->{autostart}=1 if !exists $data->{autostart}; my $ip = $data->{ip_address} or die "Error: missing ip address"; $ip =~ s/(.*)\..*/$1/; $data->{dhcp_start}="$ip.2" if !exists $data->{dhcp_start}; $data->{dhcp_end}="$ip.254" if !exists $data->{dhcp_end}; - $self->$orig($data); + delete $data->{_update}; + delete $data->{internal_id} if exists $data->{internal_id}; + eval { $self->$orig($data) }; + $request->error(''.$@) if $@ && $request; $data->{id_owner} = $id_owner; $self->_insert_network($data); } @@ -1507,7 +1530,6 @@ sub _around_change_network($orig, $self, $data) { delete $data->{id_owner}; my $changed = $orig->($self, $data); - return if !$changed; my $id = delete $data2{id}; my $sql = ""; @@ -1521,9 +1543,20 @@ sub _around_change_network($orig, $self, $data) { $sth->execute(@values, $id); } +sub _check_networks($self) { } + sub _around_list_networks($orig, $self) { + my $sth_previous = $self->_dbh->prepare( + "SELECT count(*) FROM virtual_networks " + ." WHERE id_vm=?" + ); + $sth_previous->execute($self->id); + my ($count) = $sth_previous->fetchrow; + my $first_time = !$count; + my @list = $orig->($self); for my $net ( @list ) { + $net->{id_vm}=$self->id; $self->_update_network($net); } my $sth = $self->_dbh->prepare( @@ -1536,6 +1569,9 @@ sub _around_list_networks($orig, $self) { next if $found; $sth_delete->execute($id); } + + $self->_check_networks() if $first_time; + return @list; } From b4f907c31437bbb18530202810af95d0bd0aac4a Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 18 Sep 2023 14:26:57 +0200 Subject: [PATCH 13/58] wip: new network --- lib/Ravada/VM.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/Ravada/VM.pm b/lib/Ravada/VM.pm index 67df5b2e2..335c51d94 100644 --- a/lib/Ravada/VM.pm +++ b/lib/Ravada/VM.pm @@ -1478,6 +1478,8 @@ sub _update_network($self, $net) { sub _around_new_network($orig, $self) { my $data = $self->$orig(); $data->{id_vm} = $self->id; + $data->{is_active}=1; + $data->{autostart}=1; return $data; } @@ -1495,8 +1497,8 @@ sub _around_create_network($orig, $self,$data, $id_owner, $request=undef) { if $found; } - $data->{is_active}=1 if !exists $data->{is_active}; - $data->{autostart}=1 if !exists $data->{autostart}; + $data->{is_active}=0 if !exists $data->{is_active}; + $data->{autostart}=0 if !exists $data->{autostart}; my $ip = $data->{ip_address} or die "Error: missing ip address"; $ip =~ s/(.*)\..*/$1/; $data->{dhcp_start}="$ip.2" if !exists $data->{dhcp_start}; From 8533dc3f62dee56f16a604b9451628232034202d Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 18 Sep 2023 14:58:33 +0200 Subject: [PATCH 14/58] wip: manage networks --- lib/Ravada/VM/KVM.pm | 83 ++++++++++++++++------ lib/Ravada/VM/Void.pm | 160 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 215 insertions(+), 28 deletions(-) diff --git a/lib/Ravada/VM/KVM.pm b/lib/Ravada/VM/KVM.pm index dfbac7939..a054dd02c 100644 --- a/lib/Ravada/VM/KVM.pm +++ b/lib/Ravada/VM/KVM.pm @@ -124,7 +124,6 @@ sub _connect { }; confess $@ if $@; } - $self->_check_networks($vm); return $vm; } @@ -148,17 +147,21 @@ sub _check_default_storage($self) { } } -sub _check_networks { - my $self = shift; - my $vm = shift; +sub _check_networks($self, $vm=$self->vm) { + my @found; for my $net ($vm->list_all_networks) { - next if $net->is_active; - - warn "INFO: Activating KVM network ".$net->get_name."\n"; - $net->create; - $net->set_autostart(1); + return if $net->is_active; + push @found,($net); } + + my ($net) = grep {$_->get_name eq 'default' } @found; + + $net = $found[0] if !$net; + + warn "INFO: Activating KVM network ".$net->get_name."\n"; + $net->create; + $net->set_autostart(1); } =head2 disconnect @@ -2951,6 +2954,37 @@ sub list_virtual_networks($self) { return @networks; } +sub new_network($self) { + my @networks = $self->list_virtual_networks(); + + my %base = ( + name => 'net' + ,ip_address => ['192.168.',122,'.0'] + ,bridge => 'virbr' + ); + my $new = {ip_netmask => '255.255.255.0'}; + for my $field ( keys %base) { + my %old = map { $_->{$field} => 1 } @networks; + my $n = 0; + my $base = ($base{$field} or $field); + if (ref($base)) { + $n=$base->[1]; + } + my $value; + for ( 0 .. 255 ) { + if (ref($base)) { + $value = $base->[0].$n.$base->[2] + } else { + $value = $base.$n; + } + last if !$old{$value}; + $n++; + } + $new->{$field} = $value; + } + return $new; +} + sub create_network($self, $data) { confess if !$data->{name} || !$data->{ip_address}; @@ -2974,21 +3008,28 @@ sub create_network($self, $data) { $range->setAttribute('end' => $data->{dhcp_end}); } + if ($data->{bridge}) { + my ($bridge) = $xml_net->addNewChild(undef,'bridge'); + $bridge->setAttribute(name => $data->{bridge}); + } + $self->vm->define_network($xml->toString()); my $new_network=$self->vm->get_network_by_name($data->{name}); my $xml2=XML::LibXML->load_xml(string =>$new_network->get_xml_description()); my ($uuid) = $xml2->findnodes("/network/uuid/text()"); - $data->{internal_id} = $uuid; + $data->{internal_id} = ''.$uuid; + + $new_network->create() if $data->{is_active}; + + $new_network->set_autostart($data->{autostart}); + + $data->{is_active} = $new_network->is_active; - $new_network->create(); - $new_network->set_autostart(1); } sub remove_network($self, $name) { my $net = $self->vm->get_network_by_name($name); - die "Error: This network can not be removed ".$net->get_name - if $net->get_name eq 'default'; $net->destroy() if $net->is_active; $net->undefine(); @@ -3001,10 +3042,13 @@ sub change_network($self, $data) { my $doc = XML::LibXML->load_xml(string => $network->get_xml_description); my $changed = 0; my $bridge = delete $data->{bridge}; - my ($bridge_xml) = $doc->findnodes("/network/bridge"); - if ($bridge_xml->getAttribute('name') ne $bridge) { - $bridge_xml->setAttribute(name => $bridge); - $changed++; + if (defined $bridge) { + my ($bridge_xml) = $doc->findnodes("/network/bridge"); + if (!defined $bridge_xml->getAttribute('name') + || $bridge_xml->getAttribute('name') ne $bridge) { + $bridge_xml->setAttribute(name => $bridge); + $changed++; + } } my $dhcp_start = delete $data->{dhcp_start}; my $dhcp_end = delete $data->{dhcp_end}; @@ -3035,9 +3079,8 @@ sub change_network($self, $data) { } if ($changed) { - $network->destroy(); + $network->destroy() if $network->is_active; $network= $self->vm->define_network($doc->toString); - $network->create(); } my $is_active = delete $data->{is_active}; diff --git a/lib/Ravada/VM/Void.pm b/lib/Ravada/VM/Void.pm index c72019a0a..403e43d7c 100644 --- a/lib/Ravada/VM/Void.pm +++ b/lib/Ravada/VM/Void.pm @@ -11,7 +11,7 @@ use Moose; use Socket qw( inet_aton inet_ntoa ); use Sys::Hostname; use URI; -use YAML qw(Dump LoadFile); +use YAML qw(Dump LoadFile DumpFile); use Ravada::Domain::Void; use Ravada::NetInterface::Void; @@ -34,6 +34,12 @@ has 'vm' => ( ,lazy => 1 ); +has has_networking => ( + isa => 'Bool' + , is => 'ro' + , default => 1 +); + our $CONNECTOR = \$Ravada::CONNECTOR; ########################################################################## @@ -340,16 +346,111 @@ sub list_routes { return Ravada::NetInterface::Void->new(); } -sub list_virtual_networks { - return (); +sub list_virtual_networks($self) { + + my $dir_net = $self->dir_img."/networks/"; + my $dir; + opendir ($dir, $dir_net) or do { + mkdir $dir_net or die "$! $dir_net"; + opendir($dir, $dir_net) or confess; + }; + my @list; + while (my $file = readdir $dir) { + next if ! -f $file && $file !~ /\.yml$/; + my $net; + eval { $net = LoadFile("$dir_net/$file") }; + confess $@ if $@; + + $net->{id_vm} = $self->id if !$net->{id_vm}; + $net->{is_active}=0 if !defined $net->{is_active}; + push @list,($net); + } + if (!@list) { + my $net = {name => 'default' + , autostart => 1 + , internal_id => 1 + , bridge => 'voidbr0' + ,ip_address => '192.51.100.1' + ,is_active => 1 + }; + + my $file_out = $self->dir_img."/networks/".$net->{name}.".yml"; + DumpFile($file_out,$net); + push @list,($net); + } + return @list; +} + +sub _new_net_id($self) { + my %id; + for my $net ( $self->list_virtual_networks() ) { + $id{$net->{internal_id}}++; + } + my $new_id = 0; + for (;;) { + return $new_id if !exists $id{++$new_id}; + } +} + +sub _new_net_bridge ($self) { + my %bridge; + my $n = 0; + for my $net ( $self->list_virtual_networks() ) { + $bridge{$net->{bridge}}++; + } + my $new_id = 0; + for (;;) { + my $new_bridge = 'voidbr'.$new_id; + return $new_bridge if !exists $bridge{$new_bridge}; + $new_id++; + } } -sub create_network($self, $data) { - my $file_out = $self->dir_img."/networks/".$data->{name}."yml"; +sub new_network($self) { + + my @networks = $self->list_virtual_networks(); + + my %base = ( + name => 'net' + ,ip_address => ['192.168.','.0'] + ,bridge => 'voidbr' + ); + my $new = {ip_netmask => '255.255.255.0'}; + for my $field ( keys %base) { + my %old = map { $_->{$field} => 1 } @networks; + my $n = 0; + my $base = ($base{$field} or $field); + my $value; + for ( 0 .. 255 ) { + if (ref($base)) { + $value = $base->[0].$n.$base->[1] + } else { + $value = $base.$n; + } + last if !$old{$value}; + $n++; + } + $new->{$field} = $value; + } + return $new; +} + +sub create_network($self, $data, $id_owner=undef, $request=undef) { + + $data->{internal_id} = $self->_new_net_id(); + my $file_out = $self->dir_img."/networks/".$data->{name}.".yml"; die "Error: network $data->{name} already created" if $self->file_exists($file_out); - open my $out,">",$file_out or die "$! $file_out"; - close $out; + + $data->{bridge} = $self->_new_net_bridge() + if !exists $data->{bridge} || ! defined $data->{bridge}; + + for my $field ('bridge','ip_address') { + $self->_check_duplicated_network($field,$data); + } + DumpFile($file_out,$data); + + return $data; } sub remove_network($self, $name) { @@ -666,7 +767,50 @@ sub active_storage_pool($self, $name, $value) { $self->write_file($file_sp, Dump( \@list)); } -sub change_network {} +sub has_networking { return 1 }; + +sub _check_duplicated_network($self, $field, $data) { + my @networks = $self->list_virtual_networks(); + my ($found) = grep {$data->{name} ne $_->{name} + && $_->{$field} eq $data->{$field} } @networks; + return if !$found; + + $field = 'Network' if $field eq 'ip_address'; + die "Error: $field is already in use in $found->{name}"; +} + +sub change_network($self,$data) { + my $id = delete $data->{internal_id} or confess "Missing internal_id ".Dumper($data); + my @networks = $self->list_virtual_networks(); + my ($net) = grep { $_->{internal_id} eq $id } @networks; + + my $changed = 0; + for my $field ('name', sort keys %$data) { + if (!exists $net->{$field}) { + $net->{$field} = $data->{$field}; + $changed++; + next; + } + next if exists $data->{$field} && exists $net->{$field} + && defined $data->{$field} && defined $net->{$field} + && $data->{$field} eq $net->{$field}; + + if ($field eq 'name') { + die "Error: network can not be renamed"; + } + + if ($field eq 'bridge' || $field eq 'ip_address') { + $self->_check_duplicated_network($field,$data); + } + $net->{$field} = $data->{$field}; + $changed++; + } + return if !$changed; + + my $file_out = $self->dir_img."/networks/".$net->{name}.".yml"; + + DumpFile($file_out,$net); +} #########################################################################3 From 8f46a7f919dd00de29b8a6013d0f1902386d3240 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 18 Sep 2023 15:00:22 +0200 Subject: [PATCH 15/58] wip: manage virtual networks --- lib/Ravada.pm | 39 ++- lib/Ravada/Auth/SQL.pm | 30 ++ lib/Ravada/Front/Domain/Void.pm | 11 + lib/Ravada/Request.pm | 1 + public/js/admin.js | 33 +- script/rvd_front | 17 + t/lib/Test/Ravada.pm | 16 + t/vm/networking.t | 310 +++++++++++++++++-- templates/main/admin_networks.html.ep | 4 +- templates/main/network_options.html.ep | 13 +- templates/main/network_remove.html.ep | 7 +- templates/main/settings_generic.html.ep | 3 +- templates/main/settings_generic_tabs.html.ep | 4 +- 13 files changed, 446 insertions(+), 42 deletions(-) diff --git a/lib/Ravada.pm b/lib/Ravada.pm index 82649e3ae..ba4773dc8 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -2378,6 +2378,7 @@ sub _sql_create_tables($self) { ,'ip_netmask' => 'char(20)' ,'dhcp_start' => 'char(15)' ,'dhcp_end' => 'char(15)' + ,'is_active' => 'integer not null default 1' ,date_changed => 'timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP' } ] @@ -5032,7 +5033,12 @@ sub _cmd_change_hardware { my $user = Ravada::Auth::SQL->search_by_id($uid); die "Error: User ".$user->name." not allowed\n" - if $hardware ne 'memory' && !$user->is_admin; + unless $user->is_admin + || $hardware eq 'memory' + || ($hardware eq 'network' + && $user->can_change_network($domain, $data) + ) + ; $domain->change_hardware( $request->args('hardware') @@ -6174,6 +6180,7 @@ sub _req_method { ,remove_files => \&_cmd_remove_files ,update_iso_urls => \&_cmd_update_iso_urls + ,new_network => \&_cmd_new_network ,create_network => \&_cmd_create_network ,remove_network => \&_cmd_remove_network ,change_network => \&_cmd_change_network @@ -6595,6 +6602,22 @@ sub _cmd_remove_files($self, $request) { $vm->remove_file(@file); } +sub _cmd_new_network($self, $request) { + my $user=Ravada::Auth::SQL->search_by_id($request->args('uid')); + die "Error: ".$user->name." not authorized\n" + unless $user->can_create_networks; + + $request->output(encode_json({})); + + my $id = $request->args('id_vm') or die "Error: missing id_vm"; + my $vm = Ravada::VM->open($id); + + my $new = $vm->new_network(); + $new = {} if !$new; + + $request->output(encode_json( $new)); +} + sub _cmd_create_network($self, $request) { my $user=Ravada::Auth::SQL->search_by_id($request->args('uid')); die "Error: ".$user->name." not authorized\n" @@ -6602,7 +6625,10 @@ sub _cmd_create_network($self, $request) { my $id = $request->args('id_vm') or die "Error: missing id_vm"; my $vm = Ravada::VM->open($id); - $vm->create_network($request->args('data'),$request->args('uid')); + $request->output(encode_json({})); + my $id_net = $vm->create_network($request->args('data'),$request->args('uid') + , $request); + $request->output(encode_json({id_network => $id_net})); } sub _cmd_remove_network($self, $request) { @@ -6624,17 +6650,24 @@ sub _cmd_change_network($self, $request) { my $user=Ravada::Auth::SQL->search_by_id($request->args('uid')); my $data = $request->args('data'); + die "Error: network.id required" if !exists $data->{id} || !$data->{id}; + my $sth = $CONNECTOR->dbh->prepare( "SELECT * FROM virtual_networks WHERE id=?" ); $sth->execute($data->{id}); my $network = $sth->fetchrow_hashref; + die "Error: network $data->{id} not found" if !$network->{id}; + die "Error: id_vm not defined in ".Dumper($data) + if !$network->{id_vm}; + die "Error: ".$user->name." not authorized\n" unless $user->is_admin || ( $user->can_create_networks && $network->{id_owner} == $user->id); - my $vm = Ravada::VM->open($data->{id_vm}); + $data->{internal_id} = $network->{internal_id} if !$data->{internal_id}; + my $vm = Ravada::VM->open($network->{id_vm}); $vm->change_network($data); } diff --git a/lib/Ravada/Auth/SQL.pm b/lib/Ravada/Auth/SQL.pm index 82625e978..5c6a8f403 100644 --- a/lib/Ravada/Auth/SQL.pm +++ b/lib/Ravada/Auth/SQL.pm @@ -1235,6 +1235,36 @@ sub disk_used($self) { return $used; } +sub _load_network($network) { + confess "Error: undefined network" + if !defined $network; + + my $sth = $$CON->dbh->prepare( + "SELECT * FROM virtual_networks where name=?" + ); + $sth->execute($network); + my $row = $sth->fetchrow_hashref; + + die "Error: network '$network' not found" + if !$row->{id}; + + lock_hash(%$row); + return $row; +} + +sub can_change_network($user, $domain, $data) { + return 1 if $user->is_admin; + + confess "Error: undefined network ".Dumper($data) + if !exists $data->{network} || !defined $data->{network}; + + my $net = _load_network($data->{network}); + + return 1 if $user->id == $domain->id_owner + && $user->id == $net->{id_owner}; + return 0; +} + sub AUTOLOAD($self, $domain=undef) { my $name = $AUTOLOAD; diff --git a/lib/Ravada/Front/Domain/Void.pm b/lib/Ravada/Front/Domain/Void.pm index aa7234ae7..bed768a94 100644 --- a/lib/Ravada/Front/Domain/Void.pm +++ b/lib/Ravada/Front/Domain/Void.pm @@ -15,6 +15,7 @@ our %GET_CONTROLLER_SUB = ( 'mock' => \&_get_controller_mock ,'disk' => \&_get_controller_disk ,'display' => \&_get_controller_display + ,'network' => \&_get_controller_network ); @@ -88,4 +89,14 @@ sub _get_controller_display(@args) { return Ravada::Front::Domain::_get_controller_display(@args); } +sub _get_controller_generic($self, $item) { + my $hardware = $self->_value('hardware'); + return () if !exists $hardware->{$item}; + return @{$hardware->{$item}}; +} + +sub _get_controller_network($self) { + return $self->_get_controller_generic('network'); +} + 1; diff --git a/lib/Ravada/Request.pm b/lib/Ravada/Request.pm index ad7aa67da..f22779b09 100644 --- a/lib/Ravada/Request.pm +++ b/lib/Ravada/Request.pm @@ -164,6 +164,7 @@ our %VALID_ARG = ( ,list_unused_volumes => {uid => 1, id_vm => 1, start => 2, limit => 2 } ,remove_files => { uid => 1, id_vm => 1, files => 1 } + ,new_network => { uid => 1, id_vm => 1 } ,create_network => { uid => 1, id_vm => 1, data => 1 } ,remove_network => { uid => 1, id => 1 } ,change_network => { uid => 1, data => 1 } diff --git a/public/js/admin.js b/public/js/admin.js index 13e948993..a61769fcb 100644 --- a/public/js/admin.js +++ b/public/js/admin.js @@ -904,18 +904,20 @@ ravadaApp.directive("solShowMachine", swMach) } function settings_network($scope, $http, $interval, $timeout) { - $scope.init = function(id) { + $scope.init = function(id,url, id_vm) { if ( id ) { $scope.load_network(id); + } else { + $scope.new_network(id_vm); } }; $scope.new_network = function(id_vm) { - $scope.network = { - 'id_vm': id_vm - ,'bridge': 'virbr2' - ,'ip_address': '10.10.0.0' - ,'ip_netmask': '255.255.255.0' - }; + $scope.network = { }; + $http.get('/v2/network/new/'+id_vm) + .then(function(response) { + $scope.network=response.data; + console.log(response.data); + }); }; $scope.load_network = function(id) { @@ -928,12 +930,29 @@ ravadaApp.directive("solShowMachine", swMach) }; $scope.update_network = function() { + + var update = $scope.network['id']; $http.post('/v2/network/set/' , JSON.stringify($scope.network)) .then(function(response) { + $scope.error=response.data.error; + if (!update) { + if (response.data['id_network']) { + window.location.assign('/network/settings/' + +response.data['id_network']+'.html'); + } + } + }); + }; + $scope.remove_network = function() { + $http.post('/request/remove_network' + ,JSON.stringify({'id': $scope.network.id })) + .then(function(response) { + $scope.network._removed = true; }); }; + } diff --git a/script/rvd_front b/script/rvd_front index be4ff2a17..3e7e5d8cc 100644 --- a/script/rvd_front +++ b/script/rvd_front @@ -512,6 +512,23 @@ get '/network/new' => sub($c) { return $c->render( template => '/main/network_new' ); }; +get '/v2/network/new/#id_vm' => sub($c) { + my $req = Ravada::Request->new_network( + uid => $USER->id + ,id_vm => $c->stash('id_vm') + ); + $RAVADA->wait_request($req); + my $data = {}; + warn Dumper([$req->status,$req->output]); + if ($req->status eq 'done' && $req->output =~ /^\{/) { + eval { + $data = decode_json($req->output); + }; + warn $@ if $@; + } + $c->render(json => $data); +}; + get '/v2/network/info/#id' => sub($c) { my $sth = $RAVADA->_dbh->prepare("SELECT * from virtual_networks WHERE id=?"); $sth->execute($c->stash('id')); diff --git a/t/lib/Test/Ravada.pm b/t/lib/Test/Ravada.pm index bdb78dc76..bcf3bec92 100644 --- a/t/lib/Test/Ravada.pm +++ b/t/lib/Test/Ravada.pm @@ -1423,6 +1423,21 @@ sub _qemu_storage_pool { return $pool_name; } +sub remove_void_networks($vm=undef) { + if (!defined $vm) { + eval { $vm = rvd_back->search_vm('Void') }; + } + my $dir_net = $vm->dir_img()."/networks"; + return if ! -e $dir_net; + + opendir my $dir, $dir_net or die "$! $dir_net"; + while(my $filename = readdir $dir) { + my $file = "$dir_net/$filename"; + unlink $file if -f $file && $file =~ /\.yml/; + } + +} + sub remove_qemu_networks($vm=undef) { return if !$VM_VALID{'KVM'} || $>; if (!defined $vm) { @@ -1514,6 +1529,7 @@ sub remove_old_pools { sub remove_old_networks { remove_qemu_networks(); + remove_void_networks(); } sub _remove_old_entries($table) { diff --git a/t/vm/networking.t b/t/vm/networking.t index ddb425e2f..79144d323 100644 --- a/t/vm/networking.t +++ b/t/vm/networking.t @@ -3,8 +3,12 @@ use strict; use Carp qw(confess); use Data::Dumper; +use Mojo::JSON qw(decode_json); +use Storable qw(dclone); use Test::More; +use YAML qw(Dump LoadFile DumpFile); + no warnings "experimental::signatures"; use feature qw(signatures); @@ -16,14 +20,18 @@ my $N = 100; sub test_list_networks($vm) { my @list = $vm->list_virtual_networks(); - my ($default)= grep { $_->{name} eq 'default' } @list; - ok($default); + my ($default)= @list; + ok($default) or exit; for my $net ( @list ) { + ok($net->{id_vm}) or die "Error: network missing id_vm ".Dumper($net); my ($found) = _search_network(internal_id=>$net->{internal_id}); is($found->{name}, $net->{name}); + is($found->{id_vm}, $net->{id_vm}); ($found) = _search_network(id_vm => $net->{id_vm}, name => $net->{name}); - is($found->{internal_id}, $net->{internal_id}); + die "Error: network not found id_vm= $net->{id_vm}, name=$net->{name}" + if !$found; + is($found->{internal_id}, $net->{internal_id}) or die Dumper($found); } } @@ -37,6 +45,95 @@ sub _search_network(%args) { return $found; } +sub _get_active_network($vm) { + my($active) = grep { $_->{is_active} } $vm->list_virtual_networks(); + return $active if $active; + + my @networks = $vm->list_virtual_networks(); + for my $old (@networks) { + Ravada::Request->change_network( + uid => user_admin->id + ,data => { %$old, is_active => 1 } + ); + wait_request(); + my ($net) = grep {$_->{id} == $old->{id}} $vm->list_virtual_networks(); + return $net if $net->{is_active}; + } + die "Error: No network could be activated ".Dumper(\@networks); +} +sub test_create_fail ($vm) { + + my @networks = $vm->list_virtual_networks(); + + my $net0 = _get_active_network($vm); + my $name = new_domain_name; + my $net = { + name => $name + ,id_vm => $vm->id + ,ip_address => $net0->{ip_address} + ,ip_netmask => '255.255.255.0' + ,is_active => 1 + }; + my $req = Ravada::Request->create_network( + uid => user_admin->id + ,id_vm => $vm->id + ,data => $net + ); + wait_request(check_error => 0, debug => 0); + like($req->error,qr/Network is already in use/) or die $name; + my $out = decode_json($req->output); + like($out->{id_network},qr/^\d+$/) or exit; + + my ($old) = grep { $_->{id} eq $out->{id_network} } @networks; + ok(!$old,"Expecting new network is created"); +} + +sub test_duplicate_add($vm, $net) { + my $net2 = dclone($net); + delete $net2->{id}; + delete $net2->{internal_id}; + my $req = Ravada::Request->create_network( + data => $net2 + ,uid => user_admin->id + ,id_vm => $vm->id + ); + wait_request( check_error => 0, debug => 0); + like($req->error,qr/already exist/); +} + +sub test_duplicate_bridge_add($vm, $net) { + my ($net0) = grep { $_->{name} eq $net->{name}} $vm->list_virtual_networks(); + my $net2 = dclone($net); + delete $net2->{id}; + delete $net2->{internal_id}; + delete $net2->{dhcp_start}; + delete $net2->{dhcp_end}; + $net2->{bridge} = $net0->{bridge}; + $net2->{name} = new_domain_name(); + $net2->{ip_address} = '192.51.200.1'; + + diag("Replicating bridge ".$net2->{bridge}." from ".$net0->{name} + ." on network ".$net2->{name}); + my $req = Ravada::Request->create_network( + data => $net2 + ,uid => user_admin->id + ,id_vm => $vm->id + ); + wait_request( check_error => 0, debug => 0); + is($req->output,'{}'); + like($req->error,qr/already exists/) or exit; + + my ($net_created) = grep {$net2->{name} eq $_->{name} } + $vm->list_virtual_networks(); + + ok(!$net_created) or die "Expecting $net2->{name} not created"; + + Ravada::Request->remove_network( + uid => user_admin->id + ,id => $net_created->{id} + ) if $net_created; +} + sub test_add_network($vm) { my $name = new_domain_name; my $net = { @@ -44,6 +141,8 @@ sub test_add_network($vm) { ,id_vm => $vm->id ,ip_address => '192.0.'.$N++.'.1' ,ip_netmask => '255.255.255.0' + ,is_active => 1 + ,autostart => 1 }; my $user = create_user(); my $req = Ravada::Request->create_network( @@ -60,8 +159,12 @@ sub test_add_network($vm) { ,data => $net ); wait_request( debug => 0); + + my $out = decode_json($req->output); my($new) = grep { $_->{name} eq $name } $vm->list_virtual_networks(); ok($new,"Expecting new network $name created") or return; + isa_ok($out,'HASH') + && is($out->{id_network},$new->{id}); like($new->{dhcp_start},qr/.*\.2$/); like($new->{dhcp_end},qr/.*\.254$/); @@ -136,19 +239,26 @@ sub test_change_network($net) { is($new->{autostart},0); _check_network_changed($new,'autostart'); + $net2{is_active} = 1; + $req = Ravada::Request->change_network( + uid => user_admin->id + ,data => \%net2 + ); + wait_request(); + ($new) = grep { $_->{name} eq $net2{name} } $vm->list_virtual_networks(); + is($new->{is_active},1); + my ($default) = grep { $_->{name} eq 'default' } $vm->list_virtual_networks(); $net2{bridge} = $default->{bridge}; $req = Ravada::Request->change_network( uid => user_admin->id ,data => \%net2 ); - wait_request(check_error => 0); - - ($new) = grep { $_->{name} eq $net->{name} } $vm->list_virtual_networks(); - isnt($new->{bridge},$default->{bridge}); - _check_network_changed($new,'bridge') or exit; + wait_request(check_error => 0, debug => 0); + like($req->error,qr/already in use/); $net2{name} = new_domain_name(); + $net2{bridge}='virbr99'; $req = Ravada::Request->change_network( uid => user_admin->id ,data => \%net2 @@ -160,8 +270,29 @@ sub test_change_network($net) { } sub test_change_network_internal($vm, $net) { - return if $vm->type ne 'KVM'; + if ($vm->type eq 'KVM') { + test_change_network_internal_kvm($vm, $net); + } elsif ($vm->type eq 'Void') { + test_change_network_internal_void($vm, $net); + } +} + +sub test_change_network_internal_void($vm, $net) { + my $file_out = $vm->dir_img."/networks/".$net->{name}.".yml"; + + my $start_new = $net->{dhcp_start}; + my ($n) = $start_new =~ /.*\.(\d+)/; + $n++; + $start_new =~ s/(.*)\.(\d+)/$1.$n/; + $net->{dhcp_start}=$start_new; + DumpFile($file_out,$net); + + my ($net2) = grep { $_->{name} eq $net->{name} } $vm->list_virtual_networks(); + is($net2->{dhcp_start},$start_new) or die Dumper($net2); +} + +sub test_change_network_internal_kvm($vm, $net) { my $network = $vm->vm->get_network_by_name($net->{name}); die "Error: I can't find network $net->{name}" if !$network; @@ -187,7 +318,12 @@ sub test_change_network_internal($vm, $net) { } sub test_changed_uuid($vm) { - return if $vm->type ne 'KVM'; + if($vm->type eq 'KVM') { + test_changed_uuid_kvm($vm); + } +} + +sub test_changed_uuid_kvm($vm) { my $net = test_add_network($vm); my $network = $vm->vm->get_network_by_name($net->{name}); @@ -216,13 +352,32 @@ sub test_changed_uuid($vm) { } -sub test_disapeared_network($vm) { - return if $vm->type ne 'KVM'; - my $net = test_add_network($vm); +sub _remove_network_internal($vm,$name) { + if ($vm->type eq 'KVM') { + _remove_network_internal_kvm($vm, $name); + } elsif ($vm->type eq 'Void') { + _remove_network_internal_void($vm, $name); + } else { + die $vm->type; + } +} - my $network = $vm->vm->get_network_by_name($net->{name}); +sub _remove_network_internal_kvm($vm, $name) { + my $network = $vm->vm->get_network_by_name($name); $network->destroy() if $network->is_active; $network->undefine(); +} + +sub _remove_network_internal_void($vm, $name) { + my $file_out = $vm->dir_img."/networks/$name.yml"; + unlink $file_out or die "$! $file_out" if $vm->file_exists($file_out); +} + +sub test_disapeared_network($vm) { + my ($default0) = $vm->list_virtual_networks(); + + my $net = test_add_network($vm); + _remove_network_internal($vm, $net->{name}); my ($net2) = grep { $_->{name} eq $net->{name} } $vm->list_virtual_networks(); ok(!$net2, "Expecting $net->{name} removed"); @@ -232,17 +387,16 @@ sub test_disapeared_network($vm) { my $row = $sth->fetchrow_hashref; ok(!$row,"Expected $net->{name} removed from db".Dumper($row)) or exit; - my ($default) = grep { $_->{name} eq 'default' } $vm->list_virtual_networks(); + my ($default) = grep { $_->{name} eq $default0->{name} } $vm->list_virtual_networks(); ok($default) or exit; - $sth->execute('default'); + $sth->execute($default0->{name}); $row = $sth->fetchrow_hashref; ok($row,"Expected default not removed from db".Dumper($row)) or exit; } sub test_add_down_network($vm) { - return if $vm->type ne 'KVM'; my $test = test_add_network($vm); $test->{is_active} = 0; @@ -261,6 +415,103 @@ sub test_add_down_network($vm) { ok($net2,"Expecting $test->{name} network listed") or exit; } +sub test_public_network($vm, $net) { + + my $domain = create_domain($vm); + $domain->is_public(1); + $domain->prepare_base(user_admin); + + my $user2 = create_user(); + user_admin->grant($user2,'change_settings'); + user_admin->grant($user2,'create_networks'); + + + my $clone = $domain->clone(user => $user2,name => new_domain_name); + + my $hw_net = $clone->info(user_admin)->{hardware}->{network}->[0]; + ok($hw_net) or die $clone->name; + my %hw_net2 = %$hw_net; + $hw_net2{network} = $net->{name}; + + is($user2->can_change_network($domain, \%hw_net2),0) or exit; + my $req = Ravada::Request->change_hardware( + uid => $user2->id + ,id_domain => $clone->id + ,hardware => 'network' + ,index => 0 + ,data => \%hw_net2 + ); + wait_request(check_error => 0); + like($req->error,qr/not allowed/); + + my $req_change = Ravada::Request->change_network( + uid => $user2->id + ,data => {%$net, id_owner => $user2->id } + ); + + wait_request(check_error => 0); + like($req_change->error,qr/not authorized/); + + my $req_change2 = Ravada::Request->change_network( + uid => user_admin->id + ,data => {%$net, id_owner => $user2->id } + ); + + wait_request(check_error => 0, debug => 0); + is($req_change2->error,''); + + my $net3 = _search_network(id => $net->{id}); + is($net3->{id_owner}, $user2->id) or exit; + + is($user2->can_change_network($clone, {network => $net3->{name}}),1) or exit; + + $req->status('requested'); + wait_request(check_error => 0); + is($req->error, ''); + + my $clone4 = Ravada::Front::Domain->open($clone->id); + my $hw_net4 = $clone4->info(user_admin)->{hardware}->{network}->[0]; + + is($hw_net2{network}, $net->{name}); +} + +sub test_new_network($vm) { + my $req = Ravada::Request->new_network( + uid => user_admin->id + ,id_vm => $vm->id + ); + wait_request(); + my $data = decode_json($req->output); + is($data->{id_vm},$vm->id); + $data->{name} = new_domain_name(); + + my $req_create = Ravada::Request->create_network( + uid => user_admin->id + ,id_vm => $vm->id + ,data => $data + ); + + my $req2 = Ravada::Request->new_network( + uid => user_admin->id + ,id_vm => $vm->id + ); + wait_request(); + my $new_net = decode_json($req_create->output); + + my $data2 = decode_json($req2->output); + for my $field( keys %$data) { + next if $field =~ /^(id_vm|ip_netmask|is_active|autostart)/; + + isnt($data2->{$field}, $data->{$field},$field); + } + Ravada::Request->remove_network( + uid => user_admin->id + ,id => $new_net->{id_network} + ); + wait_request(); + +} + ######################################################################## init(); @@ -282,21 +533,32 @@ for my $vm_name ( vm_names() ) { diag($msg) if !$vm; skip $msg,10 if !$vm; - is($vm->has_networking,1) if $vm_name eq 'KVM'; + is($vm->has_networking,1) if $vm_name eq 'KVM' + || $vm_name eq 'Void'; next if !$vm->has_networking(); - test_changed_uuid($vm); - - test_disapeared_network($vm); - test_add_down_network($vm); + test_create_fail($vm); test_list_networks($vm); - my $net = test_add_network($vm); - test_change_network_internal($vm, $net); + my ($net,$user) = test_add_network($vm); + + test_new_network($vm); + + test_duplicate_add($vm, $net); + test_duplicate_bridge_add($vm, $net); + + test_public_network($vm, $net); + + test_change_network_internal($vm, $net); test_change_network($net); + test_changed_uuid($vm); + + test_disapeared_network($vm); + test_add_down_network($vm); + test_remove_network($vm,$net); } } diff --git a/templates/main/admin_networks.html.ep b/templates/main/admin_networks.html.ep index 931f7ab84..4dd5e35b2 100644 --- a/templates/main/admin_networks.html.ep +++ b/templates/main/admin_networks.html.ep @@ -20,8 +20,8 @@
-
{{network.name}} diff --git a/templates/main/network_options.html.ep b/templates/main/network_options.html.ep index dde137590..3c0d06143 100644 --- a/templates/main/network_options.html.ep +++ b/templates/main/network_options.html.ep @@ -1,5 +1,12 @@ -
-
+
+ +
+{{error}} +
+ + + +
<%=l 'Name' %>
@@ -12,7 +19,7 @@
<%=l 'Bridge' %>
- +
diff --git a/templates/main/network_remove.html.ep b/templates/main/network_remove.html.ep index 9043f8044..8841c821c 100644 --- a/templates/main/network_remove.html.ep +++ b/templates/main/network_remove.html.ep @@ -1,8 +1,13 @@ -
+
<%=l 'Are you sure you want to remove the' %> <%= $item %> {{network.name}}
+
+ <%=l 'Network removed' %> + +
+
{{message}}
diff --git a/templates/main/settings_generic.html.ep b/templates/main/settings_generic.html.ep index 0760b8ae4..7c665d0af 100644 --- a/templates/main/settings_generic.html.ep +++ b/templates/main/settings_generic.html.ep @@ -10,7 +10,8 @@

<%= $item %> {{<%= $item %>._old_name}}

diff --git a/templates/main/settings_generic_tabs.html.ep b/templates/main/settings_generic_tabs.html.ep index b1eb10153..8ef327dee 100644 --- a/templates/main/settings_generic_tabs.html.ep +++ b/templates/main/settings_generic_tabs.html.ep @@ -13,7 +13,7 @@ % my $active="active"; % my $selected="true";
-
+
From 50ede96bbe83fb5a2184e251cbbce677307e8190 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Wed, 20 Sep 2023 15:30:18 +0200 Subject: [PATCH 20/58] wip: test networks access --- t/user/networks.t | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 t/user/networks.t diff --git a/t/user/networks.t b/t/user/networks.t new file mode 100644 index 000000000..38a1b4053 --- /dev/null +++ b/t/user/networks.t @@ -0,0 +1,57 @@ +#!perl + +use strict; +use warnings; +use Test::More; + +use lib 't/lib'; +use Test::Ravada; + +use Ravada; + +use Data::Dumper; + +no warnings "experimental::signatures"; +use feature qw(signatures); + +############################################################################## + +sub test_deny_access($vm) { + my $user = create_user(); + my $networks = rvd_front->list_networks($vm->id , $user->id); + is(scalar(@$networks),0); + + $networks = rvd_front->list_networks($vm->id , user_admin->id); + ok(scalar(@$networks)); + +} + +############################################################################## + +init(); + +for my $vm_name( vm_names() ) { + my $vm; + eval { $vm = rvd_back->search_vm($vm_name) }; + + SKIP: { + my $msg = "SKIPPED test: No $vm_name VM found "; + if ($vm && $vm_name =~ /kvm/i && $>) { + $msg = "SKIPPED: Test must run as root"; + $vm= undef; + } + + diag($msg) if !$vm; + skip $msg,10 if !$vm; + + diag("Testing rename on $vm_name"); + + Ravada::Request->refresh_vms(); + wait_request( debug => 1); + test_deny_access($vm); + } + +} + +end(); +done_testing(); From 211ff7aca06b15d8662c91db1fe23a0ebccbef4f Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Wed, 20 Sep 2023 16:37:05 +0200 Subject: [PATCH 21/58] wip: check auth to manage networks --- lib/Ravada.pm | 46 ++++++++++++++++++++--------- lib/Ravada/Front.pm | 10 +++---- lib/Ravada/Request.pm | 1 + script/rvd_front | 6 +++- t/user/networks.t | 67 +++++++++++++++++++++++++++++++++++++++++-- 5 files changed, 109 insertions(+), 21 deletions(-) diff --git a/lib/Ravada.pm b/lib/Ravada.pm index aead82dec..bd3fed05c 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -1894,7 +1894,7 @@ sub _enable_grants($self) { ,'start_limit', 'start_many' ,'view_all' ,'create_disk', 'quota_disk' - ,'create_networks' + ,'create_networks','manage_all_networks' ); my $sth = $CONNECTOR->dbh->prepare("SELECT id,name FROM grant_types"); @@ -5740,7 +5740,6 @@ sub _refresh_active_vms ($self) { next; } $active_vm{$vm->id} = 1; - warn $vm->name; $vm->list_virtual_networks(); } return \%active_vm; @@ -6231,6 +6230,7 @@ sub _req_method { ,remove_files => \&_cmd_remove_files ,update_iso_urls => \&_cmd_update_iso_urls + ,list_networks => \&_cmd_list_virtual_networks ,new_network => \&_cmd_new_network ,create_network => \&_cmd_create_network ,remove_network => \&_cmd_remove_network @@ -6655,6 +6655,19 @@ sub _cmd_remove_files($self, $request) { $vm->remove_file(@file); } +sub _cmd_list_virtual_networks($self, $request) { + my $user=Ravada::Auth::SQL->search_by_id($request->args('uid')); + die "Error: ".$user->name." not authorized\n" + unless $user->is_admin || $user->can_manage_all_neworks; + + my $id = $request->args('id_vm') or die "Error: missing id_vm"; + my $vm = Ravada::VM->open($id); + my @list = $vm->list_virtual_networks(); + + $request->output(encode_json(\@list)); +} + + sub _cmd_new_network($self, $request) { my $user=Ravada::Auth::SQL->search_by_id($request->args('uid')); die "Error: ".$user->name." not authorized\n" @@ -6686,11 +6699,11 @@ sub _cmd_create_network($self, $request) { } sub _cmd_remove_network($self, $request) { - my $user=Ravada::Auth::SQL->search_by_id($request->args('uid')); - die "Error: ".$user->name." not authorized\n" - unless $user->can_create_networks; my $id = $request->args('id'); + _check_user_authorized_network($request, $id); + + my $user=Ravada::Auth::SQL->search_by_id($request->args('uid')); my $sth = $CONNECTOR->dbh->prepare( "SELECT id_vm FROM virtual_networks WHERE id=?"); $sth->execute($id); @@ -6700,26 +6713,33 @@ sub _cmd_remove_network($self, $request) { $vm->remove_network($user, $id); } -sub _cmd_change_network($self, $request) { - my $user=Ravada::Auth::SQL->search_by_id($request->args('uid')); - my $data = $request->args('data'); +sub _check_user_authorized_network($request, $id_network) { - die "Error: network.id required" if !exists $data->{id} || !$data->{id}; + + my $user=Ravada::Auth::SQL->search_by_id($request->args('uid')); my $sth = $CONNECTOR->dbh->prepare( "SELECT * FROM virtual_networks WHERE id=?" ); - $sth->execute($data->{id}); + $sth->execute($id_network); my $network = $sth->fetchrow_hashref; - die "Error: network $data->{id} not found" if !$network->{id}; - die "Error: id_vm not defined in ".Dumper($data) - if !$network->{id_vm}; + die "Error: network $id_network not found" if !$network->{id}; die "Error: ".$user->name." not authorized\n" unless $user->is_admin || ( $user->can_create_networks && $network->{id_owner} == $user->id); + return $network; +} + +sub _cmd_change_network($self, $request) { + + my $data = $request->args('data'); + die "Error: network.id required" if !exists $data->{id} || !$data->{id}; + + my $network = _check_user_authorized_network($request, $data->{id}); + $data->{internal_id} = $network->{internal_id} if !$data->{internal_id}; my $vm = Ravada::VM->open($network->{id_vm}); $vm->change_network($data); diff --git a/lib/Ravada/Front.pm b/lib/Ravada/Front.pm index 27400dd22..e4e9b38c2 100644 --- a/lib/Ravada/Front.pm +++ b/lib/Ravada/Front.pm @@ -1685,17 +1685,17 @@ sub list_networks($self, $id_vm ,$id_user) { ." WHERE id_vm=?"; my $user = Ravada::Auth::SQL->search_by_id($id_user); - my $all = 0; + my $owned = 0; unless ($user->is_admin || $user->can_manage_all_networks) { $query .= " AND id_owner=? "; - $all = 1; + $owned = 1; } $query .= " ORDER BY name"; my $sth = $CONNECTOR->dbh->prepare($query); - if ($all) { - $sth->execute($id_vm); - } else { + if ($owned) { $sth->execute($id_vm, $id_user); + } else { + $sth->execute($id_vm); } my @networks; while ( my $row = $sth->fetchrow_hashref ) { diff --git a/lib/Ravada/Request.pm b/lib/Ravada/Request.pm index 71b0d6041..4dad4edc6 100644 --- a/lib/Ravada/Request.pm +++ b/lib/Ravada/Request.pm @@ -166,6 +166,7 @@ our %VALID_ARG = ( ,list_unused_volumes => {uid => 1, id_vm => 1, start => 2, limit => 2 } ,remove_files => { uid => 1, id_vm => 1, files => 1 } + ,list_networks => { uid => 1, id_vm => 1} ,new_network => { uid => 1, id_vm => 1, name => 2 } ,create_network => { uid => 1, id_vm => 1, data => 1 } ,remove_network => { uid => 1, id => 1 } diff --git a/script/rvd_front b/script/rvd_front index 01cdf8dea..3c8f9f3e7 100644 --- a/script/rvd_front +++ b/script/rvd_front @@ -358,6 +358,10 @@ get '/admin/networks' => sub($c) { _add_admin_libs($c); _select_vm($c); + Ravada::Request->list_networks( + uid => $USER->id + ,id_vm => $c->stash('id_vm') + ); return $c->render( template => '/main/admin_networks' ); @@ -481,7 +485,7 @@ get '/list_routes.json' => sub { get '/vm/list_networks/(:id_vm)' => sub { my $c = shift; - $c->render(json => Ravada::Front->list_networks($c->stash('id_vm')) ); + $c->render(json => Ravada::Front->list_networks($c->stash('id_vm'), $USER->id) ); }; get '/route/info/#id' => sub($c) { diff --git a/t/user/networks.t b/t/user/networks.t index 38a1b4053..c8c84fca8 100644 --- a/t/user/networks.t +++ b/t/user/networks.t @@ -10,12 +10,39 @@ use Test::Ravada; use Ravada; use Data::Dumper; +use Mojo::JSON qw(decode_json); no warnings "experimental::signatures"; use feature qw(signatures); ############################################################################## +sub test_create_network($vm) { + my $req_new= Ravada::Request->new_network( + uid => user_admin->id + ,id_vm => $vm->id + ,name => base_domain_name() + ); + wait_request(); + my $data = decode_json($req_new->output); + + my $req = Ravada::Request->create_network( + uid => user_admin->id + ,id_vm => $vm->id + ,data => $data + ); + wait_request(); + my ($network) = grep {$_->{name} eq $data->{name} } + $vm->list_virtual_networks(); + return $network; +} + +sub test_default_owner(@networks) { + for my $net (@networks) { + is($net->{id_owner},Ravada::Utils::user_daemon->id); + } +} + sub test_deny_access($vm) { my $user = create_user(); my $networks = rvd_front->list_networks($vm->id , $user->id); @@ -24,6 +51,42 @@ sub test_deny_access($vm) { $networks = rvd_front->list_networks($vm->id , user_admin->id); ok(scalar(@$networks)); + test_default_owner(@$networks); + + my $network = test_create_network($vm); + + my $req_new= Ravada::Request->new_network( + uid => $user->id + ,id_vm => $vm->id + ,name => base_domain_name() + ); + wait_request(check_error => 0); + like($req_new->error,qr/not authorized/); + + my $req_change = Ravada::Request->change_network( + uid => $user->id + ,data => $network + ); + wait_request(check_error => 0); + like($req_change->error,qr/not authorized/); + + my $req_delete = Ravada::Request->remove_network( + uid => $user->id + ,id => $network->{id} + ); + wait_request(check_error => 0); + like($req_delete->error,qr/not authorized/); + + user_admin->grant($user,'create_networks'); + $req_new->status('requested'); + $req_change->status('requested'); + $req_delete->status('requested'); + + wait_request(check_error => 0); + is($req_new->error,''); + like($req_change->error,qr/not authorized/); + like($req_delete->error,qr/not authorized/); + is($req_change->status(),'done'); } ############################################################################## @@ -44,9 +107,9 @@ for my $vm_name( vm_names() ) { diag($msg) if !$vm; skip $msg,10 if !$vm; - diag("Testing rename on $vm_name"); + diag("Testing networks access on $vm_name"); - Ravada::Request->refresh_vms(); + Ravada::Request->list_networks(id_vm => $vm->id, uid => user_admin->id); wait_request( debug => 1); test_deny_access($vm); } From 7e0a2cc6794a3b09ce9ff1541deb707dc19b27f3 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 21 Sep 2023 12:53:10 +0200 Subject: [PATCH 22/58] wip: test admin networks --- lib/Ravada.pm | 4 +- lib/Ravada/Front.pm | 13 +++++ public/js/admin.js | 10 ++-- script/rvd_front | 4 +- t/mojo/30_settings.t | 44 ++++++++++------ t/user/networks.t | 72 ++++++++++++++++++++++++++- templates/main/admin_networks.html.ep | 18 +++++-- 7 files changed, 132 insertions(+), 33 deletions(-) diff --git a/lib/Ravada.pm b/lib/Ravada.pm index bd3fed05c..8a60f78d9 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -6658,7 +6658,7 @@ sub _cmd_remove_files($self, $request) { sub _cmd_list_virtual_networks($self, $request) { my $user=Ravada::Auth::SQL->search_by_id($request->args('uid')); die "Error: ".$user->name." not authorized\n" - unless $user->is_admin || $user->can_manage_all_neworks; + unless $user->is_admin || $user->can_manage_all_networks || $user->can_create_networks; my $id = $request->args('id_vm') or die "Error: missing id_vm"; my $vm = Ravada::VM->open($id); @@ -6688,7 +6688,7 @@ sub _cmd_new_network($self, $request) { sub _cmd_create_network($self, $request) { my $user=Ravada::Auth::SQL->search_by_id($request->args('uid')); die "Error: ".$user->name." not authorized\n" - unless $user->can_create_networks; + unless $user->can_create_networks || $user->can_manage_all_networks; my $id = $request->args('id_vm') or die "Error: missing id_vm"; my $vm = Ravada::VM->open($id); diff --git a/lib/Ravada/Front.pm b/lib/Ravada/Front.pm index e4e9b38c2..be15746fe 100644 --- a/lib/Ravada/Front.pm +++ b/lib/Ravada/Front.pm @@ -1698,12 +1698,25 @@ sub list_networks($self, $id_vm ,$id_user) { $sth->execute($id_vm); } my @networks; + my %owner; while ( my $row = $sth->fetchrow_hashref ) { + $self->_search_user($row->{id_owner},\%owner); + $row->{owner} = $owner{$row->{id_owner}}; push @networks,($row); } return \@networks; } +sub _search_user($self,$id, $users) { + return if $users->{$id}; + + my $sth = $self->_dbh->prepare( + "SELECT * FROM users WHERE id=?" + ); + $sth->execute($id); + $users->{$id}=$sth->fetchrow_hashref(); +} + sub _filter_active($pools, $active) { return $pools if !defined $active; diff --git a/public/js/admin.js b/public/js/admin.js index 019913ba7..e78779327 100644 --- a/public/js/admin.js +++ b/public/js/admin.js @@ -872,16 +872,14 @@ ravadaApp.directive("solShowMachine", swMach) function manage_networks($scope, $http, $interval, $timeout) { $scope.init = function(id_vm) { $scope.list_networks(id_vm); + $scope.loaded_networks=false; } $scope.list_networks = function(id_vm) { - $http.get('/vm/list_networks/'+id_vm).then(function(response) { - for (var i=0; i sub { $c->render(json => [ Ravada::Route->list_networks ]); }; -get '/vm/list_networks/(:id_vm)' => sub { +get '/v2/vm/list_networks/(:id_vm)' => sub { my $c = shift; $c->render(json => Ravada::Front->list_networks($c->stash('id_vm'), $USER->id) ); }; @@ -540,8 +540,6 @@ get '/v2/network/info/#id' => sub($c) { }; post '/v2/network/set' => sub($c) { - return access_denied($c) if !$USER->is_admin; - my $arg = decode_json($c->req->body); my $req; my %data; diff --git a/t/mojo/30_settings.t b/t/mojo/30_settings.t index 2c8a37522..a80945eb6 100644 --- a/t/mojo/30_settings.t +++ b/t/mojo/30_settings.t @@ -158,26 +158,30 @@ sub _remove_route($address) { } -sub _remove_network($id_vm, $name) { +sub _remove_networks($id_vm) { my $sth = connector->dbh->prepare("SELECT * FROM virtual_networks vn, vms v" ." WHERE vn.id_vm=v.id " - ." AND v.id=?" + ." AND v.id=? AND vn.name like ?" ); - $sth->execute($id_vm); + $sth->execute($id_vm, base_domain_name."%"); - my $row = $sth->fetchrow_hashref; - warn Dumper($row); - return if !$row->{id}; + while ( my $row = $sth->fetchrow_hashref ) { + warn Dumper($row); - my $req = mojo_request($t, "remove_network" - ,{ id => $row->{id}}); + my $req = mojo_request($t, "remove_network" + ,{ id => $row->{id}}); + } } -sub test_networks($vm_name) { +sub test_networks_admin($vm_name) { mojo_check_login($t); - my $name = new_domain_name(); + + for my $url (qw( /admin/networks/ /network/new) ) { + $t->get_ok($url); + is($t->tx->res->code(),200, "Expecting access to $url"); + } my $sth = connector->dbh->prepare("SELECT id FROM vms " ." WHERE vm_type=?"); @@ -185,12 +189,20 @@ sub test_networks($vm_name) { my ($id_vm) = $sth->fetchrow; die "Error: I can't find if for vm type = $vm_name" if !$id_vm; - _remove_network($id_vm , $name); + _remove_networks($id_vm); + + $t->get_ok("/v2/vm/list_networks/".$id_vm); + my $networks = decode_json($t->tx->res->body); + ok(scalar(@$networks)); + + $t->get_ok("/v2/network/new/".$id_vm); + my $data = decode_json($t->tx->res->body); + + $t->post_ok("/v2/network/set/" => json => $data ); - my $id_req = mojo_request($t, "new_network" - ,{ id_vm => $id_vm }); - my $req = Ravada::Request->open($id_req); - die$req->output; + my $new_ok = decode_json($t->tx->res->body); + die Dumper($new_ok); + ok($new_ok->{id_network}); } sub test_routes($vm_name) { @@ -433,7 +445,7 @@ for my $vm_name (reverse @{rvd_front->list_vm_types} ) { diag("Testing settings in $vm_name"); - test_networks( $vm_name ); + test_networks_admin( $vm_name ); test_storage_pools($vm_name); test_nodes( $vm_name ); test_routes( $vm_name ); diff --git a/t/user/networks.t b/t/user/networks.t index c8c84fca8..52ecf5ca7 100644 --- a/t/user/networks.t +++ b/t/user/networks.t @@ -31,9 +31,10 @@ sub test_create_network($vm) { ,id_vm => $vm->id ,data => $data ); - wait_request(); + wait_request(debug => 0); my ($network) = grep {$_->{name} eq $data->{name} } $vm->list_virtual_networks(); + return $network; } @@ -43,6 +44,38 @@ sub test_default_owner(@networks) { } } +sub test_grant_access($vm) { + my $user = create_user(); + user_admin->grant($user,'create_networks'); + + my $req_new= Ravada::Request->new_network( + uid => $user->id + ,id_vm => $vm->id + ,name => base_domain_name() + ); + wait_request(); + is($req_new->error,''); + my $data = decode_json($req_new->output); + + my $req_create = Ravada::Request->create_network( + uid => $user->id + ,id_vm => $vm->id + ,data => $data + ); + + wait_request(); + + my ($network) = grep {$_->{name} eq $data->{name} } + $vm->list_virtual_networks(); + + ok($network) or die "Error: network not created ".Dumper($data); + + my $networks = rvd_front->list_networks($vm->id , $user->id); + my ($network_f) = grep {$_->{name} eq $data->{name}} @$networks; + is($network_f->{owner}->{id}, $user->id); + is($network_f->{owner}->{name}, $user->name); +} + sub test_deny_access($vm) { my $user = create_user(); my $networks = rvd_front->list_networks($vm->id , $user->id); @@ -77,16 +110,50 @@ sub test_deny_access($vm) { wait_request(check_error => 0); like($req_delete->error,qr/not authorized/); + my $req_create = Ravada::Request->create_network( + uid => $user->id + ,id_vm => $vm->id + ,data => $network + ); + wait_request(check_error => 0); + like($req_create->error,qr/not authorized/); + + my $req_list = Ravada::Request->list_networks( + uid => $user->id + ,id_vm => $vm->id + ); + wait_request(check_error => 0); + like($req_list->error,qr/not authorized/); + user_admin->grant($user,'create_networks'); $req_new->status('requested'); $req_change->status('requested'); $req_delete->status('requested'); + $req_list->status('requested'); wait_request(check_error => 0); is($req_new->error,''); like($req_change->error,qr/not authorized/); like($req_delete->error,qr/not authorized/); is($req_change->status(),'done'); + is($req_list->error,''); + + $req_create->status('requested'); + my $new_data = decode_json($req_new->output); + $req_create->arg('data' => $new_data); + $req_create->status('requested'); + wait_request(); + + is($req_create->error, ''); + + $req_list->status('requested'); + wait_request(); + + my $new_list = decode_json($req_list->output); + my ($found) = grep { $_->{name} eq $new_data->{name} } @$new_list; + + ok($found,"Expecting new network $new_data->{name}"); + $user->remove(); } ############################################################################## @@ -110,8 +177,9 @@ for my $vm_name( vm_names() ) { diag("Testing networks access on $vm_name"); Ravada::Request->list_networks(id_vm => $vm->id, uid => user_admin->id); - wait_request( debug => 1); + wait_request( debug => 0); test_deny_access($vm); + test_grant_access($vm); } } diff --git a/templates/main/admin_networks.html.ep b/templates/main/admin_networks.html.ep index 2fff2ebd4..92c8c272f 100644 --- a/templates/main/admin_networks.html.ep +++ b/templates/main/admin_networks.html.ep @@ -16,25 +16,35 @@
-
-
- -
<%=l 'Name' %>
+
<%=l 'Owner' %>
<%=l 'Bridge' %>
<%=l 'Address' %>
<%=l 'Active' %>
<%=l 'Auto Start' %>
+
+
+
+ <%=l 'No networks found' %> +
+
+
+
{{network.name}}
+
{{network.owner.name}}
{{network.bridge}}
{{network.ip_address}}
From 0aab6eee46bcea58f35e1808d6d795b3ab876656 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 21 Sep 2023 17:53:42 +0200 Subject: [PATCH 23/58] wip: remove networks when removing user and testing --- lib/Ravada.pm | 23 +++++++++++++------ lib/Ravada/Auth/SQL.pm | 16 +++++++++++++ lib/Ravada/Request.pm | 2 +- lib/Ravada/VM.pm | 22 +++++++++++++----- script/rvd_front | 23 +++++++++++++++++-- t/lib/Test/Ravada.pm | 3 +++ t/mojo/30_settings.t | 52 ++++++++++++++++++++++++++++++++++++++---- t/vm/networking.t | 31 +++++++++++++++++++++++++ 8 files changed, 151 insertions(+), 21 deletions(-) diff --git a/lib/Ravada.pm b/lib/Ravada.pm index 8a60f78d9..d0681b26b 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -6701,16 +6701,25 @@ sub _cmd_create_network($self, $request) { sub _cmd_remove_network($self, $request) { my $id = $request->args('id'); - _check_user_authorized_network($request, $id); + my $name = $request->defined_arg('name'); + my $sth_net = $CONNECTOR->dbh->prepare( + "SELECT * FROM virtual_networks WHERE id=?" + ); + $sth_net->execute($id); + my $network = $sth_net->fetchrow_hashref; + if ($network && $network->{id} ) { + _check_user_authorized_network($request, $id); + } + my $id_vm = ( $network->{id_vm} or $request->defined_arg('id_vm') ); + die "Error: unknown id_vm ".Dumper([$network,$request]) if !$id_vm; + + die "Error: unkonwn network , id=$id, name='".($name or '')."' " + .Dumper($network) if ! $network->{id} && !$name; my $user=Ravada::Auth::SQL->search_by_id($request->args('uid')); - my $sth = $CONNECTOR->dbh->prepare( - "SELECT id_vm FROM virtual_networks WHERE id=?"); - $sth->execute($id); - my ($id_vm) = $sth->fetchrow; my $vm = Ravada::VM->open($id_vm); - $vm->remove_network($user, $id); + $vm->remove_network($user, ($network->{id} or $name)); } sub _check_user_authorized_network($request, $id_network) { @@ -6724,7 +6733,7 @@ sub _check_user_authorized_network($request, $id_network) { $sth->execute($id_network); my $network = $sth->fetchrow_hashref; - die "Error: network $id_network not found" if !$network->{id}; + confess "Error: network $id_network not found" if !$network->{id}; die "Error: ".$user->name." not authorized\n" unless $user->is_admin diff --git a/lib/Ravada/Auth/SQL.pm b/lib/Ravada/Auth/SQL.pm index 557880892..01b0c6f10 100644 --- a/lib/Ravada/Auth/SQL.pm +++ b/lib/Ravada/Auth/SQL.pm @@ -636,9 +636,25 @@ sub remove($self) { my $sth = $$CON->dbh->prepare("DELETE FROM grants_user where id_user=?"); $sth->execute($self->id); + $self->_remove_networks(); + $sth = $$CON->dbh->prepare("DELETE FROM users where id=?"); $sth->execute($self->id); $sth->finish; + +} + +sub _remove_networks($self) { + my $sth = $$CON->dbh->prepare("SELECT id,id_vm,name FROM virtual_networks WHERE id_owner=?"); + $sth->execute($self->id); + while (my ($id, $id_vm, $name) = $sth->fetchrow) { + Ravada::Request->remove_network( + uid => Ravada::Utils::user_daemon->id + ,id_vm => $id_vm + ,id => $id + ,name => $name + ); + } } =head2 can_do diff --git a/lib/Ravada/Request.pm b/lib/Ravada/Request.pm index 4dad4edc6..398f36e92 100644 --- a/lib/Ravada/Request.pm +++ b/lib/Ravada/Request.pm @@ -169,7 +169,7 @@ our %VALID_ARG = ( ,list_networks => { uid => 1, id_vm => 1} ,new_network => { uid => 1, id_vm => 1, name => 2 } ,create_network => { uid => 1, id_vm => 1, data => 1 } - ,remove_network => { uid => 1, id => 1 } + ,remove_network => { uid => 1, id => 1, id_vm => 2, name => 2 } ,change_network => { uid => 1, data => 1 } ); diff --git a/lib/Ravada/VM.pm b/lib/Ravada/VM.pm index af9ba9870..684282b2d 100644 --- a/lib/Ravada/VM.pm +++ b/lib/Ravada/VM.pm @@ -1530,11 +1530,17 @@ sub _around_remove_network($orig, $self, $user, $id_net) { die "Error: Access denied: ".$user->name." can not remove networks" unless $user->can_create_networks(); - my ($net) = grep { $_->{id} eq $id_net } $self->list_virtual_networks(); + confess "Error: undefined network" if !defined $id_net; + + my $name = $id_net; + if ($id_net =~ /^\d+$/) { + my ($net) = grep { $_->{id} eq $id_net } $self->list_virtual_networks(); + die "Error: network id $id_net not found" if !$net; + $name = $net->{name}; + } - die "Error: network id $id_net not found" if !$net; - $self->$orig($net->{name}); + $self->$orig($name); my $sth = $self->_dbh->prepare("DELETE FROM virtual_networks WHERE id=?"); $sth->execute($id_net); @@ -1577,13 +1583,17 @@ sub _around_list_networks($orig, $self) { $self->_update_network($net); } my $sth = $self->_dbh->prepare( - "SELECT id,name FROM virtual_networks " + "SELECT id,name,id_owner FROM virtual_networks " ." WHERE id_vm=?"); my $sth_delete = $self->_dbh->prepare("DELETE FROM virtual_networks where id=?"); $sth->execute($self->id); - while (my ($id,$name) = $sth->fetchrow) { + while (my ($id, $name, $id_owner) = $sth->fetchrow) { my ($found) = grep {$_->{name} eq $name } @list; - next if $found; + if ( $found ) { + $found->{id_owner} = $id_owner; + $found->{id} = $id; + next; + } $sth_delete->execute($id); } diff --git a/script/rvd_front b/script/rvd_front index 8d974894a..778a67508 100644 --- a/script/rvd_front +++ b/script/rvd_front @@ -356,6 +356,9 @@ get '/admin/storage' => sub($c) { get '/admin/networks' => sub($c) { + return access_denied($c) unless $USER->is_admin + || $USER->can_create_networks || $USER->can_manage_all_networks; + _add_admin_libs($c); _select_vm($c); Ravada::Request->list_networks( @@ -485,6 +488,10 @@ get '/list_routes.json' => sub { get '/v2/vm/list_networks/(:id_vm)' => sub { my $c = shift; + + return access_denied($c) unless $USER->is_admin + || $USER->can_create_networks || $USER->can_manage_all_networks; + $c->render(json => Ravada::Front->list_networks($c->stash('id_vm'), $USER->id) ); }; @@ -507,7 +514,8 @@ get '/route/list_domains/#id' => sub($c) { }; get '/network/new' => sub($c) { - return access_denied($c) unless $USER->can_create_networks(); + return access_denied($c) unless $USER->is_admin + || $USER->can_create_networks || $USER->can_manage_all_networks; _add_admin_libs($c); _select_vm($c); @@ -517,13 +525,17 @@ get '/network/new' => sub($c) { }; get '/v2/network/new/#id_vm' => sub($c) { + + return access_denied($c) unless $USER->is_admin + || $USER->can_create_networks || $USER->can_manage_all_networks; + my $req = Ravada::Request->new_network( uid => $USER->id ,id_vm => $c->stash('id_vm') ); $RAVADA->wait_request($req); my $data = {}; - if ($req->status eq 'done' && $req->output =~ /^\{/) { + if ($req->status eq 'done' && $req->output && $req->output =~ /^\{/) { eval { $data = decode_json($req->output); }; @@ -541,6 +553,7 @@ get '/v2/network/info/#id' => sub($c) { post '/v2/network/set' => sub($c) { my $arg = decode_json($c->req->body); + delete $arg->{owner}; my $req; my %data; if ($arg->{id}) { @@ -3066,10 +3079,16 @@ sub access_denied { if (defined $c->stash('type') && $c->stash('type') eq 'json') { return $c->render(json => { error => $msg }, status => 403); } + + my $agent = $c->req->headers->user_agent; + if ($agent =~ /Mojolicious/) { + return $c->render(text => $msg, status => 403); + } my @css_snippets = ["\t.intro {\n\t\tbackground:" ." url($CONFIG_FRONT->{login_bg_file})" ." no-repeat bottom center scroll;\n\t}"]; + warn 1; return $c->render( template => ($CONFIG_FRONT->{access_denied} or '/main/access_denied') ,css => ['/css/main.css'] diff --git a/t/lib/Test/Ravada.pm b/t/lib/Test/Ravada.pm index 76e700e2c..4ea8eba39 100644 --- a/t/lib/Test/Ravada.pm +++ b/t/lib/Test/Ravada.pm @@ -1120,6 +1120,9 @@ sub create_user($name=new_domain_name(), $pass=$$, $is_admin=0) { eval { $login = Ravada::Auth::SQL->new(name => $name, password => $pass ) }; return $login if $login; + $login = Ravada::Auth::SQL->new(name => $name); + $login->remove if $login->id; + Ravada::Auth::SQL::add_user(name => $name, password => $pass, is_admin => $is_admin); my $user; diff --git a/t/mojo/30_settings.t b/t/mojo/30_settings.t index a80945eb6..f3840a14e 100644 --- a/t/mojo/30_settings.t +++ b/t/mojo/30_settings.t @@ -166,14 +166,35 @@ sub _remove_networks($id_vm) { $sth->execute($id_vm, base_domain_name."%"); while ( my $row = $sth->fetchrow_hashref ) { - warn Dumper($row); - my $req = mojo_request($t, "remove_network" ,{ id => $row->{id}}); } } +sub test_networks_deny($vm_name) { + + my ($name, $pass) = (new_domain_name, "$$ $$"); + my $user = create_user($name, $pass,0 ); + is($user->is_admin,0 ); + mojo_login($t, $name, $pass); + + my $sth = connector->dbh->prepare("SELECT id FROM vms " + ." WHERE vm_type=?"); + $sth->execute($vm_name); + my ($id_vm) = $sth->fetchrow; + + for my $url ( "/admin/networks", "/network/new" + , "/v2/vm/list_networks/$id_vm","/v2/network/new/".$id_vm + ) { + $t->get_ok($url)->status_is(403); + + } + + mojo_login($t, $USERNAME, $PASSWORD); + +} + sub test_networks_admin($vm_name) { mojo_check_login($t); @@ -201,8 +222,27 @@ sub test_networks_admin($vm_name) { $t->post_ok("/v2/network/set/" => json => $data ); my $new_ok = decode_json($t->tx->res->body); - die Dumper($new_ok); ok($new_ok->{id_network}); + + $t->get_ok("/v2/vm/list_networks/".$id_vm); + my $networks2 = decode_json($t->tx->res->body); + my ($new) = grep { $_->{name} eq $data->{name} } @$networks2; + + ok($new); + $new->{is_active} = 0; + + $t->post_ok("/v2/network/set/" => json => $new); + wait_request(debug => 1); + $t->get_ok("/v2/vm/list_networks/".$id_vm); + + my $networks3 = decode_json($t->tx->res->body); + my ($changed) = grep { $_->{name} eq $data->{name} } @$networks3; + is($changed->{is_active},0) or warn Dumper($changed); + + $t->get_ok("/v2/network/info/".$changed->{id}); + + my $changed4 = decode_json($t->tx->res->body); + is($changed4->{is_active},0) or exit; } sub test_routes($vm_name) { @@ -438,13 +478,14 @@ mojo_login($t, $USERNAME, $PASSWORD); remove_old_domains_req(0); # 0=do not wait for them clean_clones(); -test_languages(); -test_missing_routes(); +#test_languages(); +#test_missing_routes(); for my $vm_name (reverse @{rvd_front->list_vm_types} ) { diag("Testing settings in $vm_name"); + test_networks_deny( $vm_name ); test_networks_admin( $vm_name ); test_storage_pools($vm_name); test_nodes( $vm_name ); @@ -452,5 +493,6 @@ for my $vm_name (reverse @{rvd_front->list_vm_types} ) { } clean_clones(); +remove_old_users(); done_testing(); diff --git a/t/vm/networking.t b/t/vm/networking.t index 929c83d1f..dc8fb6ac9 100644 --- a/t/vm/networking.t +++ b/t/vm/networking.t @@ -174,6 +174,35 @@ sub test_add_network($vm) { return $new; } +sub test_remove_user($vm) { + my $user = create_user(); + user_admin->make_admin($user->id); + my $req = Ravada::Request->new_network( + uid => $user->id + ,id_vm => $vm->id + ,name => base_domain_name() + ); + wait_request(debug => 0); + + my $data = decode_json($req->output); + is($data->{id_vm},$vm->id); + + my $req_create = Ravada::Request->create_network( + uid => $user->id + ,id_vm => $vm->id + ,data => $data + ); + wait_request(debug => 0); + + my($new0) = grep { $_->{name} eq $data->{name} } $vm->list_virtual_networks(); + is($new0->{id_owner}, $user->id) or exit; + + $user->remove(); + wait_request(debug => 0); + + my($new) = grep { $_->{name} eq $data->{name} } $vm->list_virtual_networks(); + ok(!$new,"Expecting removed network $new0->{id} $data->{name}") or exit; +} sub test_remove_network($vm, $net) { my $user = create_user(); my $req = Ravada::Request->remove_network( @@ -539,6 +568,8 @@ for my $vm_name ( vm_names() ) { || $vm_name eq 'Void'; next if !$vm->has_networking(); + test_remove_user($vm); + test_create_fail($vm); test_list_networks($vm); From d709d0361327a715554743d44a21fdc31e840327 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 22 Sep 2023 16:19:29 +0200 Subject: [PATCH 24/58] wip: public networks --- lib/Ravada.pm | 7 ++- lib/Ravada/Front.pm | 8 ++- lib/Ravada/VM.pm | 45 ++++++++++---- public/js/ravada.js | 9 ++- script/rvd_front | 13 +++- t/mojo/30_settings.t | 14 ++++- t/vm/networking.t | 82 +++++++++++++++++++++++++- templates/main/admin_networks.html.ep | 14 +++++ templates/main/network_options.html.ep | 9 +++ 9 files changed, 174 insertions(+), 27 deletions(-) diff --git a/lib/Ravada.pm b/lib/Ravada.pm index d0681b26b..d6c706eb6 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -2374,7 +2374,6 @@ sub _sql_create_tables($self) { ,id_vm => 'integer NOT NULL references `vms` (`id`) ON DELETE CASCADE', ,name => 'varchar(200)' ,id_owner => 'integer NOT NULL references `users` (`id`) ON DELETE CASCADE', - ,is_active => 'integer not null' ,internal_id => 'char(80) not null' ,autostart => 'integer not null' ,bridge => 'char(80)' @@ -2383,6 +2382,7 @@ sub _sql_create_tables($self) { ,'dhcp_start' => 'char(15)' ,'dhcp_end' => 'char(15)' ,'is_active' => 'integer not null default 1' + ,'is_public' => 'integer not null default 0' ,date_changed => 'timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP' } ] @@ -6724,7 +6724,6 @@ sub _cmd_remove_network($self, $request) { sub _check_user_authorized_network($request, $id_network) { - my $user=Ravada::Auth::SQL->search_by_id($request->args('uid')); my $sth = $CONNECTOR->dbh->prepare( @@ -6737,6 +6736,7 @@ sub _check_user_authorized_network($request, $id_network) { die "Error: ".$user->name." not authorized\n" unless $user->is_admin + || $user->can_manage_all_networks || ( $user->can_create_networks && $network->{id_owner} == $user->id); return $network; @@ -6751,7 +6751,8 @@ sub _cmd_change_network($self, $request) { $data->{internal_id} = $network->{internal_id} if !$data->{internal_id}; my $vm = Ravada::VM->open($network->{id_vm}); - $vm->change_network($data); + + $vm->change_network($data, $request->args('uid')); } sub _cmd_active_storage_pool($self, $request) { diff --git a/lib/Ravada/Front.pm b/lib/Ravada/Front.pm index be15746fe..4635f6fa8 100644 --- a/lib/Ravada/Front.pm +++ b/lib/Ravada/Front.pm @@ -1687,7 +1687,7 @@ sub list_networks($self, $id_vm ,$id_user) { my $user = Ravada::Auth::SQL->search_by_id($id_user); my $owned = 0; unless ($user->is_admin || $user->can_manage_all_networks) { - $query .= " AND id_owner=? "; + $query .= " AND ( id_owner=? or is_public=1) "; $owned = 1; } $query .= " ORDER BY name"; @@ -1714,7 +1714,11 @@ sub _search_user($self,$id, $users) { "SELECT * FROM users WHERE id=?" ); $sth->execute($id); - $users->{$id}=$sth->fetchrow_hashref(); + my $row = $sth->fetchrow_hashref(); + for my $field (keys %$row) { + delete $row->{$field} if $field =~ /passw/; + } + $users->{$id}=$row; } sub _filter_active($pools, $active) { diff --git a/lib/Ravada/VM.pm b/lib/Ravada/VM.pm index 684282b2d..17865eee4 100644 --- a/lib/Ravada/VM.pm +++ b/lib/Ravada/VM.pm @@ -24,6 +24,7 @@ use Net::OpenSSH; use IO::Socket; use IO::Interface; use Net::Domain qw(hostfqdn); +use Storable qw(dclone); use Ravada::HostDevice; use Ravada::Utils; @@ -1451,6 +1452,7 @@ sub _insert_network($self, $net) { if !exists $net->{id_owner}; $net->{id_vm} = $self->id; + $net->{is_public}=1 if !exists $net->{is_public}; my @fields = grep !/^_/, sort keys %$net; @@ -1523,6 +1525,7 @@ sub _around_create_network($orig, $self,$data, $id_owner, $request=undef) { eval { $self->$orig($data) }; $request->error(''.$@) if $@ && $request; $data->{id_owner} = $id_owner; + $data->{is_public} = 0 if !$data->{is_public}; $self->_insert_network($data); } @@ -1546,24 +1549,43 @@ sub _around_remove_network($orig, $self, $user, $id_net) { $sth->execute($id_net); } -sub _around_change_network($orig, $self, $data) { +sub _around_change_network($orig, $self, $data, $uid) { delete $data->{_old_name}; delete $data->{date_changed}; - my %data2 = %$data; - delete $data->{id_owner}; + my $data2 = dclone($data); + delete $data->{id_owner}; + delete $data->{is_public}; my $changed = $orig->($self, $data); - my $id = delete $data2{id}; + my $id = delete $data2->{id}; + my $sth0 = $self->_dbh->prepare("SELECT * FROM virtual_networks WHERE id=?"); + $sth0->execute($id); + my $old = $sth0->fetchrow_hashref; + + my $user=Ravada::Auth::SQL->search_by_id($uid); + my $sql = ""; - for my $field (sort keys %data2) { + for my $field (sort keys %$data2) { + if ( exists $old->{$field} && defined $old->{$field} + && exists $data2->{$field} && defined $data2->{$field} + && $data2->{$field} eq $old->{$field}) { + delete $data2->{$field}; + next; + } + if ($field eq 'is_public' && $old->{$field} ne $data2->{$field}) { + die "Error: user ".$user->name." not authorized to change $field.\n" + unless $user->is_admin() ||$user->can_manage_all_networks(); + } $sql .= ", " if $sql; $sql .=" $field=? " } - $sql = "UPDATE virtual_networks set $sql WHERE id=?"; - my $sth = $self->_dbh->prepare($sql); - my @values = map { $data2{$_} } sort keys %data2; - $sth->execute(@values, $id); + if ($sql) { + $sql = "UPDATE virtual_networks set $sql WHERE id=?"; + my $sth = $self->_dbh->prepare($sql); + my @values = map { $data2->{$_} } sort keys %$data2; + $sth->execute(@values, $id); + } } sub _check_networks($self) { } @@ -1583,15 +1605,16 @@ sub _around_list_networks($orig, $self) { $self->_update_network($net); } my $sth = $self->_dbh->prepare( - "SELECT id,name,id_owner FROM virtual_networks " + "SELECT id,name,id_owner,is_public FROM virtual_networks " ." WHERE id_vm=?"); my $sth_delete = $self->_dbh->prepare("DELETE FROM virtual_networks where id=?"); $sth->execute($self->id); - while (my ($id, $name, $id_owner) = $sth->fetchrow) { + while (my ($id, $name, $id_owner, $is_public) = $sth->fetchrow) { my ($found) = grep {$_->{name} eq $name } @list; if ( $found ) { $found->{id_owner} = $id_owner; $found->{id} = $id; + $found->{is_public} = $is_public; next; } $sth_delete->execute($id); diff --git a/public/js/ravada.js b/public/js/ravada.js index b37a25c85..3dfa5b2be 100644 --- a/public/js/ravada.js +++ b/public/js/ravada.js @@ -591,11 +591,11 @@ $scope.list_storage= response.data; }); } + list_interfaces(); if (is_admin) { $scope.init_domain_access(); $scope.init_ldap_access(); $scope.list_ldap_attributes(); - list_interfaces(); list_users(); list_host_devices(); list_access_groups(); @@ -611,9 +611,12 @@ var list_interfaces = function() { if (! $scope.network_nats) { - $http.get('/network/interfaces/'+$scope.showmachine.type+'/nat') + $http.get('/v2/vm/list_networks/'+$scope.showmachine.id_vm) .then(function(response) { - $scope.network_nats = response.data; + $scope.network_nats= []; + for (var i=0; i sub($c) { return $c->render( json => $RAVADA->list_bases_network($c->stash('id'))); }; -get '/network/new' => sub($c) { +any '/network/new' => sub($c) { return access_denied($c) unless $USER->is_admin || $USER->can_create_networks || $USER->can_manage_all_networks; @@ -524,14 +524,21 @@ get '/network/new' => sub($c) { return $c->render( template => '/main/network_new' ); }; -get '/v2/network/new/#id_vm' => sub($c) { +any '/v2/network/new/#id_vm' => sub($c) { return access_denied($c) unless $USER->is_admin || $USER->can_create_networks || $USER->can_manage_all_networks; + my $name = 'net'; + if ( $c->req->method eq 'POST') { + my $arg = decode_json($c->req->body); + $name = $arg->{name} if $arg->{name}; + } + my $req = Ravada::Request->new_network( uid => $USER->id ,id_vm => $c->stash('id_vm') + ,name => $name ); $RAVADA->wait_request($req); my $data = {}; @@ -804,7 +811,7 @@ get '/list_machine_types.json' => sub { get '/list_cpu_models.json' => sub { my $c = shift; - return access_denied($c) unless _logged_in($c) + return $c->render(json => []) unless _logged_in($c) && $USER->can_create_machine(); my $id_domain = $c->param('id_domain'); diff --git a/t/mojo/30_settings.t b/t/mojo/30_settings.t index f3840a14e..f5cb6cb7d 100644 --- a/t/mojo/30_settings.t +++ b/t/mojo/30_settings.t @@ -216,7 +216,7 @@ sub test_networks_admin($vm_name) { my $networks = decode_json($t->tx->res->body); ok(scalar(@$networks)); - $t->get_ok("/v2/network/new/".$id_vm); + $t->post_ok("/v2/network/new/".$id_vm => json => { name => base_domain_name() }); my $data = decode_json($t->tx->res->body); $t->post_ok("/v2/network/set/" => json => $data ); @@ -237,12 +237,22 @@ sub test_networks_admin($vm_name) { my $networks3 = decode_json($t->tx->res->body); my ($changed) = grep { $_->{name} eq $data->{name} } @$networks3; - is($changed->{is_active},0) or warn Dumper($changed); + is($changed->{is_active},0) or die $changed->{name}; $t->get_ok("/v2/network/info/".$changed->{id}); my $changed4 = decode_json($t->tx->res->body); is($changed4->{is_active},0) or exit; + + $new->{is_public}=1; + $t->post_ok("/v2/network/set/" => json => $new); + wait_request(debug => 1); + $t->get_ok("/v2/vm/list_networks/".$id_vm); + + my $networks5 = decode_json($t->tx->res->body); + my ($changed5) = grep { $_->{name} eq $data->{name} } @$networks5; + is($changed5->{is_public},1) or warn Dumper($changed5); + } sub test_routes($vm_name) { diff --git a/t/vm/networking.t b/t/vm/networking.t index dc8fb6ac9..18f505d47 100644 --- a/t/vm/networking.t +++ b/t/vm/networking.t @@ -23,16 +23,19 @@ sub test_list_networks($vm) { my ($default)= @list; ok($default) or exit; + my $public=0; for my $net ( @list ) { ok($net->{id_vm}) or die "Error: network missing id_vm ".Dumper($net); my ($found) = _search_network(internal_id=>$net->{internal_id}); is($found->{name}, $net->{name}); is($found->{id_vm}, $net->{id_vm}); + $public++ if $found->{is_public}; ($found) = _search_network(id_vm => $net->{id_vm}, name => $net->{name}); die "Error: network not found id_vm= $net->{id_vm}, name=$net->{name}" if !$found; is($found->{internal_id}, $net->{internal_id}) or die Dumper($found); } + ok($public,"Expecting at least one public network discovered, got $public") or exit; } @@ -134,6 +137,71 @@ sub test_duplicate_bridge_add($vm, $net) { ) if $net_created; } +sub test_use_network($network) { + my $user = create_user(); + die "Expecting plain user " if $user->is_admin || $user->can_create_networks + || $user->can_manage_all_networks; + + warn "TODO test use network"; +} + +# only admins or users that can manage all networks can do this +sub test_change_owner($vm) { + my $user = create_user(); + my $new = $vm->new_network(new_domain_name); + my $req = Ravada::Request->create_network( + uid => user_admin->id + ,id_vm => $vm->id + ,data => $new + ); + wait_request(); + + my($new2) = grep { $_->{name} eq $new->{name} } $vm->list_virtual_networks(); + ok($new2) or return; + $new2->{id_owner} = $user->id; + my $req_change = Ravada::Request->change_network( + uid => $user->id + ,data => $new2 + ); + + wait_request(check_error => 0, debug => 0); + + my($new2b) = grep { $_->{name} eq $new->{name} } $vm->list_virtual_networks(); + is($new2b->{id_owner}, user_admin->id); + + like($req_change->error,qr/not authorized/) or exit; + + user_admin->grant($user, 'create_networks'); + $req_change->status('requested'); + + wait_request(check_error => 0); + like($req_change->error,qr/not authorized/); + my($new2c) = grep { $_->{name} eq $new->{name} } $vm->list_virtual_networks(); + is($new2c->{id_owner}, user_admin->id); + + user_admin->grant($user, 'manage_all_networks'); + $req_change->status('requested'); + wait_request(check_error => 0); + is($req_change->error, ''); + + my($new3) = grep { $_->{name} eq $new->{name} } $vm->list_virtual_networks(); + is($new3->{id_owner}, $user->id); + + $new2->{id_owner} = user_admin->id; + my $req_change2 = Ravada::Request->change_network( + uid => $user->id + ,data => $new2 + ); + + wait_request(check_error => 0); + + is($req_change2->error, ''); + + my($new4) = grep { $_->{name} eq $new->{name} } $vm->list_virtual_networks(); + is($new4->{id_owner}, user_admin->id); + +} + sub test_add_network($vm) { my $name = new_domain_name; my $net = { @@ -171,6 +239,7 @@ sub test_add_network($vm) { ok($new->{internal_id}); is($new->{is_active},1); is($new->{autostart},1); + is($new->{is_public},0); return $new; } @@ -454,7 +523,6 @@ sub test_public_network($vm, $net) { user_admin->grant($user2,'change_settings'); user_admin->grant($user2,'create_networks'); - my $clone = $domain->clone(user => $user2,name => new_domain_name); my $hw_net = $clone->info(user_admin)->{hardware}->{network}->[0]; @@ -463,6 +531,11 @@ sub test_public_network($vm, $net) { $hw_net2{network} = $net->{name}; is($user2->can_change_network($domain, \%hw_net2),0) or exit; + + my $list_nets = rvd_front->list_networks($vm->id,$user2->id); + ok(scalar(@$list_nets) >= 1,"Expecting at least 1 network allowed, got " + .scalar(@$list_nets)) or exit; + my $req = Ravada::Request->change_hardware( uid => $user2->id ,id_domain => $clone->id @@ -574,7 +647,11 @@ for my $vm_name ( vm_names() ) { test_list_networks($vm); - my ($net,$user) = test_add_network($vm); + my $net = test_add_network($vm); + test_public_network($vm, $net); + test_use_network($vm); + + test_change_owner($vm); test_new_network($vm); @@ -582,7 +659,6 @@ for my $vm_name ( vm_names() ) { test_duplicate_bridge_add($vm, $net); - test_public_network($vm, $net); test_change_network_internal($vm, $net); test_change_network($net); diff --git a/templates/main/admin_networks.html.ep b/templates/main/admin_networks.html.ep index 92c8c272f..a1dcbba11 100644 --- a/templates/main/admin_networks.html.ep +++ b/templates/main/admin_networks.html.ep @@ -19,6 +19,10 @@
<%=l 'Name' %>
+
<%=l 'Public' %>
+
<%=l 'Owner' %>
@@ -42,6 +46,16 @@
{{network.name}}
+
+ + ✔ + ✕ +
+
{{network.owner.name}}
diff --git a/templates/main/network_options.html.ep b/templates/main/network_options.html.ep index 3c0d06143..5ba29e1dc 100644 --- a/templates/main/network_options.html.ep +++ b/templates/main/network_options.html.ep @@ -69,6 +69,15 @@
+
+
<%=l 'Public' %>
+
+ +
+
+
From 77c74bfd399a8655790330de3199a58c9cd8ed11 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 22 Sep 2023 16:57:47 +0200 Subject: [PATCH 25/58] wip: enforce access to networks --- lib/Ravada/Front.pm | 6 ++++ t/mojo/30_settings.t | 48 ++++++++++++++++++++++----- t/vm/networking.t | 9 ----- templates/main/admin_networks.html.ep | 4 ++- 4 files changed, 48 insertions(+), 19 deletions(-) diff --git a/lib/Ravada/Front.pm b/lib/Ravada/Front.pm index 4635f6fa8..3c2d780b5 100644 --- a/lib/Ravada/Front.pm +++ b/lib/Ravada/Front.pm @@ -1702,6 +1702,12 @@ sub list_networks($self, $id_vm ,$id_user) { while ( my $row = $sth->fetchrow_hashref ) { $self->_search_user($row->{id_owner},\%owner); $row->{owner} = $owner{$row->{id_owner}}; + $row->{can_change}=0; + + $row->{can_change}=1 + if $user->is_admin || $user->can_manage_all_networks + || ($user->can_create_networks && $user->id == $row->{id_owner}); + push @networks,($row); } return \@networks; diff --git a/t/mojo/30_settings.t b/t/mojo/30_settings.t index f5cb6cb7d..5697c6674 100644 --- a/t/mojo/30_settings.t +++ b/t/mojo/30_settings.t @@ -172,29 +172,57 @@ sub _remove_networks($id_vm) { } -sub test_networks_deny($vm_name) { +sub _id_vm($vm_name) { + my $sth = connector->dbh->prepare("SELECT id FROM vms " + ." WHERE vm_type=?"); + $sth->execute($vm_name); + my ($id_vm) = $sth->fetchrow; + return $id_vm; +} + +sub test_networks_access($vm_name) { my ($name, $pass) = (new_domain_name, "$$ $$"); my $user = create_user($name, $pass,0 ); is($user->is_admin,0 ); mojo_login($t, $name, $pass); - my $sth = connector->dbh->prepare("SELECT id FROM vms " - ." WHERE vm_type=?"); - $sth->execute($vm_name); - my ($id_vm) = $sth->fetchrow; + my $id_vm = _id_vm($vm_name); - for my $url ( "/admin/networks", "/network/new" - , "/v2/vm/list_networks/$id_vm","/v2/network/new/".$id_vm - ) { + my @urls =( + "/admin/networks", "/network/new" + , "/v2/vm/list_networks/$id_vm","/v2/network/new/".$id_vm); + for my $url (@urls) { $t->get_ok($url)->status_is(403); + } + user_admin->grant($user,'create_networks'); + for my $url (@urls) { + $t->get_ok($url)->status_is(200); } + user_admin->revoke($user,'create_networks'); + user_admin->grant($user,'manage_all_networks'); + for my $url (@urls) { + $t->get_ok($url)->status_is(200); + } + + $user->remove(); mojo_login($t, $USERNAME, $PASSWORD); } +sub test_networks_access_grant($vm_name) { + + my ($name, $pass) = (new_domain_name, "$$ $$"); + my $user = create_user($name, $pass,0 ); + is($user->is_admin,0 ); + mojo_login($t, $name, $pass); + + my $id_vm = _id_vm($vm_name); + + die "TODO: create network, access changes, do changes, deny to other networks"; +} sub test_networks_admin($vm_name) { mojo_check_login($t); @@ -229,6 +257,7 @@ sub test_networks_admin($vm_name) { my ($new) = grep { $_->{name} eq $data->{name} } @$networks2; ok($new); + is($new->{can_change},1) or exit; $new->{is_active} = 0; $t->post_ok("/v2/network/set/" => json => $new); @@ -495,7 +524,8 @@ for my $vm_name (reverse @{rvd_front->list_vm_types} ) { diag("Testing settings in $vm_name"); - test_networks_deny( $vm_name ); + test_networks_access( $vm_name ); + test_networks_access_grant($vm_name); test_networks_admin( $vm_name ); test_storage_pools($vm_name); test_nodes( $vm_name ); diff --git a/t/vm/networking.t b/t/vm/networking.t index 18f505d47..4cca94f25 100644 --- a/t/vm/networking.t +++ b/t/vm/networking.t @@ -137,14 +137,6 @@ sub test_duplicate_bridge_add($vm, $net) { ) if $net_created; } -sub test_use_network($network) { - my $user = create_user(); - die "Expecting plain user " if $user->is_admin || $user->can_create_networks - || $user->can_manage_all_networks; - - warn "TODO test use network"; -} - # only admins or users that can manage all networks can do this sub test_change_owner($vm) { my $user = create_user(); @@ -649,7 +641,6 @@ for my $vm_name ( vm_names() ) { my $net = test_add_network($vm); test_public_network($vm, $net); - test_use_network($vm); test_change_owner($vm); diff --git a/templates/main/admin_networks.html.ep b/templates/main/admin_networks.html.ep index a1dcbba11..f3e107698 100644 --- a/templates/main/admin_networks.html.ep +++ b/templates/main/admin_networks.html.ep @@ -44,7 +44,9 @@ class="row" ng-cloak >
- {{network.name}} + {{network.name}} + {{network.name}}
Date: Tue, 26 Sep 2023 12:57:33 +0200 Subject: [PATCH 26/58] wip: grant access to manage networks --- lib/Ravada/Front.pm | 6 +-- lib/Ravada/VM.pm | 20 ++++++-- lib/Ravada/VM/Void.pm | 3 ++ script/rvd_front | 38 ++++++++++++-- t/mojo/30_settings.t | 73 ++++++++++++++++++++++++--- t/vm/networking.t | 2 - templates/main/admin_networks.html.ep | 6 +-- 7 files changed, 125 insertions(+), 23 deletions(-) diff --git a/lib/Ravada/Front.pm b/lib/Ravada/Front.pm index 3c2d780b5..f9e1b691a 100644 --- a/lib/Ravada/Front.pm +++ b/lib/Ravada/Front.pm @@ -1701,10 +1701,10 @@ sub list_networks($self, $id_vm ,$id_user) { my %owner; while ( my $row = $sth->fetchrow_hashref ) { $self->_search_user($row->{id_owner},\%owner); - $row->{owner} = $owner{$row->{id_owner}}; - $row->{can_change}=0; + $row->{_owner} = $owner{$row->{id_owner}}; + $row->{_can_change}=0; - $row->{can_change}=1 + $row->{_can_change}=1 if $user->is_admin || $user->can_manage_all_networks || ($user->can_create_networks && $user->id == $row->{id_owner}); diff --git a/lib/Ravada/VM.pm b/lib/Ravada/VM.pm index 17865eee4..c544a7f49 100644 --- a/lib/Ravada/VM.pm +++ b/lib/Ravada/VM.pm @@ -1475,11 +1475,18 @@ sub _update_network($self, $net) { $self->_insert_network($net); } else { for my $field ( keys %$net ) { + next if $field =~ /^_/; die "Wrong field in virtual_networks table : '$field'" if $field !~ /^[a-z]+[a-z0-9_]+$/; - next if !defined $net->{đield} && !defined $db_net->{$field}; - next if defined $net->{field} && $net->{$field} eq $db_net->{$field}; + confess "Error: field $field missing from ".Dumper($db_net) + if !exists $db_net->{$field}; + + next if !defined $net->{$field} && !defined $db_net->{$field}; + next if defined $net->{$field} + && defined $db_net->{$field} + && $net->{$field} eq $db_net->{$field}; + my $sth = $self->_dbh->prepare( "UPDATE virtual_networks set $field=?" ." WHERE id=?" @@ -1550,8 +1557,12 @@ sub _around_remove_network($orig, $self, $user, $id_net) { } sub _around_change_network($orig, $self, $data, $uid) { - delete $data->{_old_name}; delete $data->{date_changed}; + + for my $field (keys %$data) { + delete $data->{$field} if $field =~ /^_/; + } + my $data2 = dclone($data); delete $data->{id_owner}; @@ -1575,7 +1586,8 @@ sub _around_change_network($orig, $self, $data, $uid) { } if ($field eq 'is_public' && $old->{$field} ne $data2->{$field}) { die "Error: user ".$user->name." not authorized to change $field.\n" - unless $user->is_admin() ||$user->can_manage_all_networks(); + unless $user->is_admin() ||$user->can_manage_all_networks() + || ($user->can_create_networks && $user->id == $data->{id_owner}); } $sql .= ", " if $sql; $sql .=" $field=? " diff --git a/lib/Ravada/VM/Void.pm b/lib/Ravada/VM/Void.pm index 7bd8a68ad..985cf86a9 100644 --- a/lib/Ravada/VM/Void.pm +++ b/lib/Ravada/VM/Void.pm @@ -445,6 +445,8 @@ sub create_network($self, $data, $id_owner=undef, $request=undef) { $data->{bridge} = $self->_new_net_bridge() if !exists $data->{bridge} || ! defined $data->{bridge}; + delete $data->{is_public}; + for my $field ('bridge','ip_address') { $self->_check_duplicated_network($field,$data); } @@ -781,6 +783,7 @@ sub _check_duplicated_network($self, $field, $data) { sub change_network($self,$data) { my $id = delete $data->{internal_id} or confess "Missing internal_id ".Dumper($data); + my @networks = $self->list_virtual_networks(); my ($net) = grep { $_->{internal_id} eq $id } @networks; diff --git a/script/rvd_front b/script/rvd_front index a1ec649df..7d17f6fc7 100644 --- a/script/rvd_front +++ b/script/rvd_front @@ -354,13 +354,15 @@ get '/admin/storage' => sub($c) { }; -get '/admin/networks' => sub($c) { +get '/admin/networks/*id_vm' => { id_vm => undef} => sub($c) { return access_denied($c) unless $USER->is_admin || $USER->can_create_networks || $USER->can_manage_all_networks; _add_admin_libs($c); - _select_vm($c); + + _select_vm($c) if !defined $c->stash('id_vm'); + Ravada::Request->list_networks( uid => $USER->id ,id_vm => $c->stash('id_vm') @@ -558,9 +560,31 @@ get '/v2/network/info/#id' => sub($c) { return $c->render(json => $row); }; +sub _network_id_owner($id_network) { + + confess "Error: undefined id_network "if !defined $id_network; + my $sth = $RAVADA->_dbh->prepare("SELECT * FROM virtual_networks " + ." WHERE id=?"); + $sth->execute($id_network); + my $row = $sth->fetchrow_hashref; + warn "Error: network id=$id_network not found " if !$row->{id}; + + warn Dumper($row); + return ($row->{id_owner} or 0 ); +} + post '/v2/network/set' => sub($c) { my $arg = decode_json($c->req->body); - delete $arg->{owner}; + delete $arg->{_owner}; + + warn Dumper($arg); + + return access_denied_json($c) + unless $USER->is_admin || $USER->can_manage_all_networks + || ($USER->can_create_networks + && ( !$arg->{id} || $USER->id == _network_id_owner($arg->{id})) + ); + my $req; my %data; if ($arg->{id}) { @@ -906,6 +930,14 @@ any '/(:item)/settings/(:id).html' => sub($c) { return access_denied($c) if $table !~ /^[a-z][a-z_]+$/i; + if ($table eq 'virtual_networks') { + my $id = $c->stash('id'); # get id network + return access_denied_json($c) + unless $USER->is_admin || $USER->can_manage_all_networks + || ($USER->can_create_networks && $USER->id == _network_id_owner($id)) + ; + } + my $id_vm; if ($table eq 'nodes') { $id_vm = $c->stash('id'); diff --git a/t/mojo/30_settings.t b/t/mojo/30_settings.t index 5697c6674..081b1720d 100644 --- a/t/mojo/30_settings.t +++ b/t/mojo/30_settings.t @@ -159,15 +159,18 @@ sub _remove_route($address) { } sub _remove_networks($id_vm) { - my $sth = connector->dbh->prepare("SELECT * FROM virtual_networks vn, vms v" + my $sth = connector->dbh->prepare("SELECT vn.id FROM virtual_networks vn, vms v" ." WHERE vn.id_vm=v.id " ." AND v.id=? AND vn.name like ?" ); $sth->execute($id_vm, base_domain_name."%"); - while ( my $row = $sth->fetchrow_hashref ) { - my $req = mojo_request($t, "remove_network" - ,{ id => $row->{id}}); + while ( my ($id) = $sth->fetchrow) { + my $id_req = mojo_request($t, "remove_network", { id => $id}); + if ($id_req) { + my $req = Ravada::Request->open($id_req); + die "Error in ".$req->command." id=$id" if $req->error; + } } } @@ -216,12 +219,65 @@ sub test_networks_access_grant($vm_name) { my ($name, $pass) = (new_domain_name, "$$ $$"); my $user = create_user($name, $pass,0 ); - is($user->is_admin,0 ); + user_admin->grant($user,"create_networks"); mojo_login($t, $name, $pass); my $id_vm = _id_vm($vm_name); - die "TODO: create network, access changes, do changes, deny to other networks"; + $t->post_ok("/v2/network/new/".$id_vm => json => { name => base_domain_name() }); + my $data = decode_json($t->tx->res->body); + ok(keys %$data) or die Dumper($data); + + $t->post_ok("/v2/network/set/" => json => $data ); + my $new_ok = decode_json($t->tx->res->body); + ok($new_ok->{id_network}) or return; + + $t->get_ok("/settings/network".$new_ok->{id_network}.".html"); + + $t->get_ok("/v2/vm/list_networks/".$id_vm); + my $networks2 = decode_json($t->tx->res->body); + my ($old) = grep { $_->{name} ne $data->{name} } @$networks2; + ok($old,"Expecting more networks for VM $vm_name [ $id_vm ]") + or die Dumper([map {$_->{name} } @$networks2]); + + is($old->{_can_change},0) or exit; + + $t->get_ok("/network/settings/".$old->{id}.".html")->status_is(403); + $old->{autostart}=0; + + $t->post_ok("/v2/network/set/" => json => $old)->status_is(403); + + my ($new) = grep { $_->{name} eq $data->{name} } @$networks2; + ok($new,"Expecting new network $data->{name}") + or die Dumper([map {$_->{name} } @$networks2]); + is($new->{_owner}->{id},$user->id); + is($new->{_can_change},1) or exit; + + $new->{is_active} = (!$new->{is_active} or 0); + $t->post_ok("/v2/network/set/" => json => $new)->status_is(200); + wait_request(); + + $t->get_ok("/v2/vm/list_networks/".$id_vm); + { + my $networks3 = decode_json($t->tx->res->body); + my ($net3) = grep { $_->{name} eq $new->{name}} @$networks3; + is($net3->{is_active}, $new->{is_active}) or exit; + } + + $new->{is_public} = (!$new->{is_public} or 0); + $t->post_ok("/v2/network/set/" => json => $new)->status_is(200); + wait_request(); + + $t->get_ok("/v2/vm/list_networks/".$id_vm); + { + my $networks4 = decode_json($t->tx->res->body); + my ($net4) = grep { $_->{name} eq $new->{name}} @$networks4; + is($net4->{is_public}, $new->{is_public}) or exit; + } + + + mojo_login($t, $USERNAME, $PASSWORD); + } sub test_networks_admin($vm_name) { @@ -250,14 +306,15 @@ sub test_networks_admin($vm_name) { $t->post_ok("/v2/network/set/" => json => $data ); my $new_ok = decode_json($t->tx->res->body); - ok($new_ok->{id_network}); + ok($new_ok->{id_network}) or die Dumper([$t->tx->res->body, $new_ok]); $t->get_ok("/v2/vm/list_networks/".$id_vm); my $networks2 = decode_json($t->tx->res->body); my ($new) = grep { $_->{name} eq $data->{name} } @$networks2; ok($new); - is($new->{can_change},1) or exit; + is($new->{_can_change},1) or exit; + is($new->{_owner}->{id},user_admin->id) or exit; $new->{is_active} = 0; $t->post_ok("/v2/network/set/" => json => $new); diff --git a/t/vm/networking.t b/t/vm/networking.t index 4cca94f25..9459a4e75 100644 --- a/t/vm/networking.t +++ b/t/vm/networking.t @@ -115,8 +115,6 @@ sub test_duplicate_bridge_add($vm, $net) { $net2->{name} = new_domain_name(); $net2->{ip_address} = '192.51.200.1'; - diag("Replicating bridge ".$net2->{bridge}." from ".$net0->{name} - ." on network ".$net2->{name}); my $req = Ravada::Request->create_network( data => $net2 ,uid => user_admin->id diff --git a/templates/main/admin_networks.html.ep b/templates/main/admin_networks.html.ep index f3e107698..69867c8dc 100644 --- a/templates/main/admin_networks.html.ep +++ b/templates/main/admin_networks.html.ep @@ -45,8 +45,8 @@ >
{{network.name}} - {{network.name}} + ng-show="network._can_change">{{network.name}} + {{network.name}}
{{network.owner.name}}
+ >{{network._owner.name}}
{{network.bridge}}
{{network.ip_address}}
From 9366414b26d430c1da9cb277dc5217ff47f680ba Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Tue, 26 Sep 2023 15:44:16 +0200 Subject: [PATCH 27/58] wip: removed extra quote --- templates/main/network_remove.html.ep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/main/network_remove.html.ep b/templates/main/network_remove.html.ep index 6f45f1b3d..5d738edd3 100644 --- a/templates/main/network_remove.html.ep +++ b/templates/main/network_remove.html.ep @@ -8,7 +8,7 @@
<%=l 'Network removed' %>. - <%=l 'List Networks' %> + <%=l 'List Networks' %>
{{message}}
From 8b23a8f03db915e51a3864b99321ceb6acfcb8e1 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Tue, 26 Sep 2023 16:02:46 +0200 Subject: [PATCH 28/58] wip: do not activate if no found --- lib/Ravada/VM/KVM.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/Ravada/VM/KVM.pm b/lib/Ravada/VM/KVM.pm index 971e8f8a2..640ec1dbf 100644 --- a/lib/Ravada/VM/KVM.pm +++ b/lib/Ravada/VM/KVM.pm @@ -159,6 +159,7 @@ sub _check_networks($self, $vm=$self->vm) { $net = $found[0] if !$net; + return if !$net; warn "INFO: Activating KVM network ".$net->get_name."\n"; $net->create; $net->set_autostart(1); From 19af3c4c7c8fb4ca7436d72ba1505545cffd5ed8 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Wed, 27 Sep 2023 12:31:17 +0200 Subject: [PATCH 29/58] wip: properly change networks --- lib/Ravada/VM.pm | 74 ++++++++++++++++++------------------------- lib/Ravada/VM/Void.pm | 12 +++++-- script/rvd_front | 3 -- t/lib/Test/Ravada.pm | 3 +- t/mojo/30_settings.t | 22 ++++++------- t/vm/networking.t | 30 +++++++++++++----- 6 files changed, 74 insertions(+), 70 deletions(-) diff --git a/lib/Ravada/VM.pm b/lib/Ravada/VM.pm index c544a7f49..eef37e29e 100644 --- a/lib/Ravada/VM.pm +++ b/lib/Ravada/VM.pm @@ -1474,31 +1474,35 @@ sub _update_network($self, $net) { if (!$db_net || !$db_net->{id}) { $self->_insert_network($net); } else { - for my $field ( keys %$net ) { - next if $field =~ /^_/; - die "Wrong field in virtual_networks table : '$field'" - if $field !~ /^[a-z]+[a-z0-9_]+$/; - - confess "Error: field $field missing from ".Dumper($db_net) - if !exists $db_net->{$field}; - - next if !defined $net->{$field} && !defined $db_net->{$field}; - next if defined $net->{$field} - && defined $db_net->{$field} - && $net->{$field} eq $db_net->{$field}; - - my $sth = $self->_dbh->prepare( - "UPDATE virtual_networks set $field=?" - ." WHERE id=?" - ); - $sth->execute($net->{$field}, $db_net->{id}); - } + $self->_update_network_db($db_net, $net); $net->{id} = $db_net->{id}; } delete $db_net->{date_changed}; # delete $db_net->{id}; } +sub _update_network_db($self, $old, $new0) { + my $new = dclone($new0); + my $id = $old->{id} or confess "Missing id"; + my $sql = ""; + for my $field (sort keys %$new) { + if ( exists $old->{$field} && defined $old->{$field} + && exists $new->{$field} && defined $new->{$field} + && $new->{$field} eq $old->{$field}) { + delete $new->{$field}; + next; + } + $sql .= ", " if $sql; + $sql .=" $field=? " + } + if ($sql) { + $sql = "UPDATE virtual_networks set $sql WHERE id=?"; + my $sth = $self->_dbh->prepare($sql); + my @values = map { $new->{$_} } sort keys %$new; + $sth->execute(@values, $id); + } +} + sub _around_new_network($orig, $self, $name) { my $data = $self->$orig($name); $data->{id_vm} = $self->id; @@ -1565,39 +1569,21 @@ sub _around_change_network($orig, $self, $data, $uid) { my $data2 = dclone($data); - delete $data->{id_owner}; - delete $data->{is_public}; - my $changed = $orig->($self, $data); + my $id_owner = delete $data->{id_owner}; my $id = delete $data2->{id}; my $sth0 = $self->_dbh->prepare("SELECT * FROM virtual_networks WHERE id=?"); $sth0->execute($id); my $old = $sth0->fetchrow_hashref; + # this field is only in DB + delete $data->{is_public}; + my $changed = $orig->($self, $data); + my $user=Ravada::Auth::SQL->search_by_id($uid); - my $sql = ""; - for my $field (sort keys %$data2) { - if ( exists $old->{$field} && defined $old->{$field} - && exists $data2->{$field} && defined $data2->{$field} - && $data2->{$field} eq $old->{$field}) { - delete $data2->{$field}; - next; - } - if ($field eq 'is_public' && $old->{$field} ne $data2->{$field}) { - die "Error: user ".$user->name." not authorized to change $field.\n" - unless $user->is_admin() ||$user->can_manage_all_networks() - || ($user->can_create_networks && $user->id == $data->{id_owner}); - } - $sql .= ", " if $sql; - $sql .=" $field=? " - } - if ($sql) { - $sql = "UPDATE virtual_networks set $sql WHERE id=?"; - my $sth = $self->_dbh->prepare($sql); - my @values = map { $data2->{$_} } sort keys %$data2; - $sth->execute(@values, $id); - } + $self->_update_network_db($old, $data2); + } sub _check_networks($self) { } diff --git a/lib/Ravada/VM/Void.pm b/lib/Ravada/VM/Void.pm index 985cf86a9..1b6aac16a 100644 --- a/lib/Ravada/VM/Void.pm +++ b/lib/Ravada/VM/Void.pm @@ -783,12 +783,19 @@ sub _check_duplicated_network($self, $field, $data) { sub change_network($self,$data) { my $id = delete $data->{internal_id} or confess "Missing internal_id ".Dumper($data); + confess if exists $data->{is_public}; my @networks = $self->list_virtual_networks(); - my ($net) = grep { $_->{internal_id} eq $id } @networks; + my ($net0) = grep { $_->{internal_id} eq $id } @networks; + + my $file_out = $self->dir_img."/networks/".$net0->{name}.".yml"; + my $net= {}; + eval { $net = LoadFile($file_out) }; + confess $@ if $@; my $changed = 0; for my $field ('name', sort keys %$data) { + next if $field =~ /^_/ || $field eq 'is_public'; if (!exists $net->{$field}) { $net->{$field} = $data->{$field}; $changed++; @@ -810,8 +817,7 @@ sub change_network($self,$data) { } return if !$changed; - my $file_out = $self->dir_img."/networks/".$net->{name}.".yml"; - + delete $net->{is_public}; DumpFile($file_out,$net); } diff --git a/script/rvd_front b/script/rvd_front index 7d17f6fc7..a5c320cc6 100644 --- a/script/rvd_front +++ b/script/rvd_front @@ -569,7 +569,6 @@ sub _network_id_owner($id_network) { my $row = $sth->fetchrow_hashref; warn "Error: network id=$id_network not found " if !$row->{id}; - warn Dumper($row); return ($row->{id_owner} or 0 ); } @@ -577,8 +576,6 @@ post '/v2/network/set' => sub($c) { my $arg = decode_json($c->req->body); delete $arg->{_owner}; - warn Dumper($arg); - return access_denied_json($c) unless $USER->is_admin || $USER->can_manage_all_networks || ($USER->can_create_networks diff --git a/t/lib/Test/Ravada.pm b/t/lib/Test/Ravada.pm index 4ea8eba39..fc2b17468 100644 --- a/t/lib/Test/Ravada.pm +++ b/t/lib/Test/Ravada.pm @@ -1436,7 +1436,8 @@ sub remove_void_networks($vm=undef) { opendir my $dir, $dir_net or die "$! $dir_net"; while(my $filename = readdir $dir) { my $file = "$dir_net/$filename"; - unlink $file if -f $file && $file =~ /\.yml/; + next unless $file =~ /\.yml$/; + unlink $file or warn "$! $file"; } } diff --git a/t/mojo/30_settings.t b/t/mojo/30_settings.t index 081b1720d..cd4131b2c 100644 --- a/t/mojo/30_settings.t +++ b/t/mojo/30_settings.t @@ -253,29 +253,29 @@ sub test_networks_access_grant($vm_name) { is($new->{_owner}->{id},$user->id); is($new->{_can_change},1) or exit; - $new->{is_active} = (!$new->{is_active} or 0); - $t->post_ok("/v2/network/set/" => json => $new)->status_is(200); - wait_request(); + for ( 1 .. 2 ) { + $new->{is_active} = (!$new->{is_active} or 0); + $t->post_ok("/v2/network/set/" => json => $new)->status_is(200); + wait_request(); + + $t->get_ok("/v2/vm/list_networks/".$id_vm); - $t->get_ok("/v2/vm/list_networks/".$id_vm); - { my $networks3 = decode_json($t->tx->res->body); my ($net3) = grep { $_->{name} eq $new->{name}} @$networks3; is($net3->{is_active}, $new->{is_active}) or exit; } - $new->{is_public} = (!$new->{is_public} or 0); - $t->post_ok("/v2/network/set/" => json => $new)->status_is(200); - wait_request(); + for ( 1 .. 2 ) { + $new->{is_public} = (!$new->{is_public} or 0); + $t->post_ok("/v2/network/set/" => json => $new)->status_is(200); + wait_request(); - $t->get_ok("/v2/vm/list_networks/".$id_vm); - { + $t->get_ok("/v2/vm/list_networks/".$id_vm); my $networks4 = decode_json($t->tx->res->body); my ($net4) = grep { $_->{name} eq $new->{name}} @$networks4; is($net4->{is_public}, $new->{is_public}) or exit; } - mojo_login($t, $USERNAME, $PASSWORD); } diff --git a/t/vm/networking.t b/t/vm/networking.t index 9459a4e75..0854f0d7d 100644 --- a/t/vm/networking.t +++ b/t/vm/networking.t @@ -327,14 +327,28 @@ sub test_change_network($net) { is($new->{autostart},0); _check_network_changed($new,'autostart'); - $net2{is_active} = 1; - $req = Ravada::Request->change_network( - uid => user_admin->id - ,data => \%net2 - ); - wait_request(); - ($new) = grep { $_->{name} eq $net2{name} } $vm->list_virtual_networks(); - is($new->{is_active},1); + for ( 1 .. 2 ) { + $net2{is_active} = (!$net2{is_active} or 0); + $req = Ravada::Request->change_network( + uid => user_admin->id + ,data => \%net2 + ); + wait_request(); + my ($new2) = grep { $_->{name} eq $net2{name} } $vm->list_virtual_networks(); + is($new2->{is_active},$net2{is_active}); + } + + for ( 1 .. 2 ) { + $net2{is_public} = (!$net2{is_public} or 0); + $req = Ravada::Request->change_network( + uid => user_admin->id + ,data => \%net2 + ); + wait_request(debug => 0); + my ($new2) = grep { $_->{name} eq $net2{name} } $vm->list_virtual_networks(); + is($new2->{is_public}, $net2{is_public},"Expecting is_public=$net2{is_public}") + or die $net2{name}; + } my ($default) = grep { $_->{name} eq 'default' } $vm->list_virtual_networks(); $net2{bridge} = $default->{bridge}; From 66ff07a77fb0ce4ef9426b45ee89040f99741a9b Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Wed, 27 Sep 2023 13:54:39 +0200 Subject: [PATCH 30/58] wip: allow change machine network --- lib/Ravada.pm | 2 +- lib/Ravada/Auth/SQL.pm | 14 +++++++++++++ public/js/ravada.js | 2 +- t/vm/networking.t | 46 ++++++++++++++++++++++-------------------- 4 files changed, 40 insertions(+), 24 deletions(-) diff --git a/lib/Ravada.pm b/lib/Ravada.pm index d6c706eb6..8d7f8aeaa 100644 --- a/lib/Ravada.pm +++ b/lib/Ravada.pm @@ -5040,7 +5040,7 @@ sub _cmd_change_hardware { unless $user->is_admin || $hardware eq 'memory' || ($hardware eq 'network' - && $user->can_change_network($domain, $data) + && $user->can_change_hardware_network($domain, $data) ) ; diff --git a/lib/Ravada/Auth/SQL.pm b/lib/Ravada/Auth/SQL.pm index 01b0c6f10..f619b0abb 100644 --- a/lib/Ravada/Auth/SQL.pm +++ b/lib/Ravada/Auth/SQL.pm @@ -1282,6 +1282,20 @@ sub can_change_network($user, $domain, $data) { return 0; } +sub can_change_hardware_network($user, $domain, $data) { + return 1 if $user->is_admin; + + confess "Error: undefined network ".Dumper($data) + if !exists $data->{network} || !defined $data->{network}; + + my $net = _load_network($data->{network}); + + return 1 if $user->id == $domain->id_owner + && ( $net->{is_public} || $user->id == $net->{id_owner}); + return 0; +} + + sub AUTOLOAD($self, $domain=undef) { my $name = $AUTOLOAD; diff --git a/public/js/ravada.js b/public/js/ravada.js index 3dfa5b2be..abc55ebf1 100644 --- a/public/js/ravada.js +++ b/public/js/ravada.js @@ -615,7 +615,7 @@ .then(function(response) { $scope.network_nats= []; for (var i=0; ichange_network( + uid => $user2->id + ,data => {%$net, id_owner => $user2->id } + ); + + wait_request(check_error => 0); + like($req_change->error,qr/not authorized/); + + my $req_change2 = Ravada::Request->change_network( + uid => user_admin->id + ,data => {%$net, id_owner => $user2->id, is_public=>1 } + ); + + wait_request(check_error => 0, debug => 0); + is($req_change2->error,''); + my $domain = create_domain($vm); $domain->is_public(1); $domain->prepare_base(user_admin); - my $user2 = create_user(); user_admin->grant($user2,'change_settings'); user_admin->grant($user2,'create_networks'); @@ -532,14 +550,14 @@ sub test_public_network($vm, $net) { my $hw_net = $clone->info(user_admin)->{hardware}->{network}->[0]; ok($hw_net) or die $clone->name; my %hw_net2 = %$hw_net; - $hw_net2{network} = $net->{name}; - - is($user2->can_change_network($domain, \%hw_net2),0) or exit; my $list_nets = rvd_front->list_networks($vm->id,$user2->id); ok(scalar(@$list_nets) >= 1,"Expecting at least 1 network allowed, got " .scalar(@$list_nets)) or exit; + $hw_net2{network}=$net->{name}; + is($user2->can_change_hardware_network($clone, \%hw_net2),1) or exit; + my $req = Ravada::Request->change_hardware( uid => $user2->id ,id_domain => $clone->id @@ -547,24 +565,9 @@ sub test_public_network($vm, $net) { ,index => 0 ,data => \%hw_net2 ); - wait_request(check_error => 0); - like($req->error,qr/not allowed/); - - my $req_change = Ravada::Request->change_network( - uid => $user2->id - ,data => {%$net, id_owner => $user2->id } - ); - - wait_request(check_error => 0); - like($req_change->error,qr/not authorized/); - - my $req_change2 = Ravada::Request->change_network( - uid => user_admin->id - ,data => {%$net, id_owner => $user2->id } - ); - wait_request(check_error => 0, debug => 0); - is($req_change2->error,''); + is($req->error,''); + my $net3 = _search_network(id => $net->{id}); is($net3->{id_owner}, $user2->id) or exit; @@ -662,7 +665,6 @@ for my $vm_name ( vm_names() ) { test_duplicate_bridge_add($vm, $net); - test_change_network_internal($vm, $net); test_change_network($net); From 38bd20b4d66386cf88775ae00cb8b0e8fa13a0ec Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Wed, 27 Sep 2023 16:06:43 +0200 Subject: [PATCH 31/58] wip: grant manage all networks --- lib/Ravada/Auth/SQL.pm | 2 ++ t/vm/networking.t | 46 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/lib/Ravada/Auth/SQL.pm b/lib/Ravada/Auth/SQL.pm index f619b0abb..ade63a298 100644 --- a/lib/Ravada/Auth/SQL.pm +++ b/lib/Ravada/Auth/SQL.pm @@ -1284,6 +1284,8 @@ sub can_change_network($user, $domain, $data) { sub can_change_hardware_network($user, $domain, $data) { return 1 if $user->is_admin; + return 1 if $user->can_manage_all_networks() + && $domain->id_owner == $user->id; confess "Error: undefined network ".Dumper($data) if !exists $data->{network} || !defined $data->{network}; diff --git a/t/vm/networking.t b/t/vm/networking.t index ebe2ce693..4039ca7c0 100644 --- a/t/vm/networking.t +++ b/t/vm/networking.t @@ -584,6 +584,51 @@ sub test_public_network($vm, $net) { is($hw_net2{network}, $net->{name}); } +sub test_manage_all_networks($vm, $net) { + + my $net2 = dclone($net); + my $user2 = create_user(); + + my $req_change2 = Ravada::Request->change_network( + uid => user_admin->id + ,data => {%$net, is_public=>0 } + ); + + wait_request(check_error => 0, debug => 0); + is($req_change2->error,''); + + my $domain = create_domain($vm); + $domain->is_public(1); + $domain->prepare_base(user_admin); + + user_admin->grant($user2,'change_settings'); + user_admin->grant($user2,'manage_all_networks'); + + my $clone = $domain->clone(user => $user2,name => new_domain_name); + + my $hw_net = $clone->info(user_admin)->{hardware}->{network}->[0]; + ok($hw_net) or die $clone->name; + my %hw_net2 = %$hw_net; + + $hw_net2{network}=$net->{name}; + is($user2->can_change_hardware_network($clone, \%hw_net2),1) or exit; + + my $req = Ravada::Request->change_hardware( + uid => $user2->id + ,id_domain => $clone->id + ,hardware => 'network' + ,index => 0 + ,data => \%hw_net2 + ); + wait_request(check_error => 0, debug => 0); + is($req->error,''); + + my $clone4 = Ravada::Front::Domain->open($clone->id); + my $hw_net4 = $clone4->info(user_admin)->{hardware}->{network}->[0]; + + is($hw_net2{network}, $net->{name}); +} + sub test_new_network($vm) { my $req = Ravada::Request->new_network( uid => user_admin->id @@ -655,6 +700,7 @@ for my $vm_name ( vm_names() ) { test_list_networks($vm); my $net = test_add_network($vm); + test_manage_all_networks($vm,$ net); test_public_network($vm, $net); test_change_owner($vm); From 59371f25726af032706c0869a35bddced48f075b Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Wed, 27 Sep 2023 16:50:17 +0200 Subject: [PATCH 32/58] wip: properly check owner --- t/user/networks.t | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/t/user/networks.t b/t/user/networks.t index 52ecf5ca7..7e6af0be7 100644 --- a/t/user/networks.t +++ b/t/user/networks.t @@ -72,14 +72,17 @@ sub test_grant_access($vm) { my $networks = rvd_front->list_networks($vm->id , $user->id); my ($network_f) = grep {$_->{name} eq $data->{name}} @$networks; - is($network_f->{owner}->{id}, $user->id); - is($network_f->{owner}->{name}, $user->name); + + ok($network_f) or die "Network $data->{name} not found "; + + is($network_f->{_owner}->{id}, $user->id); + is($network_f->{_owner}->{name}, $user->name); } sub test_deny_access($vm) { my $user = create_user(); my $networks = rvd_front->list_networks($vm->id , $user->id); - is(scalar(@$networks),0); + ok(scalar(@$networks)); $networks = rvd_front->list_networks($vm->id , user_admin->id); ok(scalar(@$networks)); From 44802149aba2e153a3793066e9ba01aa4f0fb7ca Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Wed, 27 Sep 2023 16:55:37 +0200 Subject: [PATCH 33/58] wip: removed debug --- script/rvd_front | 1 - 1 file changed, 1 deletion(-) diff --git a/script/rvd_front b/script/rvd_front index a5c320cc6..edd987e99 100644 --- a/script/rvd_front +++ b/script/rvd_front @@ -3124,7 +3124,6 @@ sub access_denied { ." url($CONFIG_FRONT->{login_bg_file})" ." no-repeat bottom center scroll;\n\t}"]; - warn 1; return $c->render( template => ($CONFIG_FRONT->{access_denied} or '/main/access_denied') ,css => ['/css/main.css'] From 12c3901d4f8f48ecfdb88e88aa361d7eb5bcae93 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Wed, 27 Sep 2023 17:53:54 +0200 Subject: [PATCH 34/58] wip: anonymous access --- public/js/admin.js | 2 +- t/mojo/40_anonymous.t | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/public/js/admin.js b/public/js/admin.js index e78779327..f8846fb81 100644 --- a/public/js/admin.js +++ b/public/js/admin.js @@ -1254,7 +1254,7 @@ ravadaApp.directive("solShowMachine", swMach) }); }; $scope.set_network_domain= function(id_domain, field, allowed) { - $http.get("/route/set/"+$scope.route.id+ "/" + field+ "/" +id_domain+"/" + $http.get("/v2/route/set/"+$scope.route.id+ "/" + field+ "/" +id_domain+"/" +allowed) .then(function(response) { }); diff --git a/t/mojo/40_anonymous.t b/t/mojo/40_anonymous.t index 6af9f8c8c..68a3ab12a 100644 --- a/t/mojo/40_anonymous.t +++ b/t/mojo/40_anonymous.t @@ -57,7 +57,7 @@ sub _allow_anonymous_base() { my $id_domain = _id_domain('zz-test-base-alpine'); mojo_login($t, user_admin->name,"$$ $$"); - $t->get_ok("/network/set/$id_net/anonymous/$id_domain/1"); + $t->get_ok("/v2/route/set/$id_net/anonymous/$id_domain/1"); my $sth = connector->dbh->prepare("UPDATE domains set is_public=1" ." WHERE id=?"); @@ -97,8 +97,14 @@ _allow_anonymous_base(); $t->get_ok("/anonymous"); is($t->tx->res->code(), 200 ) or exit; + is(list_anonymous_users(), $n_anonymous + 1); +my $bases = rvd_front->list_bases_anonymous('127.0.0.1'); +my $url_view = "/machine/view/".$bases->[0]->{id}.".html"; +diag($url_view); +$t->get_ok($url_view) or exit; + _deny_anonymous_base(); $t->get_ok("/logout"); From 0c3213160c06a5d8bd2a0e9e171274982637c25a Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 28 Sep 2023 09:32:30 +0200 Subject: [PATCH 35/58] wip: fixed anonymous login --- lib/Ravada/Front.pm | 10 ++++++---- public/js/ravada.js | 6 +++++- t/mojo/40_anonymous.t | 5 +++-- templates/bootstrap/navigation.html.ep | 6 +++++- templates/main/list_bases_ng.html.ep | 5 +---- 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/lib/Ravada/Front.pm b/lib/Ravada/Front.pm index f9e1b691a..ef90c1593 100644 --- a/lib/Ravada/Front.pm +++ b/lib/Ravada/Front.pm @@ -1203,17 +1203,18 @@ sub list_bases_anonymous { my $net = Ravada::Route->new(address => $ip); my $sth = $CONNECTOR->dbh->prepare( - "SELECT id, name, id_base, is_public, file_screenshot " + "SELECT id, alias, name, id_base, is_public, file_screenshot " ."FROM domains where is_base=1 " ."AND is_public=1"); $sth->execute(); - my ($id, $name, $id_base, $is_public, $screenshot); - $sth->bind_columns(\($id, $name, $id_base, $is_public, $screenshot)); + my ($id, $alias, $name, $id_base, $is_public, $screenshot); + $sth->bind_columns(\($id, $alias, $name, $id_base, $is_public, $screenshot)); my @bases; while ( $sth->fetch) { next if !$net->allowed_anonymous($id); my %base = ( id => $id, name => Encode::decode_utf8($name) + , alias => Encode::decode_utf8($alias or $name) , is_public => ($is_public or 0) , screenshot => ($screenshot or '') , is_active => 0 @@ -1221,8 +1222,9 @@ sub list_bases_anonymous { , name_clone => undef , is_locked => undef , can_hibernate => 0 + ); - $base{screenshot} =~ s{^/var/www}{}; + $base{list_clones} = []; lock_hash(%base); push @bases, (\%base); } diff --git a/public/js/ravada.js b/public/js/ravada.js index abc55ebf1..5b57ca93f 100644 --- a/public/js/ravada.js +++ b/public/js/ravada.js @@ -160,7 +160,11 @@ if (machine.clone) { id=machine.clone.id; } - window.location.assign('/machine/view/' + id + '.html'); + var url_view = '/machine/view/' + id + '.html'; + if ($scope.anonymous) { + url_view = "/anonymous/"+id+".html"; + } + window.location.assign(url_view); } else { window.location.assign('/machine/clone/' + machine.id + '.html'); } diff --git a/t/mojo/40_anonymous.t b/t/mojo/40_anonymous.t index 68a3ab12a..cd5180ea5 100644 --- a/t/mojo/40_anonymous.t +++ b/t/mojo/40_anonymous.t @@ -101,8 +101,9 @@ is($t->tx->res->code(), 200 ) or exit; is(list_anonymous_users(), $n_anonymous + 1); my $bases = rvd_front->list_bases_anonymous('127.0.0.1'); -my $url_view = "/machine/view/".$bases->[0]->{id}.".html"; -diag($url_view); +ok($bases->[0]->{alias}); +ok($bases->[0]->{list_clones}); +my $url_view = "/anonymous/".$bases->[0]->{id}.".html"; $t->get_ok($url_view) or exit; _deny_anonymous_base(); diff --git a/templates/bootstrap/navigation.html.ep b/templates/bootstrap/navigation.html.ep index fbe27c2c9..233e7a5a5 100644 --- a/templates/bootstrap/navigation.html.ep +++ b/templates/bootstrap/navigation.html.ep @@ -5,7 +5,11 @@ navbar-custom \ % } navbar-dark bg-dark fixed-top navbar-expand-lg navbar-inverse"> - RAVADA VDI +% if ($_user && $_anonymous ) { + Ravada VDI +% } else { + Ravada VDI +% } diff --git a/templates/main/list_bases_ng.html.ep b/templates/main/list_bases_ng.html.ep index 18bc764bc..ed12475fe 100644 --- a/templates/main/list_bases_ng.html.ep +++ b/templates/main/list_bases_ng.html.ep @@ -4,9 +4,6 @@
%= include 'bootstrap/navigation' -
%= include 'main/list_bases_ng_head' @@ -116,7 +113,7 @@ ng-click="restore(machine.clone.id);host_restore=0;machine.action=false" ><%=l 'Yes' %>
-% if ($user +% if ($user && !$_anonymous % && ( $user->can_change_settings || $user->can_change_settings_all)){ From 6cd5a97f966eba938c073977b7601a2dac9105a3 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 28 Sep 2023 11:03:29 +0200 Subject: [PATCH 36/58] wip: work around not found counter --- lib/Ravada/VM/KVM.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/Ravada/VM/KVM.pm b/lib/Ravada/VM/KVM.pm index 640ec1dbf..f0cb5ab48 100644 --- a/lib/Ravada/VM/KVM.pm +++ b/lib/Ravada/VM/KVM.pm @@ -2972,6 +2972,8 @@ sub new_network($self, $name='net') { my %old = map { $_->{$field} => 1 } @networks; my ($last) = reverse sort keys %old; my ($z,$n) = $last =~ /.*?(0*)(\d+)/; + $z=$last if !defined $z; + $n=0 if !defined $n; $n++; $n = "$z$n"; From 4327f83eb9e5dba113515c939ac1a1dadbf86dce Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 28 Sep 2023 12:16:54 +0200 Subject: [PATCH 37/58] wip: doc for can change hw network --- lib/Ravada/Auth/SQL.pm | 14 ++++---------- t/vm/networking.t | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/lib/Ravada/Auth/SQL.pm b/lib/Ravada/Auth/SQL.pm index ade63a298..b5ef6664b 100644 --- a/lib/Ravada/Auth/SQL.pm +++ b/lib/Ravada/Auth/SQL.pm @@ -1269,18 +1269,12 @@ sub _load_network($network) { return $row; } -sub can_change_network($user, $domain, $data) { - return 1 if $user->is_admin; +=head2 can_change_hardware_network - confess "Error: undefined network ".Dumper($data) - if !exists $data->{network} || !defined $data->{network}; - - my $net = _load_network($data->{network}); +Returns true if the user can change the network in a virtual machine, +false elsewhere - return 1 if $user->id == $domain->id_owner - && $user->id == $net->{id_owner}; - return 0; -} +=cut sub can_change_hardware_network($user, $domain, $data) { return 1 if $user->is_admin; diff --git a/t/vm/networking.t b/t/vm/networking.t index 4039ca7c0..943a5567c 100644 --- a/t/vm/networking.t +++ b/t/vm/networking.t @@ -572,7 +572,7 @@ sub test_public_network($vm, $net) { my $net3 = _search_network(id => $net->{id}); is($net3->{id_owner}, $user2->id) or exit; - is($user2->can_change_network($clone, {network => $net3->{name}}),1) or exit; + is($user2->can_change_hardware_network($clone, {network => $net3->{name}}),1) or exit; $req->status('requested'); wait_request(check_error => 0); From b4298394e28bedc6043f3afdc0e2d0b738159655 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 28 Sep 2023 12:19:00 +0200 Subject: [PATCH 38/58] wip: doc list networks in front --- lib/Ravada/Front.pm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/Ravada/Front.pm b/lib/Ravada/Front.pm index ef90c1593..2a5b01241 100644 --- a/lib/Ravada/Front.pm +++ b/lib/Ravada/Front.pm @@ -1682,6 +1682,16 @@ sub list_storage_pools($self, $uid, $id_vm, $active=undef) { return _filter_active($pools, $active); } +=head2 list_networks + +List the virtual networks for a Virtual Machine Manager + +Arguments: id vm , id user + +Returns: list ref of networks + +=cut + sub list_networks($self, $id_vm ,$id_user) { my $query = "SELECT * FROM virtual_networks " ." WHERE id_vm=?"; From 548ffe6fb26137cb7b6f81a5847b718ceb94492e Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 28 Sep 2023 12:55:46 +0200 Subject: [PATCH 39/58] wip: test networks --- lib/Ravada/Domain/Void.pm | 22 ++++++++++++++++++++-- t/request/30_hardware.t | 7 ++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/lib/Ravada/Domain/Void.pm b/lib/Ravada/Domain/Void.pm index 24ad2532e..82c48f146 100644 --- a/lib/Ravada/Domain/Void.pm +++ b/lib/Ravada/Domain/Void.pm @@ -744,6 +744,8 @@ sub _set_default_info($self, $listen_ip=undef) { hwaddr => $info->{mac} ,address => $info->{ip} ,type => 'nat' + ,driver => 'virtio' + ,name => "net1" }; $self->_store(hardware => $hardware ); @@ -907,6 +909,18 @@ sub _internal_autostart { return $self->_value('autostart'); } +sub _new_network($self) { + my $hardware = $self->_value('hardware'); + my $list = ( $hardware->{'network'} or [] ); + my $data = { + hwaddr => _new_mac() + ,address => '' + ,type => 'nat' + ,driver => 'virtio' + ,name => "net".(scalar(@$list)+1) + }; +} + sub set_controller($self, $name, $number=undef, $data=undef) { my $hardware = $self->_value('hardware'); @@ -925,12 +939,16 @@ sub set_controller($self, $name, $number=undef, $data=undef) { my @list2; if (!defined $number) { @list2 = @$list; - push @list2,($data or " $name z 1"); + $data = $self->_new_network() if $name eq 'network' && !$data; + push @list2,($data or "$name z 1"); } else { my $count = 0; for my $item ( @$list ) { $count++; if ($number == $count) { + $data = $self->_new_network() + if $name eq 'network' && (!$data || ! keys %$data); + my $data2 = ( $data or " $name a ".($count+1)); $data2 = " $name b ".($count+1) if defined $data2 && ref($data2) && !keys %$data2; @@ -939,7 +957,7 @@ sub set_controller($self, $name, $number=undef, $data=undef) { } $item = { driver => 'spice' , port => 'auto' , listen_ip => $self->_vm->listen_ip } if $name eq 'display' && !defined $item; - push @list2,($item or " $name b ".($count+1)); + push @list2,($item or " $name c ".($count+1)); } } $hardware->{$name} = \@list2; diff --git a/t/request/30_hardware.t b/t/request/30_hardware.t index 5891af05c..71758b580 100644 --- a/t/request/30_hardware.t +++ b/t/request/30_hardware.t @@ -1509,6 +1509,8 @@ sub _remove_usbs($domain, $hardware) { sub test_change_drivers($domain, $hardware) { + return if $domain->type eq 'Void' && $hardware eq 'network'; + _remove_usbs($domain, $hardware); my $info = $domain->info(user_admin); @@ -1566,6 +1568,9 @@ sub test_change_drivers($domain, $hardware) { } sub test_all_drivers($domain, $hardware) { + + return if $domain->type eq 'Void' && $hardware eq 'network'; + my $info = $domain->info(user_admin); my $options = $info->{drivers}->{$hardware}; ok(scalar @$options,"No driver options for $hardware") or exit; @@ -1712,7 +1717,7 @@ for my $vm_name (vm_names()) { my %controllers = $domain_b0->list_controllers; lock_hash(%controllers); - for my $hardware ('display', sort keys %controllers ) { + for my $hardware ('network','display', sort keys %controllers ) { next if $hardware eq 'video'; my $name= new_domain_name(); my $domain_b = $BASE->clone( From 57f57c5d089f3d6e594ec4b8176ab6cdbcc239c8 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 28 Sep 2023 14:32:04 +0200 Subject: [PATCH 40/58] wip: make sure nw doesn't get deleted before change --- t/user/networks.t | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/t/user/networks.t b/t/user/networks.t index 7e6af0be7..2148f7b42 100644 --- a/t/user/networks.t +++ b/t/user/networks.t @@ -131,16 +131,18 @@ sub test_deny_access($vm) { user_admin->grant($user,'create_networks'); $req_new->status('requested'); $req_change->status('requested'); - $req_delete->status('requested'); $req_list->status('requested'); wait_request(check_error => 0); is($req_new->error,''); like($req_change->error,qr/not authorized/); - like($req_delete->error,qr/not authorized/); is($req_change->status(),'done'); is($req_list->error,''); + $req_delete->status('requested'); + wait_request(check_error => 0); + like($req_delete->error,qr/not authorized/); + $req_create->status('requested'); my $new_data = decode_json($req_new->output); $req_create->arg('data' => $new_data); From df444c89c07d36ba5208c5ad3152190ef33092bb Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 28 Sep 2023 15:07:06 +0200 Subject: [PATCH 41/58] wip: keep trying to pass tests in github --- t/request/30_hardware.t | 14 ++++++++++++-- t/user/20_grants.t | 1 - t/user/networks.t | 5 ++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/t/request/30_hardware.t b/t/request/30_hardware.t index 71758b580..2547f2458 100644 --- a/t/request/30_hardware.t +++ b/t/request/30_hardware.t @@ -1104,7 +1104,17 @@ sub test_change_network_bridge($vm, $domain, $index) { skip("No bridges found in this system",6) if !scalar @bridges; my $info = $domain->info(user_admin); - is ($info->{hardware}->{network}->[$index]->{type}, 'NAT') or exit; + if ($info->{hardware}->{network}->[$index]->{type} eq 'bridge') { + my $req = Ravada::Request->change_hardware( + id_domain => $domain->id + ,hardware => 'network' + ,index => $index + ,data => { type => 'NAT', network => 'default'} + ,uid => user_admin->id + ); + wait_request(); + + } ok(scalar @bridges,"No network bridges defined in this host") or return; @@ -1717,7 +1727,7 @@ for my $vm_name (vm_names()) { my %controllers = $domain_b0->list_controllers; lock_hash(%controllers); - for my $hardware ('network','display', sort keys %controllers ) { + for my $hardware ( sort keys %controllers ) { next if $hardware eq 'video'; my $name= new_domain_name(); my $domain_b = $BASE->clone( diff --git a/t/user/20_grants.t b/t/user/20_grants.t index 55e119e38..9c2d7b000 100644 --- a/t/user/20_grants.t +++ b/t/user/20_grants.t @@ -961,7 +961,6 @@ sub test_view_all($vm) { } for my $req ( $req_start_admin, $req_prepare_admin, $req_start ,$req_refresh, $req_refresh_ports) { - diag($req->command); is($req->status,'done'); next if $req->command =~ /refresh_machine_ports/i; is($req->error,'', $req->command) or exit; diff --git a/t/user/networks.t b/t/user/networks.t index 2148f7b42..4d9e07a03 100644 --- a/t/user/networks.t +++ b/t/user/networks.t @@ -110,8 +110,11 @@ sub test_deny_access($vm) { uid => $user->id ,id => $network->{id} ); - wait_request(check_error => 0); + wait_request(check_error => 0, debug => 1); like($req_delete->error,qr/not authorized/); + my $networks2 = rvd_front->list_networks($vm->id , user_admin->id); + my ($found2) = grep { $_->{name} eq $network->{name} } @$networks2; + ok($found2,"Expecting network $network->{name} $network->{id} not removed ".Dumper($networks2)) or return; my $req_create = Ravada::Request->create_network( uid => $user->id From f56c880a06d758451ca737629b80e2aa2e861276 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Thu, 28 Sep 2023 15:33:22 +0200 Subject: [PATCH 42/58] wip: remove only current test networks --- t/lib/Test/Ravada.pm | 3 ++- t/user/networks.t | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/t/lib/Test/Ravada.pm b/t/lib/Test/Ravada.pm index fc2b17468..9d1d9b858 100644 --- a/t/lib/Test/Ravada.pm +++ b/t/lib/Test/Ravada.pm @@ -1432,11 +1432,12 @@ sub remove_void_networks($vm=undef) { } my $dir_net = $vm->dir_img()."/networks"; return if ! -e $dir_net; + my $base = base_domain_name(); opendir my $dir, $dir_net or die "$! $dir_net"; while(my $filename = readdir $dir) { my $file = "$dir_net/$filename"; - next unless $file =~ /\.yml$/; + next unless $file =~ /^$base.*\.yml$/; unlink $file or warn "$! $file"; } diff --git a/t/user/networks.t b/t/user/networks.t index 4d9e07a03..b33e2cccf 100644 --- a/t/user/networks.t +++ b/t/user/networks.t @@ -31,9 +31,11 @@ sub test_create_network($vm) { ,id_vm => $vm->id ,data => $data ); - wait_request(debug => 0); - my ($network) = grep {$_->{name} eq $data->{name} } - $vm->list_virtual_networks(); + wait_request(debug => 1); + my @networks = $vm->list_virtual_networks(); + my ($network) = grep {$_->{name} eq $data->{name} } @networks; + ok($network) or die "Error, network $data->{name} not created " + .Dumper(\@networks); return $network; } From df86372216dbac17b6c32c47bc5d8078baba2024 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 29 Sep 2023 10:43:17 +0200 Subject: [PATCH 43/58] wip: properly get test nat networks --- lib/Ravada/VM.pm | 28 ++++++---------------------- t/vm/networking.t | 21 ++++++++++++--------- 2 files changed, 18 insertions(+), 31 deletions(-) diff --git a/lib/Ravada/VM.pm b/lib/Ravada/VM.pm index eef37e29e..2de18017e 100644 --- a/lib/Ravada/VM.pm +++ b/lib/Ravada/VM.pm @@ -2490,36 +2490,20 @@ sub list_network_interfaces($self, $type) { sub _list_nat_interfaces($self) { - my @cmd = ( '/usr/bin/virsh','net-list'); - my ($out,$err) = $self->run_command(@cmd); - - my @lines = split /\n/,$out; - shift @lines; - shift @lines; - + my @nets = $self->list_virtual_networks(); my @networks; - for (@lines) { - /\s*(.*?)\s+.*/; - push @networks,($1) if $1; + for my $net (@nets) { + push @networks,($net->{name}) if $net->{name}; } return @networks; } -sub _get_nat_bridge($self, $net) { - my @cmd = ( '/usr/bin/virsh','net-info', $net); - my ($out,$err) = $self->run_command(@cmd); - - for my $line (split /\n/, $out) { - my ($bridge) = $line =~ /^Bridge:\s+(.*)/; - return $bridge if $bridge; - } -} - sub _list_qemu_bridges($self) { my %bridge; - my @networks = $self->_list_nat_interfaces(); + my @networks = $self->list_virtual_networks(); for my $net (@networks) { - my $nat_bridge = $self->_get_nat_bridge($net); + next if !$net->{bridge}; + my $nat_bridge = $net->{bridge}; $bridge{$nat_bridge}++; } return keys %bridge; diff --git a/t/vm/networking.t b/t/vm/networking.t index 943a5567c..c437ee3f7 100644 --- a/t/vm/networking.t +++ b/t/vm/networking.t @@ -193,15 +193,16 @@ sub test_change_owner($vm) { } sub test_add_network($vm) { - my $name = new_domain_name; - my $net = { - name => $name + my $req_new = Ravada::Request->new_network( + uid => user_admin->id ,id_vm => $vm->id - ,ip_address => '192.0.'.$N++.'.1' - ,ip_netmask => '255.255.255.0' - ,is_active => 1 - ,autostart => 1 - }; + ,name => base_domain_name() + ); + wait_request(debug => 0); + + my $net = decode_json($req_new->output); + my $name = $net->{name}; + my $user = create_user(); my $req = Ravada::Request->create_network( uid => $user->id @@ -210,6 +211,8 @@ sub test_add_network($vm) { ); wait_request(check_error => 0); like($req->error,qr/not authorized/); + my($new0) = grep { $_->{name} eq $name } $vm->list_virtual_networks(); + ok(!$new0,"Expecting no new network $name created") or return; $req = Ravada::Request->create_network( uid => user_admin->id @@ -220,7 +223,7 @@ sub test_add_network($vm) { my $out = decode_json($req->output); my($new) = grep { $_->{name} eq $name } $vm->list_virtual_networks(); - ok($new,"Expecting new network $name created") or return; + ok($new,"Expecting new network $name created") or die Dumper([$vm->list_virtual_networks]); isa_ok($out,'HASH') && is($out->{id_network},$new->{id}); From f73ab925079708f1e7f3eea37895ede0d119caf7 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 29 Sep 2023 13:30:27 +0200 Subject: [PATCH 44/58] wip(test): clean test hwadress --- t/request/30_hardware_clones.t | 2 ++ 1 file changed, 2 insertions(+) diff --git a/t/request/30_hardware_clones.t b/t/request/30_hardware_clones.t index bd869ab2d..b033fedac 100644 --- a/t/request/30_hardware_clones.t +++ b/t/request/30_hardware_clones.t @@ -142,6 +142,8 @@ sub _clean_hw($name, @hw) { $item->{file} = ''; } elsif ($name eq 'filesystem') { $item->{_id} = ''; + } elsif ($name eq 'network') { + delete $item->{hwaddr}; } lock_hash(%$item); } From b7a7af11a315a73609a96ef703d67110ee1b6bf4 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 2 Oct 2023 10:24:55 +0200 Subject: [PATCH 45/58] wip: do not remove when mock vm --- t/request/70_network.t | 1 + 1 file changed, 1 insertion(+) diff --git a/t/request/70_network.t b/t/request/70_network.t index 29b81b020..2335bdc72 100644 --- a/t/request/70_network.t +++ b/t/request/70_network.t @@ -44,6 +44,7 @@ sub test_list_nats($vm) { } sub _remove_qemu_bridges($vm, $bridges) { + return @$bridges if $vm->type eq 'Void'; my @nat = $vm->list_network_interfaces('nat'); my %bridges = map { $_ => 1 } @$bridges; From da0d0fc1f9262d14933162740065a201e466b7dc Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Fri, 3 Nov 2023 15:23:26 +0100 Subject: [PATCH 46/58] wip: removed all around method --- lib/Ravada/VM.pm | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/Ravada/VM.pm b/lib/Ravada/VM.pm index 9abfce117..ef11a2da4 100644 --- a/lib/Ravada/VM.pm +++ b/lib/Ravada/VM.pm @@ -155,8 +155,6 @@ around 'ping' => \&_around_ping; around 'connect' => \&_around_connect; after 'disconnect' => \&_post_disconnect; -around '_list_used_volumes' => \&_around_list_used_volumes; - around 'new_network' => \&_around_new_network; around 'create_network' => \&_around_create_network; around 'remove_network' => \&_around_remove_network; From bb98ade7c52f22d78b626b8563b269b25f82d12c Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 6 Nov 2023 11:49:22 +0100 Subject: [PATCH 47/58] wip: do not show selection when no permission --- templates/main/manage_machine_edit_net.html.ep | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/templates/main/manage_machine_edit_net.html.ep b/templates/main/manage_machine_edit_net.html.ep index 9afaedc55..8606774e8 100644 --- a/templates/main/manage_machine_edit_net.html.ep +++ b/templates/main/manage_machine_edit_net.html.ep @@ -9,17 +9,23 @@
  • <%=l 'type' %>
  • + +% if ($USER->is_admin || $USER->can_create_networks || $USER->can_manage_all_networks ) { +% } else { + {{item.type}} +% }
  • <%=l 'nat' %> <%=l 'bridge' %>
  • +% if ($USER->is_admin || $USER->can_create_networks || $USER->can_manage_all_networks ) {
    • @@ -19,7 +20,9 @@
    <%=l 'Bridge' %>
    - +
    @@ -85,7 +88,6 @@ ng-click="load_network(network.id)"><%=l 'Cancel' %>
    From 545b494bc8b3105a9aacc78db92961867daadff4 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 22 Jan 2024 16:59:29 +0100 Subject: [PATCH 56/58] test: assign network --- t/vm/networking.t | 78 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 77 insertions(+), 1 deletion(-) diff --git a/t/vm/networking.t b/t/vm/networking.t index 62b687a82..a4d4f231b 100644 --- a/t/vm/networking.t +++ b/t/vm/networking.t @@ -199,7 +199,7 @@ sub test_add_network($vm) { ,name => base_domain_name() ); wait_request(debug => 0); - like($req->output , qr/\d+/) or exit; + like($req_new->output , qr/\d+/) or exit; my $net = decode_json($req_new->output); my $name = $net->{name}; @@ -375,6 +375,78 @@ sub test_change_network($net) { } +sub test_assign_network($vm, $net) { + my $id_iso = search_id_iso('Alpine%'); + my $name = new_domain_name(); + + my $req = Ravada::Request->create_domain( + id_iso => $id_iso + ,vm => $vm->type + ,name => $name + ,id_owner => user_admin->id + ,options => { + network => $net->{name} + } + ); + wait_request(debug => 1); + + my $domain = rvd_back->search_domain($name); + ok($domain); + + _check_domain_network($domain, $net->{name}); +} + +sub test_assign_network_clone($vm, $net, $volatile) { + my $id_iso = search_id_iso('Alpine%'); + my $name = new_domain_name(); + + my $req = Ravada::Request->create_domain( + id_iso => $id_iso + ,vm => $vm->type + ,name => $name + ,id_owner => user_admin->id + ); + wait_request(debug => 0); + + my $domain = rvd_back->search_domain($name); + $domain->prepare_base(user_admin); + $domain->volatile_clones(1); + + my $name_clone = new_domain_name(); + my $req2 = Ravada::Request->create_domain( + id_base => $domain->id + ,id_owner => user_admin->id + ,options => { network => $net->{name}} + ,name => $name_clone + ); + wait_request(debug => 1); + my $clone = rvd_back->search_domain($name_clone); + ok($clone); + + _check_domain_network($clone, $net->{name}); +} + +sub _check_domain_network_kvm($domain, $net_name) { + + my $doc = XML::LibXML->load_xml(string => $domain->xml_description()); + + my ($net_source) = $doc->findnodes("/domain/devices/interface/source"); + is($net_source->getAttribute('network'),$net_name); +} + +sub _check_domain_network_void($domain, $net_name) { + my $config = $domain->get_config(); + ok($config->{hardware}->{network}->[0]->{name}, $net_name); +} + +sub _check_domain_network($domain, $net_name) { + if ($domain->type eq 'KVM') { + _check_domain_network_kvm($domain, $net_name); + } else { + _check_domain_network_void($domain, $net_name); + } +} + sub test_change_network_internal($vm, $net) { if ($vm->type eq 'KVM') { test_change_network_internal_kvm($vm, $net); @@ -704,6 +776,10 @@ for my $vm_name ( vm_names() ) { test_list_networks($vm); my $net = test_add_network($vm); + test_assign_network($vm, $net); + test_assign_network_clone($vm, $net, 0); + test_assign_network_clone($vm, $net, 1); # volatile clone + test_manage_all_networks($vm,$ net); test_public_network($vm, $net); From f028d481f00a563c1a945417302646deeb043509 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 22 Jan 2024 16:59:36 +0100 Subject: [PATCH 57/58] wip(frontend): manage network --- templates/main/settings_generic.html.ep | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/templates/main/settings_generic.html.ep b/templates/main/settings_generic.html.ep index 7c665d0af..34ddb6b30 100644 --- a/templates/main/settings_generic.html.ep +++ b/templates/main/settings_generic.html.ep @@ -13,7 +13,19 @@ ng-init="init('<%= $id %>', '<%= url_for('ws_subscribe')->to_abs %>' ,'<%= $id_vm %>')" > -

    <%= $item %> {{<%= $item %>._old_name}}

    +
    +
    +
    + + <%= $item %> {{<%= $item %>._old_name}} + +
    +
    + back +
    +
    +
    %= include "main/settings_generic_tabs" From 407c1f0b4f4625f201dc8a36b5bbef72f175fd26 Mon Sep 17 00:00:00 2001 From: Francesc Guasch Date: Mon, 22 Jan 2024 17:55:58 +0100 Subject: [PATCH 58/58] wip: removed unused width --- templates/main/settings_generic.html.ep | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/main/settings_generic.html.ep b/templates/main/settings_generic.html.ep index 34ddb6b30..0f19a787d 100644 --- a/templates/main/settings_generic.html.ep +++ b/templates/main/settings_generic.html.ep @@ -14,13 +14,13 @@ ,'<%= $id_vm %>')" >
    -
    +
    <%= $item %> {{<%= $item %>._old_name}}
    -
    +
    back