- take requester from gpg signature

Changed files:
    PLD_Builder/request.py -> 1.5
    PLD_Builder/request_handler.py -> 1.4
    client/make-request.sh -> 1.2

diff --git a/PLD_Builder/request.py b/PLD_Builder/request.py
index 359d75c5a352f7f60e33cc18acd1ddc1cdfee712..7c6487e3c456d4b2fc8aa71d095f1cc574f22838 100644 (file)
--- a/PLD_Builder/request.py
+++ b/PLD_Builder/request.py
@@ -33,7 +33,7 @@ class Group:
     self.no = int(attr(e, "no"))
     self.priority = 2
     self.time = time.time()
-    self.requester = None
+    self.requester = ""
     for c in e.childNodes:
       if is_blank(c): continue
       if c.nodeType != Element.ELEMENT_NODE:
@@ -48,8 +48,6 @@ class Group:
         self.time = int(text(c))
       else:
         raise "xml: evil group child (%s)" % c.nodeName
-    if self.requester == None:
-      raise "xml: no requester"
 
   def dump(self):
     print "group: %s @%d" % (self.id, self.priority)

diff --git a/PLD_Builder/request_handler.py b/PLD_Builder/request_handler.py
index d6bb985cc5aa3cafa70cc21cf079b1ecf533f300..62f9dc6a29f71ea0376f6b2e6372c04e03adf31b 100644 (file)
--- a/PLD_Builder/request_handler.py
+++ b/PLD_Builder/request_handler.py
@@ -30,9 +30,8 @@ def check_double_id(id):
 
   return 0
 
-def handle_group(r):
+def handle_group(r, user):
   lock("request")
-  user = r.acl_user
   if check_double_id(r.id):
     return
     
@@ -50,6 +49,7 @@ def handle_group(r):
         user.notify_about_failure(msg)
         return
 
+  r.requester = user.get_login()
   r.time = time.time()
   log.notice("queued %s from %s" % (r.id, user.get_login()))
   q = B_Queue(path.queue_file)
@@ -70,9 +70,8 @@ def handle_request(f):
     log.alert("invalid signature, or not in acl %s" % em)
     return
   r = request.parse_request(body)
-  r.acl_user = user
   if r.kind == 'group':
-    handle_group(r)
+    handle_group(r, user)
   else:
     msg = "%s: don't know how to handle requests of this kind '%s'" \
                 % (user.get_login(), r.kind)

diff --git a/client/make-request.sh b/client/make-request.sh
index 776ed68694d72657e20afea0e0ccf53f024556e3..22d7b7286b42e8600528f49defd9a4c614a83d14 100644 (file)
--- a/client/make-request.sh
+++ b/client/make-request.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 # FIXME: set with options
-requester=malekith
 priority=2
 default_key=builder
 builder_email=srpms_builder@roke.freak
@@ -57,7 +56,6 @@ id=$(uuidgen)
 
 gen_req() {
   echo "<group id='$id' no='0'>"
-  echo "  <requester>$requester</requester>"
   echo "  <time>$(date +%s)</time>"
   echo "  <priority>$priority</priority>"
   echo