screwdriver-api 8.0.14 → 8.0.16

package/lib/server.js

@@ -9,12 +9,11 @@ process.on('unhandledRejection', (reason, p) => {
 });
 
 /**
- * If we're throwing errors, let's have them say a little more than just 500
- * @method prettyPrintErrors
+ * @method handlePreResponseLogs
  * @param  {Hapi.Request}    request Hapi Request object
  * @param  {Hapi.h}     h   Hapi Response Toolkit
  */
-function prettyPrintErrors(request, h) {
+function handlePreResponseLogs(request, h) {
     const { response } = request;
     const { release } = request.server.app;
 
@@ -22,31 +21,45 @@ function prettyPrintErrors(request, h) {
         h.state(release.cookieName, release.cookieValue);
     }
 
-    if (!response.isBoom) {
-        return h.continue;
-    }
+    // Pretty print errors
+    if (response.isBoom) {
+        const err = response;
+        const errName = err.output.payload.error;
+        const errMessage = err.message;
+        const { statusCode } = err.output.payload;
+        const stack = err.stack || errMessage;
+
+        // If we're throwing errors, let's have them say a little more than just 500
+        if (statusCode === 500) {
+            request.log(['server', 'error'], stack);
+        }
 
-    const err = response;
-    const errName = err.output.payload.error;
-    const errMessage = err.message;
-    const { statusCode } = err.output.payload;
-    const stack = err.stack || errMessage;
+        const res = {
+            statusCode,
+            error: errName,
+            message: errMessage
+        };
 
-    if (statusCode === 500) {
-        request.log(['server', 'error'], stack);
-    }
+        if (err.data) {
+            res.data = err.data;
+        }
 
-    const res = {
-        statusCode,
-        error: errName,
-        message: errMessage
-    };
+        return h.response(res).code(statusCode);
+    }
 
-    if (err.data) {
-        res.data = err.data;
+    // Log request payload when it takes longer than 5 seconds to respond
+    // This is to prevent logging payloads for every request
+    if (request.info && request.info.received && Date.now() - request.info.received > 5000 && request.payload) {
+        request.log(['payload'], {
+            method: request.method,
+            path: request.path,
+            payload: request.payload,
+            statusCode: request.response && request.response.statusCode,
+            responseTime: Date.now() - request.info.received
+        });
     }
 
-    return h.response(res).code(statusCode);
+    return h.continue;
 }
 
 /**
@@ -164,8 +177,7 @@ module.exports = async config => {
             });
         }
 
-        // Write prettier errors
-        server.ext('onPreResponse', prettyPrintErrors);
+        server.ext('onPreResponse', handlePreResponseLogs);
 
         // Audit log
         if (config.log && config.log.audit.enabled) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-api",
-  "version": "8.0.14",
+  "version": "8.0.16",
   "description": "API server for the Screwdriver.cd service",
   "main": "index.js",
   "scripts": {

package/plugins/builds/create.js

@@ -64,8 +64,13 @@ module.exports = () => ({
                                             const newAdmins = pipeline.admins;
 
                                             delete newAdmins[username];
+                                            const newAdminUserIds = pipeline.adminUserIds.filter(
+                                                adminUserId => adminUserId !== user.id
+                                            );
+
                                             // This is needed to make admins dirty and update db
                                             pipeline.admins = newAdmins;
+                                            pipeline.adminUserIds = newAdminUserIds;
 
                                             return pipeline.update().then(() => {
                                                 throw boom.forbidden(
@@ -83,9 +88,18 @@ module.exports = () => ({
                                             newAdmins[username] = true;
                                             // This is needed to make admins dirty and update db
                                             pipeline.admins = newAdmins;
+                                        }
+
+                                        const newAdminUserIds = pipeline.adminUserIds;
 
-                                            return pipeline.update();
+                                        if (!newAdminUserIds.includes(user.id)) {
+                                            newAdminUserIds.push(user.id);
+
+                                            // This is needed to make admins dirty and update db
+                                            pipeline.adminUserIds = newAdminUserIds;
                                         }
+
+                                        return pipeline.update();
                                     })
                                     // user has good permissions, sync and create a build
                                     .then(() => (job.isPR() ? pipeline.syncPR(job.prNum) : pipeline.sync()))

package/plugins/events/create.js

@@ -152,7 +152,7 @@ module.exports = () => ({
 
             // Update admins
             if (!prNum) {
-                await updateAdmins({ permissions, pipeline, username });
+                await updateAdmins({ permissions, pipeline, user });
             }
 
             // Get scmConfig
@@ -201,7 +201,7 @@ module.exports = () => ({
                     await updateAdmins({
                         permissions,
                         pipeline,
-                        username
+                        user
                     });
                 }
             }

package/plugins/events/index.js

@@ -23,17 +23,22 @@ const eventsPlugin = {
          * @method updateAdmins
          * @param  {Object}    permissions  User permissions
          * @param  {Pipeline}  pipeline     Pipeline object to update
-         * @param  {String}    username     Username of user
+         * @param  {String}    user         User object
          * @return {Promise}                Updates the pipeline admins and throws an error if not an admin
          */
-        server.expose('updateAdmins', ({ permissions, pipeline, username }) => {
+        server.expose('updateAdmins', ({ permissions, pipeline, user }) => {
+            const { username, id: userId } = user;
+
             // Delete user from admin list if bad permissions
             if (!permissions.push) {
                 const newAdmins = pipeline.admins;
 
                 delete newAdmins[username];
+                const newAdminUserIds = pipeline.adminUserIds.filter(adminUserId => adminUserId !== userId);
+
                 // This is needed to make admins dirty and update db
                 pipeline.admins = newAdmins;
+                pipeline.adminUserIds = newAdminUserIds;
 
                 return pipeline.update().then(() => {
                     throw boom.forbidden(`User ${username} does not have push permission for this repo`);
@@ -49,7 +54,16 @@ const eventsPlugin = {
                 newAdmins[name] = true;
             });
 
+            const newAdminUserIds = [userId];
+
+            pipeline.adminUserIds.forEach(adminUserId => {
+                if (adminUserId !== userId) {
+                    newAdminUserIds.push(adminUserId);
+                }
+            });
+
             pipeline.admins = newAdmins;
+            pipeline.adminUserIds = newAdminUserIds;
 
             return pipeline.update();
         });

package/plugins/events/stopBuilds.js

@@ -71,7 +71,7 @@ module.exports = () => ({
                 await updateAdmins({
                     permissions,
                     pipeline,
-                    username
+                    user
                 });
             }
 

package/plugins/pipelines/sync.js

@@ -60,8 +60,11 @@ module.exports = () => ({
                 const newAdmins = pipeline.admins;
 
                 delete newAdmins[username];
+                const newAdminUserIds = pipeline.adminUserIds.filter(adminUserId => adminUserId !== user.id);
+
                 // This is needed to make admins dirty and update db
                 pipeline.admins = newAdmins;
+                pipeline.adminUserIds = newAdminUserIds;
 
                 await pipeline.update();
 
@@ -77,10 +80,16 @@ module.exports = () => ({
             // user has good permissions, add the user as an admin
             if (!pipeline.admins[username] && hasPushPermissions) {
                 const newAdmins = pipeline.admins;
+                const newAdminUserIds = pipeline.adminUserIds;
 
                 newAdmins[username] = true;
+                if (!newAdminUserIds.includes(user.id)) {
+                    newAdminUserIds.push(user.id);
+                }
+
                 // This is needed to make admins dirty and update db
                 pipeline.admins = newAdmins;
+                pipeline.adminUserIds = newAdminUserIds;
 
                 await pipeline.update();
             }

package/plugins/webhooks/helper.js

@@ -95,8 +95,11 @@ async function updateAdmins(userFactory, username, scmContext, pipeline, pipelin
             const newAdmins = pipeline.admins;
 
             delete newAdmins[username];
+            const newAdminUserIds = pipeline.adminUserIds.filter(adminUserId => adminUserId !== user.id);
+
             // This is needed to make admins dirty and update db
             pipeline.admins = newAdmins;
+            pipeline.adminUserIds = newAdminUserIds;
 
             return pipeline.update();
         }
@@ -110,7 +113,16 @@ async function updateAdmins(userFactory, username, scmContext, pipeline, pipelin
             newAdmins[name] = true;
         });
 
+        const newAdminUserIds = [user.id];
+
+        pipeline.adminUserIds.forEach(adminUserId => {
+            if (adminUserId !== user.id) {
+                newAdminUserIds.push(adminUserId);
+            }
+        });
+
         pipeline.admins = newAdmins;
+        pipeline.adminUserIds = newAdminUserIds;
 
         return pipeline.update();
     } catch (err) {