Merge pull request #1073 from gitblit/1062-DocEditorUpdates

Paul Martin

2016-04-30 a502d96a860456ec5e8c96761db70f7cabb74751

 src/main/java/com/gitblit/auth/WindowsAuthProvider.java

@@ -26,8 +26,10 @@

import com.gitblit.Constants;
import com.gitblit.Constants.AccountType;
import com.gitblit.Constants.Role;
import com.gitblit.Keys;
import com.gitblit.auth.AuthenticationProvider.UsernamePasswordAuthenticationProvider;
import com.gitblit.models.TeamModel;
import com.gitblit.models.UserModel;
import com.gitblit.utils.StringUtils;
import com.sun.jna.platform.win32.Win32Exception;
@@ -89,6 +91,16 @@
    public boolean supportsTeamMembershipChanges() {
        return true;
    }

    @Override
    public boolean supportsRoleChanges(UserModel user, Role role) {
        return true;
    }

   @Override
   public boolean supportsRoleChanges(TeamModel team, Role role) {
      return true;
   }

    @Override
   public AccountType getAccountType() {
@@ -158,9 +170,11 @@
             groupNames.add(group.getFqn());
        }

        if (groupNames.contains("BUILTIN\\Administrators")) {
           // local administrator
           user.canAdmin = true;
          if (settings.getBoolean(Keys.realm.windows.permitBuiltInAdministrators, true)) {
             if (groupNames.contains("BUILTIN\\Administrators")) {
                // local administrator
                user.canAdmin = true;
             }
        }

        // TODO consider mapping Windows groups to teams