ソースを参照

忽略 ssl 证书校验

James Iter 7 年 前
コミット
d3700ba774

+ 1 - 0
docs/todo.md

@@ -103,4 +103,5 @@
 - [ ] 企业版分叉
 - [ ] 加入邮件、短信报警功能
 - [ ] 参照公有云,设计、实现资源搜索过滤功能
+- [ ] 加入自定义主题颜色供。具体的颜色参考(http://ylbook.com/cms/web/chuantongsecai/chuantongsecai.htm)
 

+ 7 - 7
jimvc/api/dashboard.py

@@ -39,7 +39,7 @@ def r_show():
     guests_current_top_10_url = url_for('api_guest_performance.r_current_top_10', _external=True)
     hosts_current_top_10_url = url_for('api_host_performance.r_current_top_10', _external=True)
 
-    hosts_ret = requests.get(url=hosts_url, cookies=request.cookies)
+    hosts_ret = requests.get(url=hosts_url, cookies=request.cookies, verify=False)
     hosts_ret = json.loads(hosts_ret.content)
 
     # Host node_id 与 Host 的映射
@@ -47,13 +47,13 @@ def r_show():
     for host in hosts_ret['data']:
         hosts_mapping_by_node_id[int(host['node_id'])] = host
 
-    guests_distribute_count_ret = requests.get(url=guests_distribute_count_url, cookies=request.cookies)
+    guests_distribute_count_ret = requests.get(url=guests_distribute_count_url, cookies=request.cookies, verify=False)
     guests_distribute_count_ret = json.loads(guests_distribute_count_ret.content)
 
-    disks_distribute_count_ret = requests.get(url=disks_distribute_count_url, cookies=request.cookies)
+    disks_distribute_count_ret = requests.get(url=disks_distribute_count_url, cookies=request.cookies, verify=False)
     disks_distribute_count_ret = json.loads(disks_distribute_count_ret.content)
 
-    guests_current_top_10_ret = requests.get(url=guests_current_top_10_url, cookies=request.cookies)
+    guests_current_top_10_ret = requests.get(url=guests_current_top_10_url, cookies=request.cookies, verify=False)
     guests_current_top_10_ret = json.loads(guests_current_top_10_ret.content)
 
     guests_uuid = list()
@@ -68,7 +68,7 @@ def r_show():
 
     guests_url = url_for('api_guests.r_get_by_filter', _external=True, filter='uuid:in:' + ','.join(guests_uuid))
 
-    guests_ret = requests.get(url=guests_url, cookies=request.cookies)
+    guests_ret = requests.get(url=guests_url, cookies=request.cookies, verify=False)
     guests_ret = json.loads(guests_ret.content)
 
     # Guest uuid 与 Guest 的映射
@@ -87,7 +87,7 @@ def r_show():
 
     disks_url = url_for('api_disks.r_get_by_filter', _external=True, filter='uuid:in:' + ','.join(disks_uuid))
 
-    disks_ret = requests.get(url=disks_url, cookies=request.cookies)
+    disks_ret = requests.get(url=disks_url, cookies=request.cookies, verify=False)
     disks_ret = json.loads(disks_ret.content)
 
     # Disk uuid 与 Disk 的映射
@@ -95,7 +95,7 @@ def r_show():
     for disk in disks_ret['data']:
         disks_mapping_by_uuid[disk['uuid']] = disk
 
-    hosts_current_top_10_ret = requests.get(url=hosts_current_top_10_url, cookies=request.cookies)
+    hosts_current_top_10_ret = requests.get(url=hosts_current_top_10_url, cookies=request.cookies, verify=False)
     hosts_current_top_10_ret = json.loads(hosts_current_top_10_ret.content)
     hosts_current_top_10_ret['data']['memory_rate'] = copy.copy(hosts_current_top_10_ret['data']['cpu_load'])
 

+ 3 - 3
jimvc/api/disk.py

@@ -507,7 +507,7 @@ def r_show():
         # 关键字检索,不支持显示域过滤
         show_area = 'all'
 
-    hosts_ret = requests.get(url=hosts_url, cookies=request.cookies)
+    hosts_ret = requests.get(url=hosts_url, cookies=request.cookies, verify=False)
     hosts_ret = json.loads(hosts_ret.content)
 
     hosts_mapping_by_node_id = dict()
@@ -517,7 +517,7 @@ def r_show():
     if args.__len__() > 0:
         disks_url = disks_url + '?' + '&'.join(args)
 
-    disks_ret = requests.get(url=disks_url, cookies=request.cookies)
+    disks_ret = requests.get(url=disks_url, cookies=request.cookies, verify=False)
     disks_ret = json.loads(disks_ret.content)
 
     guests_uuid = list()
@@ -544,7 +544,7 @@ def r_show():
         snapshots_id_mapping_by_disks_uuid_url = url_for('api_snapshots.r_get_snapshots_by_disks_uuid',
                                                          disks_uuid=','.join(disks_uuid), _external=True)
         snapshots_id_mapping_by_disks_uuid_ret = requests.get(url=snapshots_id_mapping_by_disks_uuid_url,
-                                                              cookies=request.cookies)
+                                                              cookies=request.cookies, verify=False)
         snapshots_id_mapping_by_disks_uuid_ret = json.loads(snapshots_id_mapping_by_disks_uuid_ret.content)
 
         snapshots_id_mapping_by_disk_uuid = dict()

