Uploaded image for project: 'Jenkins'
  1. Jenkins
  2. JENKINS-31596

The MasterKillSwitchConfiguration should always be relevant if security is enabled

XMLWordPrintable

    • Icon: New Feature New Feature
    • Resolution: Fixed
    • Icon: Minor Minor
    • core

      Follow-up to JENKINS-31591, there are some plugins that provide additional conditions under which the MasterKillSwitchConfiguration could become relevant. The primary case is the swarm plugin, but there are other cases.

      It would make sense to provide an extension point such that plugins can contribute additional cases where the configuration is relevant.

      The MasterKillSwitchConfiguration should always be relevant when security is enabled and the user has RUN_SCRIPTS

          [JENKINS-31596] The MasterKillSwitchConfiguration should always be relevant if security is enabled

          SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Stephen Connolly
          Path:
          core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java
          http://jenkins-ci.org/commit/jenkins/39ef6157fa41b5e9df92fec03f0fc65c95e07c57
          Log:
          Revert "JENKINS-31596 The kill switch is never relevant if you do not have RUN_SCRIPTS"

          This reverts commit c55d56291485f05d8be29e4854bf7a4605fe9bae.

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: Stephen Connolly Path: core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java http://jenkins-ci.org/commit/jenkins/39ef6157fa41b5e9df92fec03f0fc65c95e07c57 Log: Revert " JENKINS-31596 The kill switch is never relevant if you do not have RUN_SCRIPTS" This reverts commit c55d56291485f05d8be29e4854bf7a4605fe9bae.

          SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Stephen Connolly
          Path:
          core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java
          http://jenkins-ci.org/commit/jenkins/3c94a7cb60c39286945d5a9c1ccee505c01d16b8
          Log:
          JENKINS-31596 No excuses, have security => relevant

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: Stephen Connolly Path: core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java http://jenkins-ci.org/commit/jenkins/3c94a7cb60c39286945d5a9c1ccee505c01d16b8 Log: JENKINS-31596 No excuses, have security => relevant

          SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Stephen Connolly
          Path:
          core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java
          http://jenkins-ci.org/commit/jenkins/d1a8d8ebbde0e86765094b570dc84bc0d6bdfb55
          Log:
          Merge pull request #1929 from stephenc/jenkins-31596-followup

          JENKINS-31596 The kill switch is never relevant if you do not have RUN_SCRIPTS

          Compare: https://github.com/jenkinsci/jenkins/compare/d2e0f6fa6ae3...d1a8d8ebbde0

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: Stephen Connolly Path: core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java http://jenkins-ci.org/commit/jenkins/d1a8d8ebbde0e86765094b570dc84bc0d6bdfb55 Log: Merge pull request #1929 from stephenc/jenkins-31596-followup JENKINS-31596 The kill switch is never relevant if you do not have RUN_SCRIPTS Compare: https://github.com/jenkinsci/jenkins/compare/d2e0f6fa6ae3...d1a8d8ebbde0

          dogfood added a comment -

          Integrated in jenkins_main_trunk #4373
          JENKINS-31596 The kill switch is never relevant if you do not have RUN_SCRIPTS (Revision c55d56291485f05d8be29e4854bf7a4605fe9bae)
          Revert "JENKINS-31596 The kill switch is never relevant if you do not have RUN_SCRIPTS" (Revision 39ef6157fa41b5e9df92fec03f0fc65c95e07c57)
          Revert "Merge pull request #1917 from stephenc/jenkins-31596" (Revision 208320f8e121dd151286f457d2f0fa3099b8047f)
          JENKINS-31596 No excuses, have security => relevant (Revision 3c94a7cb60c39286945d5a9c1ccee505c01d16b8)

          Result = SUCCESS
          stephen connolly : c55d56291485f05d8be29e4854bf7a4605fe9bae
          Files :

          • core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java

          stephen connolly : 39ef6157fa41b5e9df92fec03f0fc65c95e07c57
          Files :

          • core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java

          stephen connolly : 3c94a7cb60c39286945d5a9c1ccee505c01d16b8
          Files :

          • core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java

          dogfood added a comment - Integrated in jenkins_main_trunk #4373 JENKINS-31596 The kill switch is never relevant if you do not have RUN_SCRIPTS (Revision c55d56291485f05d8be29e4854bf7a4605fe9bae) Revert " JENKINS-31596 The kill switch is never relevant if you do not have RUN_SCRIPTS" (Revision 39ef6157fa41b5e9df92fec03f0fc65c95e07c57) Revert "Merge pull request #1917 from stephenc/jenkins-31596" (Revision 208320f8e121dd151286f457d2f0fa3099b8047f) JENKINS-31596 No excuses, have security => relevant (Revision 3c94a7cb60c39286945d5a9c1ccee505c01d16b8) Result = SUCCESS stephen connolly : c55d56291485f05d8be29e4854bf7a4605fe9bae Files : core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java stephen connolly : 39ef6157fa41b5e9df92fec03f0fc65c95e07c57 Files : core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java stephen connolly : 3c94a7cb60c39286945d5a9c1ccee505c01d16b8 Files : core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java

          Stephen Connolly added a comment - - edited

          After discussion we decided to just make the master kill switch always relevant if you have security enabled, so this change is no longer required so this issue has been changed to match that requirement.

          Stephen Connolly added a comment - - edited After discussion we decided to just make the master kill switch always relevant if you have security enabled, so this change is no longer required so this issue has been changed to match that requirement.

          SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Stephen Connolly
          Path:
          core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java
          http://jenkins-ci.org/commit/jenkins/95c082114ef98099d049a8ed5e902ee750adb01b
          Log:
          [FIXED JENKINS-31596] Provide an extension point for MasterKillSwitchConfiguration relevance

          (cherry picked from commit fc582bae19c562a59400889e95eab754914ee094)

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: Stephen Connolly Path: core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java http://jenkins-ci.org/commit/jenkins/95c082114ef98099d049a8ed5e902ee750adb01b Log: [FIXED JENKINS-31596] Provide an extension point for MasterKillSwitchConfiguration relevance (cherry picked from commit fc582bae19c562a59400889e95eab754914ee094)

          SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Stephen Connolly
          Path:
          core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java
          http://jenkins-ci.org/commit/jenkins/a11578bf99cda925f69915e468d05014e2fcfade
          Log:
          JENKINS-31596 The kill switch is never relevant if you do not have RUN_SCRIPTS

          (cherry picked from commit c55d56291485f05d8be29e4854bf7a4605fe9bae)

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: Stephen Connolly Path: core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java http://jenkins-ci.org/commit/jenkins/a11578bf99cda925f69915e468d05014e2fcfade Log: JENKINS-31596 The kill switch is never relevant if you do not have RUN_SCRIPTS (cherry picked from commit c55d56291485f05d8be29e4854bf7a4605fe9bae)

          SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Stephen Connolly
          Path:
          core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java
          http://jenkins-ci.org/commit/jenkins/260c8325b4e9337bc5b76975b4357fb00b8fce33
          Log:
          Revert "JENKINS-31596 The kill switch is never relevant if you do not have RUN_SCRIPTS"

          This reverts commit c55d56291485f05d8be29e4854bf7a4605fe9bae.

          (cherry picked from commit 39ef6157fa41b5e9df92fec03f0fc65c95e07c57)

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: Stephen Connolly Path: core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java http://jenkins-ci.org/commit/jenkins/260c8325b4e9337bc5b76975b4357fb00b8fce33 Log: Revert " JENKINS-31596 The kill switch is never relevant if you do not have RUN_SCRIPTS" This reverts commit c55d56291485f05d8be29e4854bf7a4605fe9bae. (cherry picked from commit 39ef6157fa41b5e9df92fec03f0fc65c95e07c57)

          SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Stephen Connolly
          Path:
          core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java
          http://jenkins-ci.org/commit/jenkins/05512a979c758f360433e117d5bc9c7d6c431c45
          Log:
          JENKINS-31596 No excuses, have security => relevant

          (cherry picked from commit 3c94a7cb60c39286945d5a9c1ccee505c01d16b8)

          Compare: https://github.com/jenkinsci/jenkins/compare/d9b69039920c...05512a979c75

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: Stephen Connolly Path: core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java http://jenkins-ci.org/commit/jenkins/05512a979c758f360433e117d5bc9c7d6c431c45 Log: JENKINS-31596 No excuses, have security => relevant (cherry picked from commit 3c94a7cb60c39286945d5a9c1ccee505c01d16b8) Compare: https://github.com/jenkinsci/jenkins/compare/d9b69039920c...05512a979c75

          dogfood added a comment -

          Integrated in jenkins_2.0 #5
          [FIXED JENKINS-31596] Provide an extension point for (Revision fc582bae19c562a59400889e95eab754914ee094)
          JENKINS-31596 The kill switch is never relevant if you do not have (Revision c55d56291485f05d8be29e4854bf7a4605fe9bae)
          Revert "JENKINS-31596 The kill switch is never relevant if you do not (Revision 39ef6157fa41b5e9df92fec03f0fc65c95e07c57)
          Revert "Merge pull request #1917 from stephenc/jenkins-31596" (Revision 208320f8e121dd151286f457d2f0fa3099b8047f)
          JENKINS-31596 No excuses, have security => relevant (Revision 3c94a7cb60c39286945d5a9c1ccee505c01d16b8)

          Result = SUCCESS
          stephen connolly : fc582bae19c562a59400889e95eab754914ee094
          Files :

          • core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java

          stephen connolly : c55d56291485f05d8be29e4854bf7a4605fe9bae
          Files :

          • core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java

          stephen connolly : 39ef6157fa41b5e9df92fec03f0fc65c95e07c57
          Files :

          • core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java

          stephen connolly : 3c94a7cb60c39286945d5a9c1ccee505c01d16b8
          Files :

          • core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java

          dogfood added a comment - Integrated in jenkins_2.0 #5 [FIXED JENKINS-31596] Provide an extension point for (Revision fc582bae19c562a59400889e95eab754914ee094) JENKINS-31596 The kill switch is never relevant if you do not have (Revision c55d56291485f05d8be29e4854bf7a4605fe9bae) Revert " JENKINS-31596 The kill switch is never relevant if you do not (Revision 39ef6157fa41b5e9df92fec03f0fc65c95e07c57) Revert "Merge pull request #1917 from stephenc/jenkins-31596" (Revision 208320f8e121dd151286f457d2f0fa3099b8047f) JENKINS-31596 No excuses, have security => relevant (Revision 3c94a7cb60c39286945d5a9c1ccee505c01d16b8) Result = SUCCESS stephen connolly : fc582bae19c562a59400889e95eab754914ee094 Files : core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java stephen connolly : c55d56291485f05d8be29e4854bf7a4605fe9bae Files : core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java stephen connolly : 39ef6157fa41b5e9df92fec03f0fc65c95e07c57 Files : core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java stephen connolly : 3c94a7cb60c39286945d5a9c1ccee505c01d16b8 Files : core/src/main/java/jenkins/security/s2m/MasterKillSwitchConfiguration.java

            stephenconnolly Stephen Connolly
            stephenconnolly Stephen Connolly
            Votes:
            0 Vote for this issue
            Watchers:
            4 Start watching this issue

              Created:
              Updated:
              Resolved: