etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow more generic searches of ACLs (#9566)

This commit is contained in:
dahn 2024-09-10 10:37:30 +02:00 committed by GitHub
parent 501d8c1e09
commit b1f683db6b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java
View File

@ -697,6 +697,7 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
final String trafficType = cmd.getTrafficType();
final String protocol = cmd.getProtocol();
final String action = cmd.getAction();
final String keyword = cmd.getKeyword();
final Map<String, String> tags = cmd.getTags();
final Account caller = CallContext.current().getCallingAccount();
@ -708,6 +709,7 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
sb.and("trafficType", sb.entity().getTrafficType(), Op.EQ);
sb.and("protocol", sb.entity().getProtocol(), Op.EQ);
sb.and("action", sb.entity().getAction(), Op.EQ);
sb.and("reason", sb.entity().getReason(), Op.EQ);
if (tags != null && !tags.isEmpty()) {
final SearchBuilder<ResourceTagVO> tagSearch = _resourceTagDao.createSearchBuilder();
@ -730,6 +732,12 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
final SearchCriteria<NetworkACLItemVO> sc = sb.create();
if (StringUtils.isNotBlank(keyword)) {
final SearchCriteria<NetworkACLItemVO> ssc = _networkACLItemDao.createSearchCriteria();
ssc.addOr("protocol", SearchCriteria.Op.LIKE, "%" + keyword + "%");
ssc.addOr("reason", SearchCriteria.Op.LIKE, "%" + keyword + "%");
sc.addAnd("acl_id", SearchCriteria.Op.SC, ssc);
}
if (id != null) {
sc.setParameters("id", id);
}
@ -747,7 +755,6 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
if (trafficType != null) {
sc.setParameters("trafficType", trafficType);
}
if (aclId != null) {
// Get VPC and check access
final NetworkACL acl = _networkACLDao.findById(aclId);
@ -764,7 +771,7 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
// aclId is not specified
// List permitted VPCs and filter aclItems
final List<Long> permittedAccounts = new ArrayList<Long>();
final List<Long> permittedAccounts = new ArrayList<>();
Long domainId = cmd.getDomainId();
boolean isRecursive = cmd.isRecursive();
final String accountName = cmd.getAccountName();
@ -780,7 +787,7 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
final SearchCriteria<VpcVO> scVpc = sbVpc.create();
_accountMgr.buildACLSearchCriteria(scVpc, domainId, isRecursive, permittedAccounts, listProjectResourcesCriteria);
final List<VpcVO> vpcs = _vpcDao.search(scVpc, null);
final List<Long> vpcIds = new ArrayList<Long>();
final List<Long> vpcIds = new ArrayList<>();
for (final VpcVO vpc : vpcs) {
vpcIds.add(vpc.getId());
}

18
ui/src/views/network/AclListRulesTab.vue
View File

@ -17,7 +17,8 @@
<template>
<a-spin :spinning="fetchLoading">
<div style="width: 100%; display: flex">
<div style="width: 100%; display: flex">
<a-button
type="dashed"
style="width: 100%; margin-right: 10px"
@ -31,6 +32,14 @@
<template #icon><download-outlined /></template>
{{ $t('label.acl.export') }}
</a-button>
<div class="search-bar">
<a-input-search
style="width: 25vw;float: right;margin-left: 10px; z-index: 8"
:placeholder="$t('label.search')"
v-model:value="searchQuery"
@search="fetchData"
/>
</div>
</div>
<div class="list">
@ -324,6 +333,7 @@ export default {
},
data () {
return {
searchQuery: '', // Bind this to the search input
acls: [],
fetchLoading: false,
protocolNumbers: [],
@ -433,7 +443,11 @@ export default {
},
fetchData () {
this.fetchLoading = true
api('listNetworkACLs', { aclid: this.resource.id }).then(json => {
const params = {
aclid: this.resource.id,
keyword: this.searchQuery
}
api('listNetworkACLs', params).then(json => {
this.acls = json.listnetworkaclsresponse.networkacl || []
if (this.acls.length > 0) {
this.acls.sort((a, b) => a.number - b.number)