+ 11 - 11
jimvc/api/guest.py

@@ -990,7 +990,7 @@ def r_get(uuids):
         ssh_key_id_mapping[row['id']] = row
 
     hosts_url = url_for('api_hosts.r_get_by_filter', _external=True)
-    hosts_ret = requests.get(url=hosts_url, cookies=request.cookies)
+    hosts_ret = requests.get(url=hosts_url, cookies=request.cookies, verify=False)
     hosts_ret = json.loads(hosts_ret.content)
 
     hosts_mapping_by_node_id = dict()
@@ -998,7 +998,7 @@ def r_get(uuids):
         hosts_mapping_by_node_id[int(host['node_id'])] = host
 
     vlans_url = url_for('api_vlans.r_get_by_filter', _external=True)
-    vlans_ret = requests.get(url=vlans_url, cookies=request.cookies)
+    vlans_ret = requests.get(url=vlans_url, cookies=request.cookies, verify=False)
     vlans_ret = json.loads(vlans_ret.content)
 
     vlans_mapping_by_vlan_id = dict()
@@ -1188,7 +1188,7 @@ def r_get_by_filter():
         snapshots_guest_uuid_mapping[guest_uuid].append(row)
 
     hosts_url = url_for('api_hosts.r_get_by_filter', _external=True)
-    hosts_ret = requests.get(url=hosts_url, cookies=request.cookies)
+    hosts_ret = requests.get(url=hosts_url, cookies=request.cookies, verify=False)
     hosts_ret = json.loads(hosts_ret.content)
 
     hosts_mapping_by_node_id = dict()
@@ -1196,7 +1196,7 @@ def r_get_by_filter():
         hosts_mapping_by_node_id[int(host['node_id'])] = host
 
     vlans_url = url_for('api_vlans.r_get_by_filter', _external=True)
-    vlans_ret = requests.get(url=vlans_url, cookies=request.cookies)
+    vlans_ret = requests.get(url=vlans_url, cookies=request.cookies, verify=False)
     vlans_ret = json.loads(vlans_ret.content)
 
     vlans_mapping_by_vlan_id = dict()
@@ -1304,7 +1304,7 @@ def r_content_search():
         snapshots_guest_uuid_mapping[guest_uuid].append(row)
 
     hosts_url = url_for('api_hosts.r_get_by_filter', _external=True)
