screwdriver-api 8.0.15 → 8.0.17

package/config/custom-environment-variables.yaml

@@ -484,6 +484,9 @@ log:
     scope:
       __name: LOG_AUDIT_SCOPE
       __format: json
+  payload:
+    # set true to enable payload logs for all API calls over 5s
+    enabled: LOG_PAYLOAD_ENABLED
 
 build:
   environment:

package/config/default.yaml

@@ -385,6 +385,9 @@ log:
     enabled: false
     # add target scope tokens(pipeline, build, temporal, admin, guest, user)
     scope: []
+  payload:
+    # set true to enable payload logs for all API calls over 5s
+    enabled: true
 
 # default cluster environment variables to inject into builds
 build:

package/lib/server.js

@@ -15,7 +15,7 @@ process.on('unhandledRejection', (reason, p) => {
  */
 function handlePreResponseLogs(request, h) {
     const { response } = request;
-    const { release } = request.server.app;
+    const { release, log } = request.server.app;
 
     if (release && release.cookieName && request.state && !request.state[release.cookieName]) {
         h.state(release.cookieName, release.cookieValue);
@@ -49,7 +49,15 @@ function handlePreResponseLogs(request, h) {
 
     // 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) {
+    if (
+        log &&
+        log.payload &&
+        log.payload.enabled &&
+        request.info &&
+        request.info.received &&
+        Date.now() - request.info.received > 5000 &&
+        request.payload
+    ) {
         request.log(['payload'], {
             method: request.method,
             path: request.path,
@@ -161,7 +169,8 @@ module.exports = async config => {
             ecosystem: config.ecosystem,
             release: config.release,
             queueWebhook: config.queueWebhook,
-            unzipArtifacts: config.unzipArtifactsEnabled
+            unzipArtifacts: config.unzipArtifactsEnabled,
+            log: config.log
         };
 
         const bellConfigs = await config.auth.scm.getBellConfiguration();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-api",
-  "version": "8.0.15",
+  "version": "8.0.17",
   "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) {