[gentoo-commits] proj/gitolite-gentoo:t/ssh-key-options commit in: /

["Christian Ruppert" <idl0r@gentoo.org>]

commit:     b1ab3f43f2f26dda61b51b76a3e7ecbdc729cc89
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:41:33 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:41:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=b1ab3f43

Merge commit 'refs/top-bases/t/ssh-key-options' into t/ssh-key-options


 README.mkd                               |   30 +-
 conf/example.conf                        |  243 +---------
 conf/example.gitolite.rc                 |   26 +-
 contrib/adc/able                         |   20 +-
 contrib/adc/adc.common-functions         |    5 +
 contrib/adc/fork                         |    9 +-
 contrib/adc/get-rights-and-owner.in-perl |   15 +-
 contrib/adc/git                          |  123 +++++
 contrib/adc/gl-reflog                    |    8 +-
 contrib/adc/hub                          |  443 +++++++++++++++++
 contrib/adc/hub.mkd                      |  202 ++++++++
 contrib/adc/perms                        |  115 +++++
 contrib/adc/pygitolite.py                |   77 +++
 contrib/adc/rm                           |    4 +-
 contrib/adc/set-head                     |   17 +
 contrib/adc/who-pushed                   |    2 +-
 contrib/autotoc                          |   35 --
 contrib/gerrit.mkd                       |    2 +-
 contrib/gitolite-tools.mkd               |    2 +-
 contrib/gitweb/gitweb.conf               |   44 ++-
 contrib/ldap/README.mkd                  |    6 +-
 contrib/vim/README.mkd                   |    2 +-
 doc/1-INSTALL.mkd                        |   53 ++-
 doc/2-admin.mkd                          |   56 ++-
 doc/3-faq-tips-etc.mkd                   |  285 ++----------
 doc/CHANGELOG                            |   22 +
 doc/admin-defined-commands.mkd           |   14 +-
 doc/big-config.mkd                       |   14 +-
 doc/delegation.mkd                       |   10 +-
 doc/developer-notes.mkd                  |  213 ++++++++
 doc/gitolite.conf.mkd                    |  469 ++++++++++++++++++
 doc/gitolite.rc.mkd                      |   62 ++-
 doc/hook-propagation.mkd                 |    4 +-
 doc/http-backend.mkd                     |  142 +++++--
 doc/migrate.mkd                          |   10 +-
 doc/mirroring.mkd                        |   21 +-
 doc/mob-branches.mkd                     |    2 +-
 doc/monkeysphere.mkd                     |    2 +
 doc/overkill.mkd                         |    2 +-
 doc/packaging.mkd                        |    2 +-
 doc/progit-article.mkd                   |   14 +-
 doc/report-output.mkd                    |   19 +
 doc/shell-games.mkd                      |   25 +-
 doc/ssh-troubleshooting.mkd              |   42 ++-
 doc/uninstall.mkd                        |    2 +-
 doc/who-uses-it.mkd                      |    4 +-
 doc/wildcard-repositories.mkd            |   17 +-
 hooks/common/gl-pre-git.hub-sample       |   10 +
 hooks/common/update                      |   62 +--
 hooks/gitolite-admin/post-update         |    8 +-
 src/gitolite.pm                          |  776 +++++++++++++++---------------
 src/gitolite_env.pm                      |  157 ++++++
 src/gitolite_rc.pm                       |   70 +++
 src/gl-auth-command                      |  235 +++------
 src/gl-compile-conf                      |  141 ++----
 src/gl-dont-panic                        |   17 +-
 src/gl-easy-install                      |   16 +-
 src/gl-install                           |   33 +-
 src/gl-mirror-shell                      |   13 +-
 src/gl-mirror-sync                       |    4 +-
 src/gl-query-rc                          |   23 +
 src/gl-setup                             |   47 ++-
 src/gl-setup-authkeys                    |   64 ++--
 src/gl-time                              |   30 +-
 src/gl-tool                              |    9 +-
 src/sshkeys-lint                         |    6 +-
 t/README.mkd                             |   11 +-
 t/t53-check-info-expand-output           |   16 +
 t/t64-write-able                         |   11 +-
 t/t65-rsync                              |   83 ++++
 t/t67-hub                                |  174 +++++++
 t/test-driver.sh                         |   73 ++--
 72 files changed, 3483 insertions(+), 1542 deletions(-)

