opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-25 10:16:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,710 Commits 30 Branches 710 Tags
8fc4b2920aa4b49068ded01ff644c144fdf57504
Commit Graph
46 Commits
Author SHA1 Message Date
ioito c245e147ad add: 支持创建安全组时同时创建规则 2019-09-26 18:04:09 +08:00
Qiu Jian f414d4090a fix: 1. project add user/group rpc paramter error 2. secgrouprule 403 3. 2019-06-13 14:08:59 +08:00
Qiu Jian a6207a8ac7 hotfix: support scope list filter, resolve filter conflict 2019-06-04 23:27:55 +08:00
Qiu Jian b7027934db feature: 3-level policies, system/domain/project 2019-05-31 13:56:02 +08:00
屈轩 8abff83afc 同步安全组以公有云为主 2019-04-02 20:48:09 +08:00
Qiu Jian 004d9b6f95 update copyright headers of all source 2019-03-29 14:47:48 +08:00
屈轩 a372336ca6 完成安全组同步代码重构 2019-03-18 15:44:44 +08:00
周有松 a97e2faea8 Automatic merge from release/2.6.0 -> release/2.7.0 
* commit '84d91f281103767b964a6b09aeba85c854a59c5e':
  修正一些错误信息描述
 2019-03-07 16:57:59 +08:00
屈轩 58ee33c3f0 修正一些错误信息描述 2019-03-07 16:48:15 +08:00
邱剑 0edeb53d28 update models with db.Update interface 2019-02-22 12:06:13 +08:00
邱剑 ff3f65d821 Automatic merge from release/2.4.0 -> release/2.5.0 
* commit 'e80ce6369eeeea100b3c48810a837828580f9d3d':
  避免同步过来的安全组规则ip地址为nil
 2019-01-26 12:16:42 +08:00
邱剑 e80ce6369e Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '44536b25b0a1f8e6e5663522649f9a4eda4de02e':
  避免同步过来的安全组规则ip地址为nil
 2019-01-26 12:16:42 +08:00
邱剑 44536b25b0 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '6ce5fe078802ced35986f7d443b29642b4a17342':
  避免同步过来的安全组规则ip地址为nil
 2019-01-26 12:16:42 +08:00
屈轩 c442c275e1 避免同步过来的安全组规则ip地址为nil 2019-01-26 11:48:02 +08:00
屈轩 0ac4a7bff4 支持批量添加安全组规则 2019-01-04 12:30:53 +08:00
邱剑 b1816b2b93 Automatic merge from release/2.3.0 -> release/2.4.0 
* commit '6af9216966532ad6816c21903217187a4ae69ac3':
  SecurityGroupRule需要实现GetOwnerId和GetOwnerProjectId，以便于rbac判断owner
 2018-12-18 10:15:53 +08:00
Qiu Jian ceec25dfb4 SecurityGroupRule需要实现GetOwnerId和GetOwnerProjectId，以便于rbac判断owner 2018-12-17 23:06:26 +08:00
Qiu Jian 46aaba2474 make fmt 2018-12-12 23:24:34 +08:00
邱剑 5be54bad55 Merge pull request #639 in YUNIONIO/onecloud from release/2.3.0 to release/2.4.0 
* commit '37578c8a6ddaf8c0f4b6b65a9bad9552aba3b201':
  修复规则缺失优先级及描述信息
 2018-12-03 15:12:43 +08:00
屈轩 5c6a5c9375 修复规则缺失优先级及描述信息 2018-12-03 12:19:54 +08:00
wanyaoqi ecc750107b fix conflict 2018-12-01 16:18:11 +08:00
Qiu Jian e42f1a7744 recode 2018-12-01 12:05:41 +08:00
Qiu Jian 334f3605ba minor fixes 2018-12-01 00:42:29 +08:00
Qiu Jian e99e941b2f Merge branch 'release/2.3.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-remove-usercred-issystemadmin 2018-11-30 23:26:28 +08:00
邱剑 ed77d515d1 Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '309a2ca0b459a0466eab0229e8e25a899d888946':
  大部分公有云不需要将安全组拆分为单个单个的规则
 2018-11-30 23:04:03 +08:00
Qiu Jian bc02b3b433 1. 
取消userCred.IsSystemAdmin()，在使用policy的应用中，通过userCred.IsAdminAllow判断是否是管理员且具备相应的权限。获取token时，需要传入policy.FilterPolicyCredential，将普通userCred转换成支持rbac的userCred
2. 在应用启动时候，必须设置 SetServiceType，否则退出
 2018-11-30 23:00:11 +08:00
屈轩 0f78dd1ffc 大部分公有云不需要将安全组拆分为单个单个的规则 2018-11-30 20:40:59 +08:00
Yousong Zhou 49382934e5 treewide: 保留httperrors的格式 2018-11-28 07:33:22 +00:00
Qiu Jian 630ad7c526 Merge branch 'release/2.2.0' of ssh://git.yunion.io/~qiujian/onecloud into hotfix/qj-resolve-conflict-20181102-2.3.0 
Conflicts:
	pkg/compute/models/secgrouprules.go
 2018-11-02 20:42:50 +08:00
屈轩 7ac07a4463 更改validate rule data 方式 2018-11-02 13:44:04 +08:00
邱剑 33863514be Automatic merge from release/2.2.0 -> release/2.3.0 
* commit '13078eefc6b2775f21c5e7262c4d44dd1ebf62dc':
  修复同步rule规则时未处理好port内容
 2018-10-31 19:38:37 +08:00
屈轩 c8b52b0850 修复同步rule规则时未处理好port内容 2018-10-31 18:13:02 +08:00
Qiu Jian 0b17fe3547 增加keystone policy资源，格式化代码 2018-10-20 21:29:52 +08:00
Qiu Jian 17175bc0a4 改进：1. 部署VM时注入全局和项目公钥 2. 完善keypair的创建和导入功能 3. 
其他
 2018-10-11 23:04:42 +08:00
屈轩 48ce6b7c0e protocol为空则指定protocol为any 2018-09-10 16:42:39 +08:00
屈轩 c073766ccc 修复更新secrules失败bug 2018-08-25 16:49:48 +08:00
屈轩 bc73e77e35 更改sync算法 2018-08-14 22:48:11 +08:00
屈轩 2676c4fe07 解决冲突 2018-08-13 16:30:00 +08:00
屈轩 eccd7c7c17 同步阿里云安全组规则到本地 2018-08-11 16:36:24 +08:00
Zexi Li 22411ffb53 path move: github.com/yunionio -> yunion.io/x 2018-08-11 14:28:18 +08:00
屈轩 b409dbfbf4 Merge branch 'release/2.1.0' of ssh://git.yunion.io/~quxuan/onecloud into feature/qx-server-secgroup 2018-08-10 17:18:42 +08:00
Qiu Jian b979ce9c45 Update fmt 2018-08-08 00:11:02 +08:00
Zexi Li b5275a0c29 - mv mcclient to pkg/mcclient 
- vendor update
 2018-08-01 14:13:23 +08:00
Qiu Jian fcee2de326 修正：1. 由于系统盘大小设置单位未转换，导致阿里云创建主机失败 2. 
伪删除阿里云主机后，detach了系统盘，导致主机恢复后无系统盘 3.
修正一些格式错误 4. 补充一些climc命令
 2018-07-31 00:42:18 +08:00
Zexi Li 37624f11e2 Add region service. 2018-07-30 12:27:27 +08:00
Zexi Li 8ba5ffe1b4 compute models added. 2018-07-27 20:44:26 +08:00