Skip to content

(MODULES-3752) Fix modifying server_roles for an existing WINDOWS_LOGIN #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 18, 2016
Merged

(MODULES-3752) Fix modifying server_roles for an existing WINDOWS_LOGIN #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions spec/acceptance/sqlserver_login_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,11 +288,23 @@ def create_login_manifest (testcase,login_name,login_password,options = {})
end

it "should have the specified sysadmin role" do
query = "SELECT 'is_sysadmin' AS result WHERE IS_SRVROLEMEMBER('sysadmin','#{@login_under_test}') = 1"
# Note - IS_SRVROLEMEMBER always returns false for a disabled WINDOWS_LOGIN user login
query = "SELECT pri.name from sys.server_role_members member
JOIN sys.server_principals rol ON member.role_principal_id = rol.principal_id
JOIN sys.server_principals pri ON member.member_principal_id = pri.principal_id
WHERE rol.type_desc = 'SERVER_ROLE'
AND rol.name = 'sysadmin'
AND pri.name = '#{@login_under_test}'"
run_sql_query(host, run_sql_query_opts_as_sa(query, expected_row_count = 1))
end
it "should have the specified serveradmin role" do
query = "SELECT 'is_serveradmin' AS result WHERE IS_SRVROLEMEMBER('serveradmin','#{@login_under_test}') = 1"
# Note - IS_SRVROLEMEMBER always returns false for a disabled WINDOWS_LOGIN user login
query = "SELECT pri.name from sys.server_role_members member
JOIN sys.server_principals rol ON member.role_principal_id = rol.principal_id
JOIN sys.server_principals pri ON member.member_principal_id = pri.principal_id
WHERE rol.type_desc = 'SERVER_ROLE'
AND rol.name = 'serveradmin'
AND pri.name = '#{@login_under_test}'"
run_sql_query(host, run_sql_query_opts_as_sa(query, expected_row_count = 1))
end

Expand Down
7 changes: 6 additions & 1 deletion templates/create/login.sql.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,12 @@ ALTER LOGIN [<%= @login %>] WITH
DEFAULT_DATABASE = [<%= @default_database %>];

<% @svrroles.each do |role, enable_bit| -%>
IF IS_SRVROLEMEMBER('<%= role %>','<%= @login %>') != <%= enable_bit %>
IF (SELECT COUNT(me.role_principal_id) from sys.server_role_members me
JOIN sys.server_principals rol ON me.role_principal_id = rol.principal_id
JOIN sys.server_principals pri ON me.member_principal_id = pri.principal_id
WHERE rol.type_desc = 'SERVER_ROLE'
AND rol.name = '<%= role %>'
AND pri.name = '<%= @login %>') != <%= enable_bit %>
BEGIN
<% if enable_bit == '1' || enable_bit == 1 -%>
ALTER SERVER ROLE [<%= role %>] ADD MEMBER [<%= @login %>];
Expand Down