diff --cc src/gitolite.pm
index 7b4bb31,a880037..5f594d2
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -6,44 -41,22 +41,24 @@@ use Data::Dumper
  $Data::Dumper::Deepcopy = 1;
  $|++;
  
- # this file is commonly used using "require".  It is not required to use "use"
- # (because it doesn't live in a different package)
++use Net::SSH::AuthorizedKeysFile; # To parse the pubkeyfile with options etc.
 +
- # warning: preceding para requires 4th attribute of a programmer after
- # laziness, impatience, and hubris: sense of humour :-)
+ # ----------------------------------------------------------------------------
+ #       find the rc file, then pull the libraries
+ # ----------------------------------------------------------------------------
  
- # WARNING
- # -------
- # the name of this file will change as soon as its function/feature set
- # stabilises enough ;-)
+ BEGIN {
+     die "ENV GL_RC not set\n" unless $ENV{GL_RC};
+     die "ENV GL_BINDIR not set\n" unless $ENV{GL_BINDIR};
+ }
  
- # right now all it does is
- # - define a function that tells you where to find the rc file
- # - define a function that creates a new repo and give it our update hook
+ use lib $ENV{GL_BINDIR};
+ use gitolite_rc;
  
  # ----------------------------------------------------------------------------
- #       common definitions
+ #       the big data structures we care about
  # ----------------------------------------------------------------------------
  
- our $ABRT = "\n\t\t***** ABORTING *****\n       ";
- our $WARN = "\n\t\t***** WARNING *****\n       ";
- 
- # commands we're expecting
- our $R_COMMANDS=qr/^(git[ -]upload-pack|git[ -]upload-archive)$/;
- our $W_COMMANDS=qr/^git[ -]receive-pack$/;
- 
- # note that REPONAME_PATT allows "/", while USERNAME_PATT does not
- # also, the reason REPONAME_PATT is a superset of USERNAME_PATT is (duh!)
- # because in this version, a repo can have "CREATOR" in the name (see docs)
- our $REPONAME_PATT=qr(^\@?[0-9a-zA-Z][0-9a-zA-Z._\@/+-]*$); # very simple pattern
- our $USERNAME_PATT=qr(^\@?[0-9a-zA-Z][0-9a-zA-Z._\@+-]*$);  # very simple pattern
- # same as REPONAME, but used for wildcard repos, allows some common regex metas
- our $REPOPATT_PATT=qr(^\@?[0-9a-zA-Z[][\\^.$|()[\]*+?{}0-9a-zA-Z._\@/-]*$);
- # ADC commands and arguments must match this pattern
- our $ADC_CMD_ARGS_PATT=qr(^[0-9a-zA-Z._\@/+:-]*$);
- 
- # these come from the RC file
- our ($REPO_UMASK, $GL_WILDREPOS, $GL_PACKAGE_CONF, $GL_PACKAGE_HOOKS, $REPO_BASE, $GL_CONF_COMPILED, $GL_BIG_CONFIG, $GL_PERFLOGT, $PROJECTS_LIST, $GL_ALL_INCLUDES_SPECIAL, $GL_SITE_INFO, $GL_GET_MEMBERSHIPS_PGM, $GL_WILDREPOS_PERM_CATS);
  our %repos;
  our %groups;
  our %git_configs;
@@@ -828,18 -875,12 +877,18 @@@ sub setup_authkey
      # may not be passed; so make sure it's a valid hashref, even if empty
      $user_list_p = {} unless $user_list_p;
  
-     # CONSTANTS
+     # LOCAL CONSTANTS
  
      # command and options for authorized_keys
 +    my @AUTH_OPTIONS_PRESERVE = ( "from" );
 +    my %AUTH_OPTIONS = (
 +        "no-port-forwarding" => 1,
 +        "no-X11-forwarding" => 1,
 +        "no-agent-forwarding" => 1,
 +        "no-pty" => 1,
 +    );
-     my $AUTH_COMMAND="$bindir/gl-auth-command";
-     $AUTH_COMMAND="$bindir/gl-time $bindir/gl-auth-command" if $GL_PERFLOGT;
+     my $AUTH_COMMAND="$ENV{GL_BINDIR}/gl-auth-command";
+     $AUTH_COMMAND="$ENV{GL_BINDIR}/gl-time $ENV{GL_BINDIR}/gl-auth-command" if $GL_PERFLOGT;
 -    my $AUTH_OPTIONS="no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty";
  
      # START