hgweb: do not ignore [auth] if url has a username (issue2822) The [auth] section was ignored when handling URLs like: http://user@example.com/foo Instead, we look in [auth] for an entry matching the URL and supplied user name. Entries without username can match URL with a username. Prefix length ties are resolved in favor of entries matching the username. With: foo.prefix = http://example.org foo.username = user foo.password = password bar.prefix = http://example.org/bar and the input URL: http://user@example.org/bar the 'bar' entry will be selected because of prefix length, therefore prompting for a password. This behaviour ensure that entries selection is consistent when looking for credentials or for certificates, and that certificates can be picked even if their entries do no define usernames while the URL does. Additionally, entries without a username matched against a username are returned as if they did have requested username set to avoid prompting again for a username if the password is not set. v2: reparse the URL in readauthforuri() to handle HTTP and HTTPS similarly. v3: allow unset usernames to match URL usernames to pick certificates. Resolve prefix length ties in favor of entries with usernames.

     1

import os, sys, time

     2

from mercurial import hg, ui, commands, util

     3

     4

TESTDIR = os.environ["TESTDIR"]

     5

BUNDLEPATH = os.path.join(TESTDIR, 'bundles', 'test-no-symlinks.hg')

     6

     7

# only makes sense to test on os which supports symlinks

     8

if not hasattr(os, "symlink"):

     9

    sys.exit(80) # SKIPPED_STATUS defined in run-tests.py

    10

    11

# clone with symlink support

    12

u = ui.ui()

    13

hg.clone(u, {}, BUNDLEPATH, 'test0')

    14

    15

repo = hg.repository(u, 'test0')

    16

    17

# wait a bit, or the status call wont update the dirstate

    18

time.sleep(1)

    19

commands.status(u, repo)

    20

    21

# now disable symlink support -- this is what os.symlink would do on a

    22

# non-symlink file system

    23

def symlink_failure(src, dst):

    24

    raise OSError, (1, "Operation not permitted")

    25

os.symlink = symlink_failure

    26

    27

# dereference links as if a Samba server has exported this to a

    28

# Windows client

    29

for f in 'test0/a.lnk', 'test0/d/b.lnk':

    30

    os.unlink(f)

    31

    fp = open(f, 'wb')

    32

    fp.write(util.readfile(f[:-4]))

    33

    fp.close()

    34

    35

# reload repository

    36

u = ui.ui()

    37

repo = hg.repository(u, 'test0')

    38

commands.status(u, repo)

    39

    40

# try cloning a repo which contains symlinks

    41

u = ui.ui()

    42

hg.clone(u, {}, BUNDLEPATH, 'test1')