Inlcude authorization control and revise the string resources

James Moger

2014-05-29 8845b9aff37ee1cdc538ed4247933f7e3c06a49e

Inlcude authorization control and revise the string resources

 src/main/java/com/gitblit/wicket/GitBlitWebApp.properties

@@ -685,12 +685,14 @@
gb.administration = administration
gb.plugins = plugins
gb.extensions = extensions
gb.anonymous = Anonymous
gb.anonymousRepoDescription = Anyone can see, clone, and push to this repository.
gb.public = Public
gb.publicRepoDescription = Anyone can see and clone this repository. You choose who can push.
gb.protected = Protected
gb.protectedRepoDescription = Anyone can see this repository. You choose who can clone and push.
gb.anonymousPush = Anonymous Pushes
gb.anonymousPushDescription = Anyone can see, clone, and push to this repository.
gb.pushRestrictedAuthenticated = Restrict Pushes (Authenticated)
gb.pushRestrictedAuthenticatedDescription = Anyone can see and clone this repository. All authenticated users can push.
gb.pushRestrictedNamed = Restrict Pushes (Named)
gb.pushRestrictedNamedDescription = Anyone can see and clone this repository. You choose who can push.
gb.cloneRestricted = Restrict Clones & Pushes
gb.cloneRestrictedDescription = Anyone can see this repository. You choose who can clone and push.
gb.private = Private
gb.privateRepoDescription = You choose who can see, clone, and push to this repository.
gb.initialCommit = Initial Commit

 src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java

@@ -148,9 +148,9 @@
                    repositoryModel.name = fullName;

                    repositoryModel.projectPath = null;



                    Permission permisison = permissionGroup.getModelObject();

                    repositoryModel.accessRestriction = permisison.type;

                    repositoryModel.authorizationControl = AuthorizationControl.NAMED;

                    Permission permission = permissionGroup.getModelObject();

                    repositoryModel.authorizationControl = permission.control;

                    repositoryModel.accessRestriction = permission.type;



                    repositoryModel.owners = new ArrayList<String>();

                    repositoryModel.owners.add(GitBlitWebSession.get().getUsername());

@@ -229,15 +229,41 @@
        form.add(new TextField<String>("name"));

        form.add(new TextField<String>("description"));



        Permission anonymousPermission = new Permission(getString("gb.anonymous"), getString("gb.anonymousRepoDescription"), "blank.png", AccessRestrictionType.NONE);

        Permission publicPermission = new Permission(getString("gb.public"), getString("gb.publicRepoDescription"), "lock_go_16x16.png", AccessRestrictionType.PUSH);

        Permission protectedPermission = new Permission(getString("gb.protected"), getString("gb.protectedRepoDescription"), "lock_pull_16x16.png", AccessRestrictionType.CLONE);

        Permission privatePermission = new Permission(getString("gb.private"), getString("gb.privateRepoDescription"), "shield_16x16.png", AccessRestrictionType.VIEW);

        Permission anonymousPermission = new Permission(getString("gb.anonymousPush"),

                getString("gb.anonymousPushDescription"),

                "blank.png",

                AuthorizationControl.AUTHENTICATED,

                AccessRestrictionType.NONE);



        Permission authenticatedPermission = new Permission(getString("gb.pushRestrictedAuthenticated"),

                getString("gb.pushRestrictedAuthenticatedDescription"),

                "lock_go_16x16.png",

                AuthorizationControl.AUTHENTICATED,

                AccessRestrictionType.PUSH);



        Permission publicPermission = new Permission(getString("gb.pushRestrictedNamed"),

                getString("gb.pushRestrictedNamedDescription"),

                "lock_go_16x16.png",

                AuthorizationControl.NAMED,

                AccessRestrictionType.PUSH);



        Permission protectedPermission = new Permission(getString("gb.cloneRestricted"),

                getString("gb.cloneRestrictedDescription"),

                "lock_pull_16x16.png",

                AuthorizationControl.NAMED,

                AccessRestrictionType.CLONE);



        Permission privatePermission = new Permission(getString("gb.private"),

                getString("gb.privateRepoDescription"),

                "shield_16x16.png",

                AuthorizationControl.NAMED,

                AccessRestrictionType.VIEW);



        List<Permission> permissions = new ArrayList<Permission>();

        if (app().settings().getBoolean(Keys.git.allowAnonymousPushes, false)) {

            permissions.add(anonymousPermission);

        }

        permissions.add(authenticatedPermission);

        permissions.add(publicPermission);

        permissions.add(protectedPermission);

        permissions.add(privatePermission);

@@ -248,10 +274,17 @@
        if (AccessRestrictionType.NONE == defaultRestriction) {

            defaultRestriction = AccessRestrictionType.PUSH;

        }

        AuthorizationControl defaultControl = AuthorizationControl.fromName(

                app().settings().getString(Keys.git.defaultAuthorizationControl, AuthorizationControl.NAMED.name()));



        if (AuthorizationControl.AUTHENTICATED == defaultControl) {

            defaultRestriction = AccessRestrictionType.PUSH;

        }



        Permission defaultPermission = publicPermission;

        for (Permission permission : permissions) {

            if (permission.type == defaultRestriction) {

            if (permission.type == defaultRestriction

                    && permission.control == defaultControl) {

                defaultPermission = permission;

            }

        }

@@ -481,12 +514,14 @@
        final String name;

        final String description;

        final String image;

        final AuthorizationControl control;

        final AccessRestrictionType type;



        Permission(String name, String description, String img, AccessRestrictionType type) {

        Permission(String name, String description, String img, AuthorizationControl control, AccessRestrictionType type) {

            this.name = name;

            this.description = description;

            this.image = img;

            this.control = control;

            this.type = type;

        }

    }