-    hosts_ret = requests.get(url=hosts_url, cookies=request.cookies)
+    hosts_ret = requests.get(url=hosts_url, cookies=request.cookies, verify=False)
     hosts_ret = json.loads(hosts_ret.content)
 
     hosts_mapping_by_node_id = dict()
@@ -1312,7 +1312,7 @@ def r_content_search():
         hosts_mapping_by_node_id[int(host['node_id'])] = host
 
     vlans_url = url_for('api_vlans.r_get_by_filter', _external=True)
-    vlans_ret = requests.get(url=vlans_url, cookies=request.cookies)
+    vlans_ret = requests.get(url=vlans_url, cookies=request.cookies, verify=False)
     vlans_ret = json.loads(vlans_ret.content)
 
     vlans_mapping_by_vlan_id = dict()
@@ -1772,14 +1772,14 @@ def r_show():
     if args.__len__() > 0:
         guests_url = guests_url + '?' + '&'.join(args)
 
-    hosts_ret = requests.get(url=hosts_url, cookies=request.cookies)
+    hosts_ret = requests.get(url=hosts_url, cookies=request.cookies, verify=False)
     hosts_ret = json.loads(hosts_ret.content)
 
     hosts_mapping_by_node_id = dict()
     for host in hosts_ret['data']:
         hosts_mapping_by_node_id[int(host['node_id'])] = host
 
-    guests_ret = requests.get(url=guests_url, cookies=request.cookies)
+    guests_ret = requests.get(url=guests_url, cookies=request.cookies, verify=False)
     guests_ret = json.loads(guests_ret.content)
 
     os_templates_image, _ = OSTemplateImage.get_by_filter()
@@ -1844,7 +1844,7 @@ def r_vnc(uuid):
         return guest_ret
 
     hosts_url = url_for('api_hosts.r_get_by_filter', _external=True)
-    hosts_ret = requests.get(url=hosts_url, cookies=request.cookies)
+    hosts_ret = requests.get(url=hosts_url, cookies=request.cookies, verify=False)
     hosts_ret = json.loads(hosts_ret.content)
 
     hosts_mapping_by_node_id = dict()
@@ -1886,7 +1886,7 @@ def r_vnc(uuid):
 def r_detail(uuid):
 
     hosts_url = url_for('api_hosts.r_get_by_filter', _external=True)
-    hosts_ret = requests.get(url=hosts_url, cookies=request.cookies)
+    hosts_ret = requests.get(url=hosts_url, cookies=request.cookies, verify=False)
     hosts_ret = json.loads(hosts_ret.content)
 
     hosts_mapping_by_node_id = dict()
@@ -1927,7 +1927,7 @@ def r_detail(uuid):
         os_templates_profile_mapping_by_id[os_template_profile['id']] = os_template_profile
 
     disks_url = url_for('api_disks.r_get_by_filter', filter='guest_uuid:in:' + guest.uuid, _external=True)
-    disks_ret = requests.get(url=disks_url, cookies=request.cookies)
+    disks_ret = requests.get(url=disks_url, cookies=request.cookies, verify=False)
     disks = json.loads(disks_ret.content)['data']
 
     if not hosts_mapping_by_node_id[guest.node_id]['alive']:

+ 1 - 1
jimvc/api/host.py

@@ -218,7 +218,7 @@ def r_show():
     if args.__len__() > 0:
         hosts_url = hosts_url + '?' + '&'.join(args)
 
-    hosts_ret = requests.get(url=hosts_url, cookies=request.cookies)
+    hosts_ret = requests.get(url=hosts_url, cookies=request.cookies, verify=False)
     hosts_ret = json.loads(hosts_ret.content)
 
     node_id_amd_state_with_guests_count = dict()

+ 1 - 1
jimvc/api/log.py

@@ -84,7 +84,7 @@ def r_show():
     if args.__len__() > 0:
         logs_url = logs_url + '?' + '&'.join(args)
 
