mirror of
https://github.com/OpenNebula/one.git
synced 2026-10-24 04:07:33 +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>
187 lines
6.0 KiB
C++
187 lines
6.0 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_POOL_H_
|
|
#define GROUP_POOL_H_
|
|
|
|
#include "Group.h"
|
|
#include "PoolSQL.h"
|
|
|
|
|
|
class GroupPool : public PoolSQL
|
|
{
|
|
public:
|
|
|
|
GroupPool(SqlDB * db, bool is_federation_slave,
|
|
const std::vector<const SingleAttribute *>& restricted_attrs);
|
|
|
|
~GroupPool() = default;
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
/* Constants for DB management */
|
|
/* ---------------------------------------------------------------------- */
|
|
|
|
/**
|
|
* Default name for the oneadmin group
|
|
*/
|
|
static const std::string ONEADMIN_NAME;
|
|
|
|
/**
|
|
* Identifier for the oneadmin group
|
|
*/
|
|
static constexpr int ONEADMIN_ID = 0;
|
|
|
|
/**
|
|
* Default name for the users group
|
|
*/
|
|
static const std::string USERS_NAME;
|
|
|
|
/**
|
|
* Identifier for the user group
|
|
*/
|
|
static constexpr int USERS_ID = 1;
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
/* Methods for DB management */
|
|
/* ---------------------------------------------------------------------- */
|
|
|
|
/**
|
|
* Allocates a new group, writting it in the pool database. No memory is
|
|
* allocated for the object.
|
|
* @param name Group name
|
|
* @param oid the id assigned to the Group
|
|
* @param error_str Returns the error reason, if any
|
|
*
|
|
* @return the oid assigned to the object, -1 in case of failure
|
|
*/
|
|
int allocate(const std::string& name,
|
|
int * oid,
|
|
std::string& error_str);
|
|
|
|
/**
|
|
* Gets an object from the pool (if needed the object is loaded from the
|
|
* database). The object is locked, other threads can't access the same
|
|
* object. The lock is released by destructor.
|
|
* @param oid the Group unique identifier
|
|
* @return a pointer to the Group, nullptr in case of failure
|
|
*/
|
|
std::unique_ptr<Group> get(int oid)
|
|
{
|
|
return PoolSQL::get<Group>(oid);
|
|
}
|
|
|
|
/**
|
|
* Gets a read only object from the pool (if needed the object is loaded from the
|
|
* database). No object lock, other threads may work with the same object.
|
|
* @param oid the Group unique identifier
|
|
* @return a pointer to the Group, nullptr in case of failure
|
|
*/
|
|
std::unique_ptr<Group> get_ro(int oid)
|
|
{
|
|
return PoolSQL::get_ro<Group>(oid);
|
|
}
|
|
|
|
/**
|
|
* Returns the name of a group
|
|
* @param id of the group
|
|
* @return name of the group
|
|
*/
|
|
const std::string get_name(int gid)
|
|
{
|
|
static std::string error_str = "";
|
|
|
|
auto group = get_ro(gid);
|
|
|
|
if ( group == 0 )
|
|
{
|
|
return error_str;
|
|
}
|
|
|
|
const std::string gname = group->get_name();
|
|
|
|
return gname;
|
|
}
|
|
|
|
/**
|
|
* Update a particular Group. This method does not update the group's quotas
|
|
* @param user pointer to Group
|
|
* @return 0 on success
|
|
*/
|
|
int update(PoolObjectSQL * objsql) override;
|
|
|
|
/**
|
|
* Update a particular Group's Quotas
|
|
* @param group pointer to Group
|
|
* @return 0 on success
|
|
*/
|
|
int update_quotas(Group * group);
|
|
|
|
/**
|
|
* Update a particular Group's VLAN rules
|
|
* @param group pointer to Group
|
|
* @return 0 on success
|
|
*/
|
|
int update_vlans(Group * group);
|
|
|
|
/**
|
|
* Drops the Group from the data base. The object mutex SHOULD be
|
|
* locked.
|
|
* @param objsql a pointer to a Group object
|
|
* @param error_msg Error reason, if any
|
|
* @return 0 on success,
|
|
* -1 DB error,
|
|
* -2 object is a system group (ID < 100)
|
|
* -3 Group's User IDs set is not empty
|
|
*/
|
|
int drop(PoolObjectSQL * objsql, std::string& error_msg) override;
|
|
|
|
/**
|
|
* Bootstraps the database table(s) associated to the Group pool
|
|
* @return 0 on success
|
|
*/
|
|
static int bootstrap(SqlDB * _db)
|
|
{
|
|
return Group::bootstrap(_db);
|
|
};
|
|
|
|
/**
|
|
* Dumps the Group pool in XML format. A filter can be also added to the
|
|
* query
|
|
* @param oss the output stream to dump the pool contents
|
|
* @param where filter for the objects, defaults to all
|
|
* @param sid first element used for pagination
|
|
* @param eid last element used for pagination, -1 to disable
|
|
* @param desc descending order of pool elements
|
|
*
|
|
* @return 0 on success
|
|
*/
|
|
int dump(std::string& oss, const std::string& where,
|
|
int sid, int eid, bool desc) override;
|
|
|
|
private:
|
|
|
|
/**
|
|
* Factory method to produce objects
|
|
* @return a pointer to the new object
|
|
*/
|
|
PoolObjectSQL * create() override
|
|
{
|
|
return new Group(-1, "");
|
|
};
|
|
};
|
|
|
|
#endif /*GROUP_POOL_H_*/
|