dispatch: protect against malicious 'hg serve --stdio' invocations (sec) Some shared-ssh installations assume that 'hg serve --stdio' is a safe command to run for minimally trusted users. Unfortunately, the messy implementation of argument parsing here meant that trying to access a repo named '--debugger' would give the user a pdb prompt, thereby sidestepping any hoped-for sandboxing. Serving repositories over HTTP(S) is unaffected. We're not currently hardening any subcommands other than 'serve'. If your service exposes other commands to users with arbitrary repository names, it is imperative that you defend against repository names of '--debugger' and anything starting with '--config'. The read-only mode of hg-ssh stopped working because it provided its hook configuration to "hg serve --stdio" via --config parameter. This is banned for security reasons now. This patch switches it to directly call ui.setconfig(). If your custom hosting infrastructure relies on passing --config to "hg serve --stdio", you'll need to find a different way to get that configuration into Mercurial, either by using ui.setconfig() as hg-ssh does in this patch, or by placing an hgrc file someplace where Mercurial will read it. mitrandir@fb.com provided some extra fixes for the dispatch code and for hg-ssh in places that I overlooked.

     1

#ifndef _HG_MPATCH_H_

     2

#define _HG_MPATCH_H_

     3

     4

#define MPATCH_ERR_NO_MEM -3

     5

#define MPATCH_ERR_CANNOT_BE_DECODED -2

     6

#define MPATCH_ERR_INVALID_PATCH -1

     7

     8

struct mpatch_frag {

     9

	int start, end, len;

    10

	const char *data;

    11

};

    12

    13

struct mpatch_flist {

    14

	struct mpatch_frag *base, *head, *tail;

    15

};

    16

    17

int mpatch_decode(const char *bin, ssize_t len, struct mpatch_flist** res);

    18

ssize_t mpatch_calcsize(ssize_t len, struct mpatch_flist *l);

    19

void mpatch_lfree(struct mpatch_flist *a);

    20

int mpatch_apply(char *buf, const char *orig, ssize_t len,

    21

	struct mpatch_flist *l);

    22

struct mpatch_flist *mpatch_fold(void *bins,

    23

	struct mpatch_flist* (*get_next_item)(void*, ssize_t),

    24

	ssize_t start, ssize_t end);

    25

    26

#endif