diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-11-30 21:35:14 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-11-30 21:35:14 +0200 |
commit | a4b8dfab94b3ca44b6e3aecd7c0281ca2f5b51d5 (patch) | |
tree | 531d41fe7bb4adfba62024e6205cbfa742f7e70e /tests/etc | |
parent | 4c68f93c0c664e13a8572b43e33c138ce3bb8d28 (diff) | |
download | wydawca-a4b8dfab94b3ca44b6e3aecd7c0281ca2f5b51d5.tar.gz wydawca-a4b8dfab94b3ca44b6e3aecd7c0281ca2f5b51d5.tar.bz2 |
Do not require uploaders to be present in the system passwd database.
* src/wydawca.h (access_method_id): Remove verify_method,
gpg_key_method and user_data_method. Add project_uploader_method.
(uploader_info): New structure.
(struct file_triplet): Remove gid and user data fields.
Add uploader_count, uploader_list and uploader.
(TRIPLET_GID): Change definition.
(verify_directive_signature): Change signature.
(uploader_find_frp): New proto.
* src/verify.c (extract_plaintext): New function.
(fill_project_name): Rewrite. Parse directive file.
(uploader_find_frp): New function.
(check_access_rights): Remove.
(verify_directive_file): Rewrite.
* src/config.c (string_to_access_method_id): Reflect changes to the
access method system.
* src/builtin.c (default_ncol): Reflect changes to the
access method system.
* src/gpg.c (gpg_sig_ok_p): Remove.
(gpg_verify_signature): New function, based on
gpg_sig_ok_p.
(verify_directive_signature): Remove `pubkey' argument.
Register all public keys from the uploader list.
Do not call directive_parse, as the directive file must
already be parsed by the time the function is called.
* src/mail.c (get_uploader_email): New function.
(do_notify): Use get_uploader_email for notifying
users.
* src/triplet.c (hash_triplet_free): Reflect changes to
the triplet structure.
(format_file_data): Get user name from the system passwd database.
(fill_user_data): Remove.
(expand_user_real_name, expand_user_email): Reflect changes to
struct file_triplet.
* tests/etc/wydawca.rcin: Rewrite to reflect new access method
system.
* tests/mailstats.at, tests/notify-upl.at,
tests/upload-dry.at, tests/upload.at: Update.
Diffstat (limited to 'tests/etc')
-rw-r--r-- | tests/etc/wydawca.rcin | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/tests/etc/wydawca.rcin b/tests/etc/wydawca.rcin index bc6aaa4..2ac40e9 100644 --- a/tests/etc/wydawca.rcin +++ b/tests/etc/wydawca.rcin @@ -29,21 +29,7 @@ access-method project-owner { -access-method user-data { +access-method project-uploader { type builtin; - query "${user}"; - params ("/exact", - "@USER@", "@USER@@localhost", "Wydawca Test User"); -} - -access-method verify-user { - type builtin; - query "${user}"; - params ("/exact", - "@USER@", "@USER@"); -} - -access-method gpg-key { - type builtin; - query "${user}"; + query "${project}"; params ("/exact", - "@USER@", + "proj", "gray", "Wydawca Test User", "gray@localhost", "-----BEGIN PGP PUBLIC KEY BLOCK-----\n" |