- Arch-projects - lists.archlinux.org

[arch-projects] [PATCH] valid_email :: check all sorts of stuff, as described by: http://www.linuxjournal.com/article/9585
by BlackEagle 19 Mar '12

19 Mar '12

Signed-off-by: BlackEagle <ike.devolder(a)gmail.com> --- web/lib/aur.inc.php | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/web/lib/aur.inc.php b/web/lib/aur.inc.php index c662b80..9b604fe 100644 --- a/web/lib/aur.inc.php +++ b/web/lib/aur.inc.php @@ -80,7 +80,53 @@ function check_sid($dbh=NULL) { # verify that an email address looks like it is legitimate # function valid_email($addy) { - return (filter_var($addy, FILTER_VALIDATE_EMAIL) !== false); + $isValid = true; + $atIndex = strrpos($addy, "@"); + if (is_bool($atIndex) && !$atIndex) { + $isValid = false; + } else { + $domain = substr($addy, $atIndex+1); + $local = substr($addy, 0, $atIndex); + $localLen = strlen($local); + $domainLen = strlen($domain); + if ($localLen < 1 || $localLen > 64) { + // local part length exceeded + $isValid = false; + } elseif ($domainLen < 1 || $domainLen > 255) { + // domain part length exceeded + $isValid = false; + } elseif ($local[0] == '.' || $local[$localLen-1] == '.') { + // local part starts or ends with '.' + $isValid = false; + } elseif (preg_match('/\\.\\./', $local)) { + // local part has two consecutive dots + $isValid = false; + } elseif (!preg_match('/^[A-Za-z0-9\\-\\.]+$/', $domain)) { + // character not valid in domain part + $isValid = false; + } elseif (preg_match('/\\.\\./', $domain)) { + // domain part has two consecutive dots + $isValid = false; + } elseif ( + !preg_match('/^(\\\\.|[A-Za-z0-9!#%&`_=\\/$\'*+?^{}|~.-])+$/', + str_replace("\\\\","",$local)) + ) { + // character not valid in local part unless + // local part is quoted + if ( + !preg_match('/^"(\\\\"|[^"])+"$/', + str_replace("\\\\","",$local)) + ) { + $isValid = false; + } + } + + if ($isValid && !(checkdnsrr($domain,"MX") || checkdnsrr($domain,"A"))) { + // domain not found in DNS + $isValid = false; + } + } + return $isValid; } # a new seed value for mt_srand() -- 1.7.9.4

4 3

[arch-projects] [initscripts][PATCH] crypttab: warn if using passphrase in /etc/crypttab
by Tom Gundersen 17 Mar '12

17 Mar '12

There is no reason not to use a keyfile, and allowing literal passphrases in crypttab has caused issues with the parsing in the past. Furthermore, it is not supported by any other crypttab implementation (to the best of my knowledge). The use of keyfiles have been the recomendation in /etc/crypttab for as long as I can remember. We are looking at refactoring the encryption support, and I think it makes sense to drop support for this when we move to the new implementation. Cc: Thomas B�chler <thomas(a)archlinux.org> Cc: Matthew Monaco <matt(a)0x01b.net> Cc: Dave Reisner <d(a)falconindy.com> Signed-off-by: Tom Gundersen <teg(a)jklm.no> --- functions | 1 + 1 file changed, 1 insertion(+) diff --git a/functions b/functions index 11ab11f..04b7ec4 100644 --- a/functions +++ b/functions @@ -444,6 +444,7 @@ do_unlock() { /*) cryptsetup -d "$3" $4 $open "$a" "$b" >/dev/null;; *) + printf "${C_FAIL}crypttab contains a literal encryption key. This will stop working in the future.${C_OTHER}\n" echo "$3" | cryptsetup $4 $open "$a" "$b" >/dev/null;; esac if (( $? )); then -- 1.7.9.4

3 2

[arch-projects] [initscripts][PATCH] reorder fsck opts, explicitly set end of options marker
by Dave Reisner 17 Mar '12

17 Mar '12

Fixes FS#28947. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- functions | 2 +- rc.sysinit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/functions b/functions index f8a7acd..0b7fd8d 100644 --- a/functions +++ b/functions @@ -432,7 +432,7 @@ fsck_all() { IGNORE_MOUNTED="-M" fi - fsck -A -T -C${FSCK_FD} -a -t no${NETFS//,/,no},noopts=_netdev ${FORCEFSCK} ${IGNORE_MOUNTED} + fsck -A -T -C${FSCK_FD} -a -t no${NETFS//,/,no},noopts=_netdev ${IGNORE_MOUNTED} -- ${FORCEFSCK} } # Single-user login and/or automatic reboot after fsck (if needed) diff --git a/rc.sysinit b/rc.sysinit index 9880995..d353357 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -178,7 +178,7 @@ if [[ -f /etc/crypttab && $CS ]] && grep -q ^[^#] /etc/crypttab; then fi # Check filesystems -[[ -f /forcefsck ]] || in_array forcefsck $(< /proc/cmdline) && FORCEFSCK="-- -f" +[[ -f /forcefsck ]] || in_array forcefsck $(< /proc/cmdline) && FORCEFSCK="-f" declare -r FORCEFSCK if [[ -n $FORCEFSCK ]] || { [[ ! -f /fastboot ]] && ! in_array fastboot $(< /proc/cmdline); }; then -- 1.7.9.4

1 0

[arch-projects] [mkinitcpio] [PATCH] memdisk: fix udev rule path
by Gerardo Exequiel Pozzi 16 Mar '12

16 Mar '12

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- install/memdisk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/memdisk b/install/memdisk index ec698fc..b0d03f3 100644 --- a/install/memdisk +++ b/install/memdisk @@ -4,7 +4,7 @@ build() { MODULES="phram mtdblock" BINARIES="/usr/bin/memdiskfind" SCRIPT="memdisk" - add_file /lib/initcpio/udev/01-memdisk.rules /lib/udev/rules.d/01-memdisk.rules + add_file /usr/lib/initcpio/udev/01-memdisk.rules /lib/udev/rules.d/01-memdisk.rules } help() { -- 1.7.9.4

3 4

[arch-projects] any interest?: initcpio cleanup_hook function
by Matthew Monaco 16 Mar '12

16 Mar '12

This has *not* been tested. I just wanted to see if there'd be any interest. "cleanup_hook" is run in the reverse order of run_hooks, if available. This would be useful to the dropbear hook in AUR. I know systemd is killing off processes automatically, but even if initcpio/initscripts started doing this, dropbear still sets up a network interface. Unlike the net hook, dropbear's setup is meant to be undone. diff --git i/init w/init index 1f5f865..e9a6924 100644 --- i/init +++ w/init @@ -43,33 +43,48 @@ fi if [ -e "/hooks" ]; then for h in ${HOOKS}; do TST="" eval "TST=\$hook_${h}" if [ "${TST}" != "disabled" ]; then run_hook () { msg "${h}: no run function defined"; } if [ -e "/hooks/${h}" ]; then . /hooks/${h} msg ":: Running Hook [${h}]" run_hook fi fi done + + for h in $(echo -n "${HOOKS} " | tac -s' '); do + TST="" + eval "TST=\$hook_${h}" + if [ "${TST}" != "disabled" ]; then + unset cleanup_hook + if [ -e "/hooks/${h}" ]; then + . /hooks/${h} + if [ "$(type -t foo 2>/dev/null)" == function ]; then + msg ":: Running Hook Cleanup [${h}]" + cleanup_hook + fi + fi + fi + done fi # honor the old behavior of break=y as a synonym for break=premount

2 2

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.8.4-4-gc1a07b1
by dreisner＠archlinux.org 16 Mar '12

16 Mar '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official mkinitcpio repository". The branch, master has been updated via c1a07b155430357052e43c52edaaa89d002aaa7e (commit) via 19c69a16a84c945c26e1ad83123c2df27ce3d190 (commit) via 0a972cd469cba75836e8bbea50ed554a2ca184a5 (commit) from d9563ccf4d2fd92e64114844645f90e86d469d50 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c1a07b155430357052e43c52edaaa89d002aaa7e Author: Matthew Monaco <matthew.monaco(a)0x01b.net> Date: Thu Mar 15 20:59:11 2012 -0600 bash-completion: find hooks in /usr/lib [dreisner: add handling for -A flag] Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 19c69a16a84c945c26e1ad83123c2df27ce3d190 Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Thu Mar 15 23:11:45 2012 -0300 memdisk: fix udev rule path Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> commit 0a972cd469cba75836e8bbea50ed554a2ca184a5 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Mar 10 21:20:01 2012 -0500 hooks/resume: refactor - cleanup syntax, style - use case to detect syntax (avoid problems with vanilla devspecs containing a ':') - support LABEL=/UUID= syntax for vanilla hibernation (FS#28504) - be more verbose about errors Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: bash-completion | 5 ++- hooks/resume | 62 ++++++++++++++++++++++++++++++++---------------------- install/memdisk | 2 +- 3 files changed, 41 insertions(+), 28 deletions(-) hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [PATCH mkinitcpio] bash-completion: find hooks in /usr/lib
by Matthew Monaco 16 Mar '12

16 Mar '12

From: Matthew Monaco <matthew.monaco(a)0x01b.net> --- bash-completion | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bash-completion b/bash-completion index ee544ec..1f26235 100644 --- a/bash-completion +++ b/bash-completion @@ -41,7 +41,8 @@ _mkinitcpio() { -b) _filedir -d;; -p) COMPREPLY=($(cd /etc/mkinitcpio.d/ && compgen -X '!*.preset' -f -- $cur)) COMPREPLY=("${COMPREPLY[(a)]%.preset}");; - -H|-S) COMPREPLY=($(cd /lib/initcpio/install/ && compgen -f -- $cur));; + -H|-S) COMPREPLY=($(cd /lib/initcpio/install/ && compgen -f -- $cur) \ + $(cd /usr/lib/initcpio/install/ && compgen -f -- $cur));; *) COMPREPLY=($(compgen -W "${action}" -- "$cur"));; esac } -- 1.7.9.4

2 1

[arch-projects] [PATCH initscripts 0/4] allow random seed to be loaded before cryptsetup
by Matthew Monaco 14 Mar '12

14 Mar '12

From: Matthew Monaco <matthew.monaco(a)0x01b.net> The ultimate goal here is FS#17131. I couldn't quite tell the best approach in some places from looking at the existing code because there's a little bit of everything. For example, I define RANDOM_SEED in functions, but use it in rc.sysinit. Is this ok for variables? I wanted to keep the status text in rc.sysinit. Is this worthwhile? Can/Should it go within the function? Matthew Monaco (4): functions: new funcs for random seed handling init/shutdown: use {load,store}_random_seed() rc.sysinit: load seed before cryptsetup (FS#17131) rc.sysinit: store random seed after loading functions | 21 +++++++++++++++++++++ rc.shutdown | 13 +------------ rc.sysinit | 14 ++++++++++---- 3 files changed, 32 insertions(+), 16 deletions(-) -- 1.7.9.4

2 7

[arch-projects] [INITSCRIPTS][PATCH 1/2] arch-binfmt: move api filesytem mounting from rc.sysinit
by Sébastien Luttringer 14 Mar '12

14 Mar '12

this will avoid filesytem to be mounted at every startup if not binfmt is used Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> --- arch-binfmt | 31 ++++++++++++++++++++----------- rc.sysinit | 4 +--- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/arch-binfmt b/arch-binfmt index 6931843..91468ef 100755 --- a/arch-binfmt +++ b/arch-binfmt @@ -7,20 +7,29 @@ shopt -s nullglob -declare -a binfmt_d=( - /usr/lib/binfmt.d/*.conf - /etc/binfmt.d/*.conf - /run/binfmt.d/*.conf -) -declare -A fragments +declare -a binfmt_d +# files given has argv supersede config files +if (( $# > 0 )); then + for arg; do [[ -r "$arg" ]] && binfmt_d+=("$arg"); done +else + binfmt_d=( + /usr/lib/binfmt.d/*.conf + /etc/binfmt.d/*.conf + /run/binfmt.d/*.conf + ) +fi + +# check there is file to load +(( ${#binfmt_d[@]} > 0 )) || exit 1 -# check binfmt_misc filesystem is mounted +# mount binfmt_misc if api filesystem is missing mountpoint -q /proc/sys/fs/binfmt_misc || - { echo "/proc/sys/fs/binfmt_misc is not mounted"; exit 1;} + mount -t binfmt_misc binfmt /proc/sys/fs/binfmt_misc -# files declared later in the sysctl_d array will override earlier -# Example: `/etc/sysctl.d/foo.conf' supersedes `/usr/lib/sysctl.d/foo.conf'. -for path in "${@:-${binfmt_d[@]}}"; do +# files declared later in the binfmt_d array will override earlier +# Example: `/etc/binfmt.d/foo.conf' supersedes `/usr/lib/binfmt.d/foo.conf'. +declare -A fragments +for path in "${binfmt_d[@]}"; do [[ -f $path ]] && fragments[${path##*/}]=$path done diff --git a/rc.sysinit b/rc.sysinit index 9880995..ff0b6d2 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -12,10 +12,8 @@ printhl "${C_H2}http://www.archlinux.org" printsep # mount the api filesystems -# /proc, /proc/sys/fs/binfmt_misc, /sys, /run, /dev, /run/lock, /dev/pts, /dev/shm +# /proc, /sys, /run, /dev, /run/lock, /dev/pts, /dev/shm mountpoint -q /proc || mount -t proc proc /proc -o nosuid,noexec,nodev -mountpoint -q /proc/sys/fs/binfmt_misc || - mount -t binfmt_misc binfmt /proc/sys/fs/binfmt_misc mountpoint -q /sys || mount -t sysfs sys /sys -o nosuid,noexec,nodev mountpoint -q /run || mount -t tmpfs run /run -o mode=0755,nosuid,nodev mountpoint -q /dev || mount -t devtmpfs dev /dev -o mode=0755,nosuid -- Sebastien "Seblu" Luttringer

1 1

Re: [arch-projects] Support additional binary formats at boot
by Tom Gundersen 13 Mar '12

13 Mar '12

2012/3/13 Matthew Monaco <dgbaley27(a)0x01b.net>: > Does this really need to be done automatically? Up until now all of the mounting > that rc.sysinit does is essential. This is definitely optional. Can't it just be > a commented line in fstab in the filesystems package? We might do this in the arch-binfmt tool rather than at boot (and then only if config files are found that needs it). Thoughts anyone? > ( essential except /dev/shm maybe... /dev/shm is needed by glibc > a fstab.d would be nice =/ ) Changing the format of /etc/fstab sounds like a bad idea to me (anyone might read and parse /etc/fstab). There was a recent discussion about this on the util-linux ml, where it was committed and then reverted shortly after due to this concern. -t

1 0