-    logs_ret = requests.get(url=logs_url, cookies=request.cookies)
+    logs_ret = requests.get(url=logs_url, cookies=request.cookies, verify=False)
     logs_ret = json.loads(logs_ret.content)
 
     last_page = int(ceil(logs_ret['paging']['total'] / float(page_size)))

+ 1 - 1
jimvc/api/os_template_image.py

@@ -331,7 +331,7 @@ def r_show():
     if args.__len__() > 0:
         os_templates_image_url = os_templates_image_url + '?' + '&'.join(args)
 
-    os_templates_image_ret = requests.get(url=os_templates_image_url, cookies=request.cookies)
+    os_templates_image_ret = requests.get(url=os_templates_image_url, cookies=request.cookies, verify=False)
     os_templates_image_ret = json.loads(os_templates_image_ret.content)
 
     public_count = 0

+ 1 - 1
jimvc/api/snapshot.py

@@ -418,7 +418,7 @@ def r_show():
     if args.__len__() > 0:
         snapshots_url = snapshots_url + '?' + '&'.join(args)
 
-    snapshots_ret = requests.get(url=snapshots_url, cookies=request.cookies)
+    snapshots_ret = requests.get(url=snapshots_url, cookies=request.cookies, verify=False)
     snapshots_ret = json.loads(snapshots_ret.content)
 
     guests_uuid = list()

+ 1 - 1
jimvc/api/ssh_key.py

@@ -393,7 +393,7 @@ def r_show():
     if args.__len__() > 0:
         ssh_keys_url = ssh_keys_url + '?' + '&'.join(args)
 
-    ssh_keys_ret = requests.get(url=ssh_keys_url, cookies=request.cookies)
+    ssh_keys_ret = requests.get(url=ssh_keys_url, cookies=request.cookies, verify=False)
     ssh_keys_ret = json.loads(ssh_keys_ret.content)
 
     last_page = int(ceil(ssh_keys_ret['paging']['total'] / float(page_size)))

+ 3 - 3
jimvc/api/vlan.py

@@ -159,7 +159,7 @@ def r_get(ids):
     ret['data'].insert(0, default_bridge.__dict__)
 
     hosts_url = url_for('api_hosts.r_get_by_filter', _external=True)
-    hosts_ret = requests.get(url=hosts_url, cookies=request.cookies)
+    hosts_ret = requests.get(url=hosts_url, cookies=request.cookies, verify=False)
     hosts_ret = json.loads(hosts_ret.content)
 
     hosts_mapping_by_vlan_bridge = dict()
@@ -211,7 +211,7 @@ def r_get_by_filter():
     ret['data'].insert(0, default_bridge.__dict__)
 
     hosts_url = url_for('api_hosts.r_get_by_filter', _external=True)
-    hosts_ret = requests.get(url=hosts_url, cookies=request.cookies)
+    hosts_ret = requests.get(url=hosts_url, cookies=request.cookies, verify=False)
     hosts_ret = json.loads(hosts_ret.content)
 
     hosts_mapping_by_vlan_bridge = dict()
@@ -263,7 +263,7 @@ def r_content_search():
     ret['data'].insert(0, default_bridge.__dict__)
 
     hosts_url = url_for('api_hosts.r_get_by_filter', _external=True)
-    hosts_ret = requests.get(url=hosts_url, cookies=request.cookies)
+    hosts_ret = requests.get(url=hosts_url, cookies=request.cookies, verify=False)
     hosts_ret = json.loads(hosts_ret.content)
 
     hosts_mapping_by_vlan_bridge = dict()

+ 1 - 1
jimvc/themes/default/templates/disk_create.html

