[Update] 修改一些bug, 增加执行task的按钮

apps/assets/models/user.py

@@ -81,7 +81,11 @@ class AssetUser(models.Model):
 
     @property
     def public_key(self):
-        return signer.unsign(self._public_key)
+        key = signer.unsign(self._public_key)
+        if key:
+            return key
+        else:
+            return None
 
     @property
     def public_key_obj(self):

apps/assets/tasks.py

@@ -25,7 +25,7 @@ disk_pattern = re.compile(r'^hd|sd|xvd')
 @shared_task
 def set_assets_hardware_info(result, **kwargs):
     """
-    Unsing ops task run result, to update asset info
+    Using ops task run result, to update asset info
 
     @shared_task must be exit, because we using it as a task callback, is must
     be a celery task also
@@ -309,6 +309,10 @@ def test_system_user_connectability_period():
 ####  Push system user tasks ####
 
 def get_push_system_user_tasks(system_user):
+    # Set root as system user is dangerous
+    if system_user.username == "root":
+        return []
+
     tasks = [
         {
             'name': 'Add user {}'.format(system_user.username),
@@ -316,7 +320,7 @@ def get_push_system_user_tasks(system_user):
                 'module': 'user',
                 'args': 'name={} shell={} state=present password={}'.format(
                     system_user.username, system_user.shell,
-                    encrypt_password(system_user.password),
+                    encrypt_password(system_user.password, salt="K3mIlKK"),
                 ),
             }
         },

apps/assets/templates/assets/admin_user_assets.html

@@ -21,11 +21,11 @@
                                 <a href="{% url 'assets:admin-user-assets' pk=admin_user.pk %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Assets list' %} </a>
                             </li>
                             <li class="pull-right">
-                                <a class="btn btn-outline btn-default" href="{% url 'assets:admin-user-update' pk=admin_user.id %}"><i class="fa fa-edit"></i>Update</a>
+                                <a class="btn btn-outline btn-default" href="{% url 'assets:admin-user-update' pk=admin_user.id %}"><i class="fa fa-edit"></i>{% trans 'Update' %}</a>
                             </li>
                             <li class="pull-right">
                                 <a class="btn btn-outline btn-danger btn-delete-admin-user">
-                                    <i class="fa fa-edit"></i>Delete
+                                    <i class="fa fa-trash-o"></i>{% trans 'Delete' %}
                                 </a>
                             </li>
                         </ul>

apps/assets/templates/assets/admin_user_detail.html

@@ -21,11 +21,11 @@
                                 <a href="{% url 'assets:admin-user-assets' pk=admin_user.pk %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Assets list' %} </a>
                             </li>
                             <li class="pull-right">
-                                <a class="btn btn-outline btn-default" href="{% url 'assets:admin-user-update' pk=admin_user.id %}"><i class="fa fa-edit"></i>Update</a>
+                                <a class="btn btn-outline btn-default" href="{% url 'assets:admin-user-update' pk=admin_user.id %}"><i class="fa fa-edit"></i>{% trans 'Update' %}</a>
                             </li>
                             <li class="pull-right">
                                 <a class="btn btn-outline btn-danger btn-delete-admin-user">
-                                    <i class="fa fa-edit"></i>Delete
+                                    <i class="fa fa-trash-o"></i>{% trans 'Delete' %}
                                 </a>
                             </li>
                         </ul>

apps/assets/templates/assets/asset_detail.html

@@ -21,11 +21,11 @@
                             </li>
                             {% if user.is_superuser %}
                             <li class="pull-right">
-                                <a class="btn btn-outline btn-default" href="{% url 'assets:asset-update' pk=asset.id %}"><i class="fa fa-edit"></i>Update</a>
+                                <a class="btn btn-outline btn-default" href="{% url 'assets:asset-update' pk=asset.id %}"><i class="fa fa-edit"></i>{% trans 'Update' %}</a>
                             </li>
                             <li class="pull-right">
                                 <a class="btn btn-outline btn-danger btn-delete-asset">
-                                    <i class="fa fa-edit"></i>Delete
+                                    <i class="fa fa-trash-o"></i>{% trans 'Delete' %}
                                 </a>
                             </li>
                             {% endif %}

apps/assets/templates/assets/asset_group_detail.html

@@ -15,7 +15,7 @@
                         <ul class="nav nav-tabs">
                             <li class="active"><a href="" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Group assets' %} </a></li>
                             <li class="pull-right">
-                                <a class="btn btn-outline btn-default" href="{% url 'assets:asset-group-update' pk=asset_group.id %}"><i class="fa fa-edit"></i>Update</a>
+                                <a class="btn btn-outline btn-default" href="{% url 'assets:asset-group-update' pk=asset_group.id %}"><i class="fa fa-edit"></i>{% trans 'Update' %}</a>
                             </li>
                         </ul>
                     </div>

apps/assets/templates/assets/cluster_detail.html

@@ -22,11 +22,11 @@
                                 </a>
                             </li>
                             <li class="pull-right">
-                                <a class="btn btn-outline btn-default" href="{% url 'assets:cluster-update' pk=cluster.id %}"><i class="fa fa-edit"></i>Update</a>
+                                <a class="btn btn-outline btn-default" href="{% url 'assets:cluster-update' pk=cluster.id %}"><i class="fa fa-edit"></i>{% trans 'Update' %}</a>
                             </li>
                             <li class="pull-right">
                                 <a class="btn btn-outline btn-danger btn-delete-cluster">
-                                    <i class="fa fa-edit"></i>Delete
+                                    <i class="fa fa-trash-o"></i>{% trans 'Delete' %}
                                 </a>
                             </li>
                         </ul>

apps/assets/templates/assets/system_user_asset.html

@@ -22,7 +22,7 @@
                                 </a>
                             </li>
                             <li class="pull-right">
-                                <a class="btn btn-outline btn-default" href="{% url 'assets:system-user-update' pk=system_user.id %}"><i class="fa fa-edit"></i>Update</a>
+                                <a class="btn btn-outline btn-default" href="{% url 'assets:system-user-update' pk=system_user.id %}"><i class="fa fa-edit"></i>{% trans 'Update' %}</a>
                             </li>
                         </ul>
                     </div>

apps/assets/templates/assets/system_user_detail.html

@@ -23,7 +23,7 @@
                                 </a>
                             </li>
                             <li class="pull-right">
-                                <a class="btn btn-outline btn-default" href="{% url 'assets:system-user-update' pk=system_user.id %}"><i class="fa fa-edit"></i>Update</a>
+                                <a class="btn btn-outline btn-default" href="{% url 'assets:system-user-update' pk=system_user.id %}"><i class="fa fa-edit"></i>{% trans 'Update' %}</a>
                             </li>
                         </ul>
                     </div>

apps/common/utils.py

@@ -287,10 +287,10 @@ def make_signature(access_key_secret, date=None):
     return content_md5(data)
 
 
-def encrypt_password(password):
+def encrypt_password(password, salt=None):
     from passlib.hash import sha512_crypt
     if password:
-        return sha512_crypt.using(rounds=5000).hash(password)
+        return sha512_crypt.using(rounds=5000).hash(password, salt=salt)
     return None
 
 

apps/ops/api.py

@@ -2,11 +2,13 @@
 
 
 from django.shortcuts import get_object_or_404
-from rest_framework import viewsets
+from rest_framework import viewsets, generics
+from rest_framework.views import Response
 
 from .hands import IsSuperUser
 from .models import Task, AdHoc, AdHocRunHistory
 from .serializers import TaskSerializer, AdHocSerializer, AdHocRunHistorySerializer
+from .tasks import run_ansible_task
 
 
 class TaskViewSet(viewsets.ModelViewSet):
@@ -15,6 +17,17 @@ class TaskViewSet(viewsets.ModelViewSet):
     permission_classes = (IsSuperUser,)
 
 
+class TaskRun(generics.RetrieveAPIView):
+    queryset = Task.objects.all()
+    serializer_class = TaskViewSet
+    permission_classes = (IsSuperUser,)
+
+    def retrieve(self, request, *args, **kwargs):
+        task = self.get_object()
+        run_ansible_task.delay(str(task.id))
+        return Response({"msg": "start"})
+
+
 class AdHocViewSet(viewsets.ModelViewSet):
     queryset = AdHoc.objects.all()
     serializer_class = AdHocSerializer

apps/ops/templates/ops/task_detail.html

@@ -89,7 +89,7 @@
                                             <td>
                                                 <b>
                                                 {% for task in object.latest_adhoc.tasks %}
-                                                {{ forloop.counter }}. {{ task.name }} : {{ task.action.module }} <br/>
+                                                {{ forloop.counter }}. {{ task.name }} ::: {{ task.action.module }} <br/>
                                                 {% endfor %}
                                                 </b>
                                             </td>

apps/ops/templates/ops/task_list.html

@@ -67,6 +67,7 @@
                 {% endif %}
             </td>
             <td class="text-center">
+                <a data-uid="{{ object.id }}" class="btn btn-xs btn-primary btn-run">{% trans "Run" %}</a>
                 <a data-uid="{{ object.id }}" class="btn btn-xs btn-danger btn-del">{% trans "Delete" %}</a>
             </td>
         </tr>
@@ -98,10 +99,32 @@ $(document).ready(function() {
 
 }).on('click', '.btn-del', function () {
     var $this = $(this);
-    var name = $(this).closest("tr").find(":nth-child(2)").children('a').html();
+    var name = $this.closest("tr").find(":nth-child(2)").children('a').html();
     var uid = $this.data('uid');
     var the_url = '{% url "api-ops:task-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid);
     objectDelete($this, name, the_url);
+}).on('click', '.btn-run', function () {
+    var $this = $(this);
+    var name = $this.closest("tr").find(":nth-child(2)").children('a').html();
+    var uid = $this.data('uid');
+    var the_url = '{% url "api-ops:task-run" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid);
+    var error = function (data) {
+        alert(data)
+    };
+    var success = function () {
+        setTimeout(function () {
+            console.log("ok")
+        }, 1000);
+        window.location = "{% url 'ops:task-detail' pk=DEFAULT_PK %}".replace('{{ DEFAULT_PK }}', uid);
+    };
+    APIUpdateAttr({
+        url: the_url,
+        error: error,
+        method: 'GET',
+        success: success,
+        success_message: "{% trans 'Task start: ' %}" + " " + name
+    });
+
 })
 </script>
 {% endblock %}

apps/ops/urls/api_urls.py

 # ~*~ coding: utf-8 ~*~
 from __future__ import unicode_literals
 
+from django.conf.urls import url
 from rest_framework.routers import DefaultRouter
 from .. import api
 
@@ -12,6 +13,8 @@ router.register(r'v1/tasks', api.TaskViewSet, 'task')
 router.register(r'v1/adhoc', api.AdHocViewSet, 'adhoc')
 router.register(r'v1/history', api.AdHocRunHistorySet, 'history')
 
-urlpatterns = []
+urlpatterns = [
+    url(r'^v1/tasks/(?P<pk>[0-9a-zA-Z\-]{36})/run/$', api.TaskRun.as_view(), name='task-run'),
+]
 
 urlpatterns += router.urls

apps/perms/templates/perms/asset_permission_detail.html

@@ -27,11 +27,11 @@
                                 <i class="fa fa-bar-chart-o"></i> {% trans 'Assets and asset groups' %}</a>
                             </li>
                             <li class="pull-right">
-                                <a class="btn btn-outline btn-default" href="{% url 'perms:asset-permission-update' pk=asset_permission.id %}"><i class="fa fa-edit"></i>Update</a>
+                                <a class="btn btn-outline btn-default" href="{% url 'perms:asset-permission-update' pk=asset_permission.id %}"><i class="fa fa-edit"></i>{% trans 'Update' %}</a>
                             </li>
                             <li class="pull-right">
                                 <a class="btn btn-outline btn-danger btn-delete-perm">
-                                    <i class="fa fa-edit"></i>Delete
+                                    <i class="fa fa-trash-o"></i>{% trans 'Delete' %}
                                 </a>
                             </li>
                         </ul>

apps/terminal/templates/terminal/terminal_detail.html

@@ -13,7 +13,7 @@
                                 <a href="" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Terminal detail' %} </a>
                             </li>
                             <li class="pull-right">
-                                <a class="btn btn-outline btn-default" href="{% url 'terminal:terminal-update' pk=terminal.id %}"><i class="fa fa-edit"></i>Update</a>
+                                <a class="btn btn-outline btn-default" href="{% url 'terminal:terminal-update' pk=terminal.id %}"><i class="fa fa-edit"></i>{% trans 'Update' %}</a>
                             </li>
                         </ul>
                     </div>

apps/users/templates/users/user_detail.html

@@ -22,11 +22,11 @@
                                 <a href="{% url 'users:user-granted-asset' pk=user_object.id %}" class="text-center"><i class="fa fa-cubes"></i> {% trans 'Asset granted' %}</a>
                             </li>
                             <li class="pull-right">
-                                <a class="btn btn-outline btn-default" href="{% url 'users:user-update' pk=user_object.id %}"><i class="fa fa-edit"></i>Update</a>
+                                <a class="btn btn-outline btn-default" href="{% url 'users:user-update' pk=user_object.id %}"><i class="fa fa-edit"></i>{% trans 'Update' %}</a>
                             </li>
                             <li class="pull-right">
                                 <a class="btn btn-outline btn-danger btn-delete-user">
-                                    <i class="fa fa-edit"></i>Delete
+                                    <i class="fa fa-trash-o"></i>{% trans 'Delete' %}
                                 </a>
                             </li>
                         </ul>

apps/users/templates/users/user_group_detail.html

@@ -25,11 +25,11 @@
 {#                                <a href="{% url 'users:user-group-granted-asset' pk=user_group.id %}" class="text-center"><i class="fa fa-cubes"></i> {% trans 'Asset granted' %}</a>#}
 {#                            </li>#}
                             <li class="pull-right">
-                                <a class="btn btn-outline btn-default" href="{% url 'users:user-group-update' pk=user_group.id %}"><i class="fa fa-edit"></i>Update</a>
+                                <a class="btn btn-outline btn-default" href="{% url 'users:user-group-update' pk=user_group.id %}"><i class="fa fa-edit"></i>{% trans 'Update' %}</a>
                             </li>
                             <li class="pull-right">
                                 <a class="btn btn-outline btn-danger btn-delete-user-group">
-                                    <i class="fa fa-edit"></i>Delete
+                                    <i class="fa fa-trash-o"></i>{% trans 'Delete' %}
                                 </a>
                             </li>
                         </ul>