... | ... | @@ -15,19 +15,16 @@ Then, that user can clone from the server over SSH, and also push to the reposit |
|
|
|
|
|
This unfortunately has some downsides:
|
|
|
|
|
|
- Every user needs a full shell account.
|
|
|
|
|
|
- While we probably *won't* be forkbombed by someone, few people actually *need* a full shell account, and the *principle of least privilege* applies here. Really, everybody is just pushing to Git.
|
|
|
- Every user needs a full shell account. While we probably *won't* be forkbombed by someone, few people actually *need* a full shell account, and the *principle of least privilege* applies here. Really, everybody is just pushing to Git.
|
|
|
|
|
|
- Because of the previous point, group and access permissions on the repositories regularly get screwed up, causing situations where people don't have access (and can't push,) or we have to have `post-receive` hooks that modify the permissions. Both of these suck (this doesn't affect e.g. the Linux kernel developers, who have pull-based development models, because they can afford to.)
|
|
|
|
|
|
- Due to the current permission scheme, all users in the `darcs` group are effectively at the level of Trac admins, which can manipulate the `trac.db` database (this is needed by the Git hooks to update the Trac tickets). Again, the *principle of least privilege* should apply here.
|
|
|
|
|
|
- Moreover, people invariably fix this but it's always slightly patchy, and so the repositories that need 'fixing' for things like permissions are inconsistent, and it's hard to keep track of what needs to be maintained.
|
|
|
- Due to the current permission scheme, all users in the `darcs` group are effectively at the level of Trac admins, which can manipulate the `trac.db` database (this is needed by the Git hooks to update the Trac tickets). Again, the *principle of least privilege* should apply here.
|
|
|
- Moreover, people invariably fix this but it's always slightly patchy, and so the repositories that need 'fixing' for things like permissions are inconsistent, and it's hard to keep track of what needs to be maintained.
|
|
|
|
|
|
- All users can willy nilly create (and delete!) tags and branches, and perform some risky Git operations. Ideally, only release maintainers should have permission to do things like cut a release tag.
|
|
|
|
|
|
- Git admins need to perform risky direct manipulations in the file-system, even for the simplest Git repository administration tasks.
|
|
|
- Git admins need to perform risky direct manipulations in the file-system, even for the simplest Git repository administration tasks. Also, Git hook scripts are not centrally managed right now, but placed individually in each git repository that needs them; thus to fix/improve a git hook script, one needs to update all git repositories using the affected script.
|
|
|
|
|
|
|
|
|
The proposed remedy is to use the Git-access wrapper [ ''Gitolite''](https://github.com/sitaramc/gitolite/wiki) which provides an authorization layer on top of Git, and is executed as a separate system user (thus accessing the git repositories with only one Unix UID). Users accessing git repositories via ssh are discriminated by their ssh public key.
|
... | ... | @@ -40,8 +37,6 @@ Gitolite also greatly simplifies user management, as a user management is little |
|
|
|
|
|
Below are some notes about how we (Austin & Herbert) would like to go about doing this.
|
|
|
|
|
|
## Setup
|
|
|
|
|
|
## The switch
|
|
|
|
|
|
|
... | ... | @@ -52,7 +47,7 @@ Ideally, most of the new setup can occur concurrently with the normal one undist |
|
|
|
|
|
For developers (with push permissions) who have already checked out repositories, the only change needed is to go over their repositories and update their git uris from
|
|
|
|
|
|
> `ssh://<user>@darcs.haskell.org/src/darcs/<repo-name>`
|
|
|
> `ssh://<user>@darcs.haskell.org/srv/darcs/<repo-name>`
|
|
|
|
|
|
|
|
|
to
|
... | ... | @@ -62,6 +57,45 @@ to |
|
|
|
|
|
This can be accomplished either by editing their '.git/config' manually or using a Git command like `git remote set-url origin NEW-URL`.
|
|
|
|
|
|
|
|
|
The old Git `ssh://` URLs will continue to work, however, as the user won't have direct write permissions anymore at the filesystem level, they'll effectively become read-only URLs.
|
|
|
|
|
|
|
|
|
Last but not least, the `sync-all` script needs to be adapted.
|
|
|
|
|
|
### Additional user-visible changes
|
|
|
|
|
|
- Ssh public keys for git access are separate from shell account, and will be managed by Gitolite admins (the initial public keys will be populated from the currently authorized shell accounts' `.ssh/authorized_keys` files)
|
|
|
|
|
|
- Developers no longer need a shell account for being able to push to git repositories; so ideally, as ghc.haskell.org hosts the critical Trac&Git resources, only \*required\* shell accounts should remain.
|
|
|
|
|
|
- 'ssh git@…' shows list of currently accessible repositories (+ respective ACLs)
|
|
|
|
|
|
- Optionally later-on: users can manage their pubkeys via "sskm" (self-service key management)
|
|
|
|
|
|
## Setup (to be done by the Admins)
|
|
|
|
|
|
- Install Gitolite
|
|
|
|
|
|
- `apt-get install Gitolite & dpkg-reconfigure`
|
|
|
(Debian7 ships with Gitolite version 2.3 in its main-pool);
|
|
|
`dpkg-reconfigure` will ask about:
|
|
|
|
|
|
- username: `git`
|
|
|
- HOME: `/home/git`
|
|
|
- Set up Gitolite's permissions (-\> umask!) in such a way that Gitolite-owned repositories can only be modified by Gitolite's `git` user, and that Gitolite-owned git repositories remain world readable.
|
|
|
- old git-repository locations in `/home/darcs` are made symlinks to the new Gitolite-owned git repositories (which are to be moved to `/home/git/repositories` and permission-reset by Gitolite's management scripts)
|
|
|
- add `www-data` user to `git` group and vice versa, so that Trac and Gitolite can interact with each other.
|
|
|
- Git hook scripts need to be made Gitolite-friendly
|
|
|
- Populate Gitolite users & Ssh pubkeys from the `~/.ssh/authorized_keys` files of members of `darcs` group
|
|
|
|
|
|
- Register new CNAME `git.haskell.org` (tangential/optional)
|
|
|
|
|
|
- HTTP vhost `darcs.haskell.org` stays as-is
|
|
|
- new HTTP vhost `git.haskell.org` serving /home/git/repositories
|
|
|
(optionally enable smart git http transport); Git uris will be `http://git.haskell.org/<repo-name>`
|
|
|
- Cgit could be used as front-page on '/', c.f. [ http://www.kernel.org/](http://www.kernel.org/)
|
|
|
|
|
|
# Current status
|
|
|
|
|
|
|
... | ... | |