mirror of
https://github.com/OpenNebula/one.git
synced 2026-10-26 13:19:36 +09:00
This PR adds Group VLAN authorization rules for Virtual Network self-provisioning
through VN Template instantiation and VNET updates derived from a VN Template.
The feature lets administrators define VLAN usage policies at group level. These policies are
evaluated when users instantiate VN Templates or update VNETs that were instantiated from a VN
Template. Direct VNET allocation is not treated as the tenant self-provisioning path; the intended
multi-tenant model is to expose network creation through reservations and VN Template
instantiation, while direct VNET allocation remains an admin-controlled operation.
Group VLAN rules are stored under `VLAN_RULES` as `RULE` vector attributes.
Rule format:
```txt
RULE = [
ID = "5,6,100-200",
SCOPE = "CVLAN",
VNTEMPLATE = "10,20-30"
]
Fields:
- ID: VLAN values allowed by the rule. Supports single values and ranges, comma-separated.
- Examples: "5", "5,6,100-200"
- SCOPE: VLAN attribute scope controlled by the rule.
- Supported scopes: VLAN_ID, OUTER_VLAN_ID, CVLAN, VLAN_TAGGED_ID, ANY
- VNTEMPLATE: optional VN Template IDs where the rule applies.
- Supports single values and ranges, comma-separated.
- -1 or missing value means the rule applies to any VN Template.
Examples:
RULE = [
ID = "100-200",
SCOPE = "VLAN_ID",
VNTEMPLATE = "10"
]
Allows VLAN_ID values from 100 to 200 when instantiating or updating VNETs derived from VN Template
10.
RULE = [
ID = "300,400-450",
SCOPE = "ANY",
VNTEMPLATE = "-1"
]
Allows the listed VLAN IDs/ranges for any supported VLAN scope and any VN Template.
Rules are parsed into an internal structured representation when group VLAN data is loaded or
updated. Each rule is normalized into:
- scope
- VLAN ID ranges
- VN Template ID ranges
This avoids reparsing raw template attributes during authorization checks.
Validation is applied to these input scopes:
- VLAN_ID
- OUTER_VLAN_ID
- CVLAN
- VLAN_TAGGED_ID
VLAN_ID and OUTER_VLAN_ID are validated as single integer values. CVLAN and VLAN_TAGGED_ID accept
range expressions such as 5,6-10.
For each requested VLAN value or range:
1. The input is parsed into one or more test ranges.
2. Rules are scanned for matching scope, including ANY.
3. Rules are filtered by VN Template ID:
- empty/-1 VNTEMPLATE matches all templates
- explicit ranges match only included template IDs
4. A requested range is accepted only if it is fully covered by a single rule range.
5. The check passes when all requested ranges are covered.
Automatic VLAN selection is rejected when the user belongs to a group with VLAN rules matching the
target VN Template, including global rules. This avoids bypassing explicit group VLAN policy
through automatic allocation.
VNETs instantiated from VN Templates now preserve the source VN Template ID as a first-class VNET
attribute:
<VNET>
...
<TEMPLATE_ID>...</TEMPLATE_ID>
...
</VNET>
TEMPLATE_ID = -1 means the VNET was created directly and was not instantiated from a VN Template.
This ID is immutable from user template updates:
- it is removed from the VNET template body on insert/update
- it is serialized as a top-level VNET attribute
- update operations use the stored value to validate VLAN authorization
A database migrator moves legacy TEMPLATE/TEMPLATE_ID values to top-level VNET/TEMPLATE_ID.
The tenant self-provisioning model for VNETs is based on controlled entry points:
- VNET reservations
- VN Template instantiation
Group VLAN authorization is enforced on VN Template instantiation and on updates to VNETs that were
instantiated from a VN Template.
Direct VNET allocation is not considered the tenant-facing self-provisioning path. It should remain
admin-controlled, as unrestricted VNET creation can expose other sensitive network attributes such
as PHYDEV, BRIDGE, and driver-specific configuration in addition to VLAN IDs.
Existing VNETs created from VN Templates may have the source template ID stored inside TEMPLATE/
TEMPLATE_ID. The migration step moves that value to top-level VNET/TEMPLATE_ID and removes it from
the template body.
This PR also updates the AR operations (add/del/update) so tenants can easily managed the VNET instantiations.
Existing directly-created VNETs will have no source VN Template and are treated as TEMPLATE_ID =
-1.
Existing group objects without VLAN rules are initialized with an empty VLAN_RULES section,
preserving current behavior until rules are explicitly configured.
Configuration compatibility:
- VLAN_ID, CVLANS, and AR/VLAN_ID are no longer expected to be handled through generic VNET
restricted attributes for the VN Template instantiation flow.
- OneCfg migration/update handling for configuration files will be addressed separately before
release.
co-authored-by: Pavel Czerny <pczerny@opennebula.io>
co-authored-by: Miguel E. Ruiz <mruiz@opennebula.io>
co-authored-by: dcarracedo <dcarracedo@opennebula.io>
298 lines
8.6 KiB
C++
298 lines
8.6 KiB
C++
/* ------------------------------------------------------------------------ */
|
|
/* Copyright 2002-2026, OpenNebula Project, OpenNebula Systems */
|
|
/* */
|
|
/* Licensed under the Apache License, Version 2.0 (the "License"); you may */
|
|
/* not use this file except in compliance with the License. You may obtain */
|
|
/* a copy of the License at */
|
|
/* */
|
|
/* http://www.apache.org/licenses/LICENSE-2.0 */
|
|
/* */
|
|
/* Unless required by applicable law or agreed to in writing, software */
|
|
/* distributed under the License is distributed on an "AS IS" BASIS, */
|
|
/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */
|
|
/* See the License for the specific language governing permissions and */
|
|
/* limitations under the License. */
|
|
/* -------------------------------------------------------------------------*/
|
|
|
|
#ifndef GROUP_H_
|
|
#define GROUP_H_
|
|
|
|
#include "PoolObjectSQL.h"
|
|
#include "GroupTemplate.h"
|
|
#include "ObjectCollection.h"
|
|
#include "QuotasSQL.h"
|
|
#include "GroupVlans.h"
|
|
#include "VMActions.h"
|
|
|
|
|
|
/**
|
|
* The Group class.
|
|
*/
|
|
class Group : public PoolObjectSQL
|
|
{
|
|
public:
|
|
|
|
virtual ~Group() = default;
|
|
|
|
static const std::string INVALID_NAME_CHARS;
|
|
|
|
/**
|
|
* Function to print the Group object into a string in XML format
|
|
* @param xml the resulting XML string
|
|
* @return a reference to the generated string
|
|
*/
|
|
std::string& to_xml(std::string& xml) const override;
|
|
|
|
/**
|
|
* Function to print the Group object into a string in
|
|
* XML format. The extended XML includes the default quotas
|
|
* @param xml the resulting XML string
|
|
* @return a reference to the generated string
|
|
*/
|
|
std::string& to_xml_extended(std::string& xml) const;
|
|
|
|
/**
|
|
* Rebuilds the object from an xml formatted string
|
|
* @param xml_str The xml-formatted string
|
|
*
|
|
* @return 0 on success, -1 otherwise
|
|
*/
|
|
int from_xml(const std::string &xml_str) override;
|
|
|
|
/**
|
|
* Adds this user's ID to the set.
|
|
* @param id of the user to be added to the group
|
|
* @return 0 on success
|
|
*/
|
|
int add_user(int id)
|
|
{
|
|
return users.add(id);
|
|
}
|
|
|
|
/**
|
|
* Deletes this users's ID from the set.
|
|
* @param id of the user to be deleted from the group
|
|
* @return 0 on success
|
|
*/
|
|
int del_user(int id)
|
|
{
|
|
if (admins.contains(id))
|
|
{
|
|
std::string error;
|
|
|
|
del_admin(id, error);
|
|
}
|
|
|
|
return users.del(id);
|
|
}
|
|
|
|
/**
|
|
* Adds a User to the admin set. ACL Rules are updated only for this user.
|
|
*
|
|
* @param user_id ID of the user
|
|
* @param error_msg Returns the error reason, if any
|
|
*
|
|
* @return 0 on success
|
|
*/
|
|
int add_admin(int user_id, std::string& error_msg);
|
|
|
|
/**
|
|
* Deletes a User from the admin set. ACL Rules are updated only for this user.
|
|
*
|
|
* @param user_id ID of the user
|
|
* @param error_msg Returns the error reason, if any
|
|
*
|
|
* @return 0 on success
|
|
*/
|
|
int del_admin(int user_id, std::string& error_msg);
|
|
|
|
/**
|
|
* Retrun true if User is an admin member of the group
|
|
*
|
|
* @param user_id ID of the user
|
|
*
|
|
* @return true on success
|
|
*/
|
|
bool is_admin(int user_id)
|
|
{
|
|
return admins.contains(user_id);
|
|
}
|
|
/**
|
|
* Object quotas, provides set and check interface
|
|
*/
|
|
GroupQuotas quota;
|
|
|
|
/**
|
|
* VLAN rules for this group
|
|
*/
|
|
GroupVlans vlans;
|
|
|
|
/**
|
|
* Writes/updates the Group quotas fields in the database.
|
|
* @param db pointer to the db
|
|
* @return 0 on success
|
|
*/
|
|
int update_quotas(SqlDB *db)
|
|
{
|
|
return quota.update(oid, db->get_local_db());
|
|
}
|
|
|
|
/**
|
|
* Writes/updates the Group VLAN rules fields in the database.
|
|
* @param db pointer to the db
|
|
* @return 0 on success
|
|
*/
|
|
int update_vlans(SqlDB *db)
|
|
{
|
|
return vlans.update(oid, db->get_local_db());
|
|
}
|
|
|
|
/**
|
|
* Factory method for Group templates
|
|
*/
|
|
std::unique_ptr<Template> get_new_template() const override
|
|
{
|
|
return std::make_unique<GroupTemplate>();
|
|
}
|
|
|
|
/**
|
|
* Sets suntone views in the group template if they are not set. Adds
|
|
* an attribute of the form:
|
|
* SUNSTONE=[
|
|
* DEFAULT_VIEW = "cloud",
|
|
* GROUP_ADMIN_DEFAULT_VIEW = "groupadmin",
|
|
* GROUP_ADMIN_VIEWS = "cloud,groupadmin",
|
|
* VIEWS = "cloud" ]
|
|
*/
|
|
void sunstone_views(const std::string& user_default,
|
|
const std::string& user_views,
|
|
const std::string& admin_default,
|
|
const std::string& admin_views);
|
|
|
|
/**
|
|
* @return the operation level (admin, manage or use) associated to the
|
|
* given action for this group
|
|
*/
|
|
AuthRequest::Operation get_vm_auth_op(VMActions::Action action) const
|
|
{
|
|
return vm_actions.get_auth_op(action);
|
|
}
|
|
|
|
protected:
|
|
/* Checks the validity of template attributes
|
|
* @param error string describing the error if any
|
|
* @return 0 on success
|
|
*/
|
|
int post_update_template(std::string& error, Template *_old_tmpl) override;
|
|
|
|
private:
|
|
|
|
// -------------------------------------------------------------------------
|
|
// Friends
|
|
// -------------------------------------------------------------------------
|
|
|
|
friend class GroupPool;
|
|
friend class PoolSQL;
|
|
|
|
// *************************************************************************
|
|
// Constructor
|
|
// *************************************************************************
|
|
|
|
Group(int id, const std::string& name);
|
|
|
|
// *************************************************************************
|
|
// Administrators
|
|
// *************************************************************************
|
|
|
|
/**
|
|
* Stores a collection with the regular users
|
|
*/
|
|
ObjectCollection users;
|
|
|
|
/**
|
|
* Stores a collection with the admin users
|
|
*/
|
|
ObjectCollection admins;
|
|
|
|
void add_admin_rules(int user_id);
|
|
void del_admin_rules(int user_id);
|
|
|
|
/**
|
|
* List of VM actions and rights for this group
|
|
*/
|
|
VMActions vm_actions;
|
|
|
|
// *************************************************************************
|
|
// DataBase implementation (Private)
|
|
// *************************************************************************
|
|
|
|
/**
|
|
* Execute an INSERT or REPLACE Sql query.
|
|
* @param db The SQL DB
|
|
* @param replace Execute an INSERT or a REPLACE
|
|
* @param error_str Returns the error reason, if any
|
|
* @return 0 one success
|
|
*/
|
|
int insert_replace(SqlDB *db, bool replace, std::string& error_str);
|
|
|
|
/**
|
|
* Bootstraps the database table(s) associated to the Group
|
|
* @return 0 on success
|
|
*/
|
|
static int bootstrap(SqlDB * db);
|
|
|
|
/**
|
|
* Reads the Group (identified with its OID) from the database.
|
|
* @param db pointer to the db
|
|
* @return 0 on success
|
|
*/
|
|
int select(SqlDB * db) override;
|
|
|
|
/**
|
|
* Reads the Group (identified with its OID) from the database.
|
|
* @param db pointer to the db
|
|
* @param name of the group
|
|
* @param uid of the owner
|
|
*
|
|
* @return 0 on success
|
|
*/
|
|
int select(SqlDB * db, const std::string& name, int uid) override;
|
|
|
|
/**
|
|
* Drops the group from the database
|
|
* @param db pointer to the db
|
|
* @return 0 on success
|
|
*/
|
|
int drop(SqlDB *db) override;
|
|
|
|
/**
|
|
* Writes the Group in the database.
|
|
* @param db pointer to the db
|
|
* @return 0 on success
|
|
*/
|
|
int insert(SqlDB *db, std::string& error_str) override;
|
|
|
|
/**
|
|
* Writes/updates the Group's data fields in the database. This method does
|
|
* not update the Group's Quotas
|
|
* @param db pointer to the db
|
|
* @return 0 on success
|
|
*/
|
|
int update(SqlDB *db) override
|
|
{
|
|
std::string error_str;
|
|
return insert_replace(db, true, error_str);
|
|
}
|
|
|
|
/**
|
|
* Function to print the Group object into a string in
|
|
* XML format
|
|
* @param xml the resulting XML string
|
|
* @param extended If true, default quotas are included
|
|
* @return a reference to the generated string
|
|
*/
|
|
std::string& to_xml_extended(std::string& xml, bool extended) const;
|
|
};
|
|
|
|
#endif /*GROUP_H_*/
|