From a24688510b64736ce5cf451ed19971330a2527a9 Mon Sep 17 00:00:00 2001 From: bdzim Date: Thu, 9 Oct 2014 09:44:13 -0500 Subject: [PATCH 1/3] upgrade bash to fix shellshock --- upgrade/gather_resources.sh | 2 +- upgrade/upgrade.sh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/upgrade/gather_resources.sh b/upgrade/gather_resources.sh index f3f4ac7..8ed9f5b 100755 --- a/upgrade/gather_resources.sh +++ b/upgrade/gather_resources.sh @@ -21,4 +21,4 @@ pip install --download=. Django==1.5.5 pip install --download=. pytz==2013.8 pip install --download=. pycrypto==2.4.1 - +wget http://archive.ubuntu.com/ubuntu/pool/main/b/bash/bash_4.1-2ubuntu3.2_amd64.deb diff --git a/upgrade/upgrade.sh b/upgrade/upgrade.sh index cfd3df9..558d675 100755 --- a/upgrade/upgrade.sh +++ b/upgrade/upgrade.sh @@ -85,6 +85,9 @@ echo "Running additional update scripts..." sudo bash -c "PYTHONPATH=/opt/openmanage python /opt/openmanage/upgrade/apply_scripts.py" apt-get -y remove python-crypto + +find /opt/openmanage/upgrade/resources/ -name '*.deb' | xargs dpkg -i + pip install -r /opt/openmanage/upgrade/requirements.txt # Restart services From e2f20e09afb631b57a3a650180472e78bfc4f53f Mon Sep 17 00:00:00 2001 From: shu zOMG chen Date: Wed, 24 Sep 2014 17:24:43 +0000 Subject: [PATCH 2/3] Remove disabled users check in admin_token_auth --- netkes/account_mgr/__init__.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/netkes/account_mgr/__init__.py b/netkes/account_mgr/__init__.py index 2807ba7..ffa1875 100644 --- a/netkes/account_mgr/__init__.py +++ b/netkes/account_mgr/__init__.py @@ -58,8 +58,6 @@ def admin_token_auth(config, user, username, password): log = logging.getLogger("admin_token_auth") api = get_api(config) user_token = dict(avatar_id=user['avatar_id'], token=password) - if not user['enabled']: - return False with get_cursor(config) as cur: cur.execute(SELECT_ADMIN_TOKEN, user_token) From 51ccd8dc5d1e7a8eb04321d9d5f7b3e0754a324f Mon Sep 17 00:00:00 2001 From: bdzim Date: Thu, 9 Oct 2014 12:56:10 -0500 Subject: [PATCH 3/3] updated bash version --- upgrade/gather_resources.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upgrade/gather_resources.sh b/upgrade/gather_resources.sh index 8ed9f5b..f36b853 100755 --- a/upgrade/gather_resources.sh +++ b/upgrade/gather_resources.sh @@ -21,4 +21,4 @@ pip install --download=. Django==1.5.5 pip install --download=. pytz==2013.8 pip install --download=. pycrypto==2.4.1 -wget http://archive.ubuntu.com/ubuntu/pool/main/b/bash/bash_4.1-2ubuntu3.2_amd64.deb +wget http://archive.ubuntu.com/ubuntu/pool/main/b/bash/bash_4.1-2ubuntu3.5_amd64.deb