Zuul versions of sudo grep checks
Old legacy jobs will continue to want tocheck that the test user isn't using sudo if sudo has been disabled. Add a zuul version of the checker script and update the sudo rules to allow the zuul user to run it Change-Id: I3f941fb57e4574dcca04442b97a70e6acbc395e9 Co-Authored-By: Clark Boylan <clark.boylan@gmail.com>
This commit is contained in:
parent
7118922e87
commit
1e598d9c5f
@ -24,3 +24,25 @@
|
||||
with_items:
|
||||
- id_rsa
|
||||
- id_rsa.pub
|
||||
|
||||
- name: Add sudoers role for zuul-sudo-grep.sh
|
||||
copy:
|
||||
dest: /etc/sudoers.d/zuul-sudo-grep
|
||||
content: "zuul ALL = NOPASSWD:/usr/local/jenkins/slave_scripts/zuul-sudo-grep.sh"
|
||||
mode: 0440
|
||||
validate: "/usr/sbin/visudo -cf %s"
|
||||
become: true
|
||||
|
||||
- name: Copy zuul-sudo-grep.sh to
|
||||
copy:
|
||||
dest: /usr/local/jenkins/slave_scripts/zuul-sudo-grep.sh
|
||||
src: zuul-sudo-grep.sh
|
||||
mode: 0755
|
||||
become: true
|
||||
|
||||
- name: Modify run-tox.sh to use zuul-sudo-grep.sh
|
||||
lineinfile:
|
||||
path: /usr/local/jenkins/slave_scripts/run-tox.sh
|
||||
regexp: '^ sudo .script_path/jenkins-sudo-grep.sh post'
|
||||
line: ' sudo $script_path/zuul-sudo-grep.sh post'
|
||||
become: true
|
||||
|
61
playbooks/legacy/zuul-sudo-grep.sh
Executable file
61
playbooks/legacy/zuul-sudo-grep.sh
Executable file
@ -0,0 +1,61 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Copyright 2012 Hewlett-Packard Development Company, L.P.
|
||||
# Copyright 2013 OpenStack Foundation
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
# Find out if zuul has attempted to run any sudo commands by checking
|
||||
# the auth.log or secure log or messages files before and after a test run.
|
||||
|
||||
PATTERN="sudo.*zuul.*:.*\(incorrect password attempts\|command not allowed\)"
|
||||
if [ -f /var/log/auth.log ]; then
|
||||
OLDLOGFILE=/var/log/auth.log.1
|
||||
LOGFILE=/var/log/auth.log
|
||||
elif [ -f /var/log/secure ]; then
|
||||
OLDLOGFILE=$( ls /var/log/secure-* | sort | tail -n1 )
|
||||
LOGFILE=/var/log/secure
|
||||
elif [ -f /var/log/messages ]; then
|
||||
OLDLOGFILE=$( ls /var/log/messages-* | sort | tail -n1 )
|
||||
LOGFILE=/var/log/messages
|
||||
else
|
||||
echo "*** Could not find auth.log/secure/messages log for sudo tracing"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
case "$1" in
|
||||
pre)
|
||||
rm -fr /tmp/zuul-sudo-log
|
||||
mkdir /tmp/zuul-sudo-log
|
||||
if [ -f "$OLDLOGFILE" ]; then
|
||||
stat -c %Y $OLDLOGFILE > /tmp/zuul-sudo-log/mtime-pre
|
||||
else
|
||||
echo "0" > /tmp/zuul-sudo-log/mtime-pre
|
||||
fi
|
||||
grep -h "$PATTERN" $LOGFILE > /tmp/zuul-sudo-log/pre
|
||||
exit 0
|
||||
;;
|
||||
post)
|
||||
if [ -f "$OLDLOGFILE" ]; then
|
||||
stat -c %Y $OLDLOGFILE > /tmp/zuul-sudo-log/mtime-post
|
||||
else
|
||||
echo "0" > /tmp/zuul-sudo-log/mtime-post
|
||||
fi
|
||||
if ! diff /tmp/zuul-sudo-log/mtime-pre /tmp/zuul-sudo-log/mtime-post > /dev/null; then
|
||||
echo "diff"
|
||||
grep -h "$PATTERN" $OLDLOGFILE > /tmp/zuul-sudo-log/post
|
||||
fi
|
||||
grep -h "$PATTERN" $LOGFILE >> /tmp/zuul-sudo-log/post
|
||||
diff /tmp/zuul-sudo-log/pre /tmp/zuul-sudo-log/post
|
||||
;;
|
||||
esac
|
Loading…
x
Reference in New Issue
Block a user