@@ -101,7 +101,7 @@
     $(function() { "use strict";
         $("#size").TouchSpin({
             max: 10240,
-            min: 100,
+            min: 1,
             verticalbuttons: true,
             verticalupclass: 'glyph-icon icon-plus',
             verticaldownclass: 'glyph-icon icon-minus'

+ 2 - 2
jimvc/views/config.py

@@ -23,7 +23,7 @@ blueprint = Blueprint(
 
 def show():
     config_url = url_for('api_config.r_get', _external=True)
-    config_ret = requests.get(url=config_url, cookies=request.cookies)
+    config_ret = requests.get(url=config_url, cookies=request.cookies, verify=False)
     config_ret = json.loads(config_ret.content)
 
     # 检测 JimV 的配置是否已被初始化,只有未被初始化时,才展现初始化配置页面
@@ -35,7 +35,7 @@ def show():
 
 def create():
     config_url = url_for('api_config.r_get', _external=True)
-    config_ret = requests.get(url=config_url, cookies=request.cookies)
+    config_ret = requests.get(url=config_url, cookies=request.cookies, verify=False)
     config_ret = json.loads(config_ret.content)
 
     # 检测 JimV 的配置是否已被初始化,只有未被初始化时,才展现初始化配置页面

+ 1 - 1
jimvc/views/dashboard.py

@@ -23,7 +23,7 @@ blueprint = Blueprint(
 
 def show():
     url = url_for('api_dashboard.r_show', _external=True)
-    ret = requests.get(url=url, cookies=request.cookies)
+    ret = requests.get(url=url, cookies=request.cookies, verify=False)
     ret = json.loads(ret.content)
 
     return render('dashboard.html', hosts_sum=ret['data']['hosts_sum'],

+ 2 - 2
jimvc/views/disk.py

@@ -37,7 +37,7 @@ def show():
 
         url += '?' + '&'.join(args)
 
-    ret = requests.get(url=url, cookies=request.cookies)
+    ret = requests.get(url=url, cookies=request.cookies, verify=False)
     ret = json.loads(ret.content)
 
     return render('disks_show.html', disks=ret['data']['disks'],
@@ -56,7 +56,7 @@ def create():
 
 def detail(uuid):
     disk_detail_url = url_for('api_disk.r_detail', uuid=uuid, _external=True)
-    disk_detail_ret = requests.get(url=disk_detail_url, cookies=request.cookies)
+    disk_detail_ret = requests.get(url=disk_detail_url, cookies=request.cookies, verify=False)
     disk_detail_ret = json.loads(disk_detail_ret.content)
 
     return render('disk_detail.html', uuid=uuid, guest=disk_detail_ret['data']['guest'],

+ 4 - 4
jimvc/views/guest.py

@@ -37,7 +37,7 @@ def show():
 
         url += '?' + '&'.join(args)
 
-    ret = requests.get(url=url, cookies=request.cookies)
+    ret = requests.get(url=url, cookies=request.cookies, verify=False)
     ret = json.loads(ret.content)
 
     return render('guests_show.html', guests=ret['data']['guests'],
@@ -51,7 +51,7 @@ def show():
 
 def vnc(uuid):
     vnc_url = url_for('api_guest.r_vnc', uuid=uuid, _external=True)
-    vnc_ret = requests.get(url=vnc_url, cookies=request.cookies)
+    vnc_ret = requests.get(url=vnc_url, cookies=request.cookies, verify=False)
     vnc_ret = json.loads(vnc_ret.content)
 
     return render('vnc_lite.html', port=vnc_ret['data']['port'], password=vnc_ret['data']['vnc_password'])
@@ -59,7 +59,7 @@ def vnc(uuid):
 
 def detail(uuid):
     guest_detail_url = url_for('api_guest.r_detail', uuid=uuid, _external=True)
-    guest_detail_ret = requests.get(url=guest_detail_url, cookies=request.cookies)
+    guest_detail_ret = requests.get(url=guest_detail_url, cookies=request.cookies, verify=False)
     guest_detail_ret = json.loads(guest_detail_ret.content)
 
     return render('guest_detail.html', uuid=uuid, guest=guest_detail_ret['data']['guest'],
@@ -72,7 +72,7 @@ def detail(uuid):
 
 def create():
         hosts_url = url_for('api_hosts.r_get_by_filter', alive=True, _external=True)
-        hosts_ret = requests.get(url=hosts_url, cookies=request.cookies)
+        hosts_ret = requests.get(url=hosts_url, cookies=request.cookies, verify=False)
         hosts_ret = json.loads(hosts_ret.content)
 
         return render('guest_create.html', hosts_ret=hosts_ret)

+ 2 - 2
jimvc/views/host.py

@@ -37,7 +37,7 @@ def show():
 
         url += '?' + '&'.join(args)
 
-    ret = requests.get(url=url, cookies=request.cookies)
+    ret = requests.get(url=url, cookies=request.cookies, verify=False)
     ret = json.loads(ret.content)
 
     return render('hosts_show.html', hosts=ret['data']['hosts'], resource_path=request.path,
@@ -47,7 +47,7 @@ def show():
 def detail(node_id):
     host_url = url_for('api_hosts.r_get', nodes_id=node_id, _external=True)
 
-    host_ret = requests.get(url=host_url, cookies=request.cookies)
+    host_ret = requests.get(url=host_url, cookies=request.cookies, verify=False)
     host_ret = json.loads(host_ret.content)
 
     return render('host_detail.html', node_id=node_id, host=host_ret['data'])

+ 1 - 1
jimvc/views/log.py

@@ -37,7 +37,7 @@ def show():
 
         url += '?' + '&'.join(args)
 
-    ret = requests.get(url=url, cookies=request.cookies)
+    ret = requests.get(url=url, cookies=request.cookies, verify=False)
     ret = json.loads(ret.content)
 
     return render('logs.html', logs=ret['data']['logs'],

+ 2 - 2
jimvc/views/misc.py

@@ -38,7 +38,7 @@ def recover_password():
 
         url = host_url + '/api/user/_send_reset_password_email/' + login_name
 
-        r = requests.put(url)
+        r = requests.put(url, verify=False)
         j_r = json.loads(r.content)
 
         return render('success.html',
@@ -63,7 +63,7 @@ def reset_password(token):
         url = host_url + '/api/user/_reset_password/' + token
 
         headers = {'content-type': 'application/json'}
-        r = requests.post(url, data=json.dumps(payload), headers=headers)
+        r = requests.post(url, data=json.dumps(payload), headers=headers, verify=False)
         j_r = json.loads(r.content)
 
         if j_r['state']['code'] == '200':

+ 1 - 1
jimvc/views/os_template_image.py

@@ -37,7 +37,7 @@ def show():
 
         url += '?' + '&'.join(args)
 
-    ret = requests.get(url=url, cookies=request.cookies)
+    ret = requests.get(url=url, cookies=request.cookies, verify=False)
     ret = json.loads(ret.content)
 
     return render('os_templates_image_show.html', os_templates_image=ret['data']['os_templates_image'],

+ 1 - 1
jimvc/views/snapshot.py

@@ -37,7 +37,7 @@ def show():
 
         url += '?' + '&'.join(args)
 
-    ret = requests.get(url=url, cookies=request.cookies)
+    ret = requests.get(url=url, cookies=request.cookies, verify=False)
     ret = json.loads(ret.content)
 
     return render('snapshots_show.html', paging=ret['data']['paging'],

+ 1 - 1
jimvc/views/ssh_key.py

@@ -37,7 +37,7 @@ def show():
 
         url += '?' + '&'.join(args)
 
-    ret = requests.get(url=url, cookies=request.cookies)
+    ret = requests.get(url=url, cookies=request.cookies, verify=False)
     ret = json.loads(ret.content)
 
     return render('ssh_keys_show.html', ssh_keys=ret['data']['ssh_keys'], paging=ret['data']['paging'],