From 880fb9eac0888317db8bbf70587501ecfa115800 Mon Sep 17 00:00:00 2001
From: Daniel Steinborn <daniel.steinborn@lrz.de>
Date: Mon, 16 Feb 2015 10:00:25 +0100
Subject: [PATCH] fixed rake task to block removed ldap users
---
lib/tasks/gitlab/cleanup.rake | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/lib/tasks/gitlab/cleanup.rake b/lib/tasks/gitlab/cleanup.rake
index 189ad6090a4..3c9802a0be4 100644
--- a/lib/tasks/gitlab/cleanup.rake
+++ b/lib/tasks/gitlab/cleanup.rake
@@ -90,13 +90,14 @@ namespace :gitlab do
warn_user_is_not_gitlab
block_flag = ENV['BLOCK']
- User.ldap.each do |ldap_user|
- print "#{ldap_user.name} (#{ldap_user.extern_uid}) ..."
- if Gitlab::LDAP::Access.allowed?(ldap_user)
+ User.find_each do |user|
+ next unless user.ldap_user?
+ print "#{user.name} (#{user.ldap_identity.extern_uid}) ..."
+ if Gitlab::LDAP::Access.allowed?(user)
puts " [OK]".green
else
if block_flag
- ldap_user.block! unless ldap_user.blocked?
+ user.block! unless user.blocked?
puts " [BLOCKED]".red
else
puts " [NOT IN LDAP]".yellow
--
GitLab