From 4fd677cec39e5621d16bc2c63926b803b31582e3 Mon Sep 17 00:00:00 2001 From: "Schanzenbach, Martin" Date: Thu, 19 Jul 2018 23:28:53 +0200 Subject: [PATCH] renamed identity-provider subsystem to reclaim --- configure.ac | 4 +- po/POTFILES.in | 20 +- src/Makefile.am | 6 +- src/identity-provider/identity-token.conf | 2 - src/identity-provider/test_idp.conf | 33 -- src/identity-provider/test_idp.sh | 31 -- src/identity-provider/test_idp_attribute.sh | 40 --- src/identity-provider/test_idp_consume.sh | 43 --- src/identity-provider/test_idp_issue.sh | 42 --- src/identity-provider/test_idp_revoke.sh | 65 ---- src/include/Makefile.am | 2 +- src/include/gnunet_protocols.h | 30 +- ...e_lib.h => gnunet_reclaim_attribute_lib.h} | 64 ++-- ...in.h => gnunet_reclaim_attribute_plugin.h} | 24 +- ...vider_plugin.h => gnunet_reclaim_plugin.h} | 28 +- ...der_service.h => gnunet_reclaim_service.h} | 116 +++--- .../Makefile.am | 20 +- .../plugin_reclaim_attribute_gnuid.c} | 22 +- .../reclaim_attribute.c} | 100 +++--- .../reclaim_attribute.h} | 10 +- src/{identity-provider => reclaim}/.gitignore | 0 .../Makefile.am | 72 ++-- .../gnunet-idp.c => reclaim/gnunet-reclaim.c} | 148 ++++---- .../gnunet-service-reclaim.c} | 158 ++++----- src/{identity-provider => reclaim}/jwt.c | 10 +- src/{identity-provider => reclaim}/jwt.h | 2 +- .../plugin_gnsrecord_reclaim.c} | 6 +- .../plugin_reclaim_sqlite.c} | 72 ++-- .../plugin_rest_openid_connect.c | 98 ++--- .../plugin_rest_reclaim.c} | 110 +++--- .../reclaim.conf} | 12 +- .../identity_provider.h => reclaim/reclaim.h} | 24 +- .../reclaim_api.c} | 334 +++++++++--------- src/reclaim/test_reclaim.sh | 31 ++ src/reclaim/test_reclaim_attribute.sh | 40 +++ src/reclaim/test_reclaim_consume.sh | 43 +++ .../test_reclaim_defaults.conf} | 0 src/reclaim/test_reclaim_issue.sh | 42 +++ src/reclaim/test_reclaim_revoke.sh | 65 ++++ 39 files changed, 968 insertions(+), 1001 deletions(-) delete mode 100644 src/identity-provider/identity-token.conf delete mode 100644 src/identity-provider/test_idp.conf delete mode 100755 src/identity-provider/test_idp.sh delete mode 100755 src/identity-provider/test_idp_attribute.sh delete mode 100755 src/identity-provider/test_idp_consume.sh delete mode 100755 src/identity-provider/test_idp_issue.sh delete mode 100755 src/identity-provider/test_idp_revoke.sh rename src/include/{gnunet_identity_attribute_lib.h => gnunet_reclaim_attribute_lib.h} (72%) rename src/include/{gnunet_identity_attribute_plugin.h => gnunet_reclaim_attribute_plugin.h} (81%) rename src/include/{gnunet_identity_provider_plugin.h => gnunet_reclaim_plugin.h} (75%) rename src/include/{gnunet_identity_provider_service.h => gnunet_reclaim_service.h} (70%) rename src/{identity-attribute => reclaim-attribute}/Makefile.am (57%) rename src/{identity-attribute/plugin_identity_attribute_gnuid.c => reclaim-attribute/plugin_reclaim_attribute_gnuid.c} (86%) rename src/{identity-attribute/identity_attribute.c => reclaim-attribute/reclaim_attribute.c} (75%) rename src/{identity-attribute/identity_attribute.h => reclaim-attribute/reclaim_attribute.h} (85%) rename src/{identity-provider => reclaim}/.gitignore (100%) rename src/{identity-provider => reclaim}/Makefile.am (66%) rename src/{identity-provider/gnunet-idp.c => reclaim/gnunet-reclaim.c} (71%) rename src/{identity-provider/gnunet-service-identity-provider.c => reclaim/gnunet-service-reclaim.c} (93%) rename src/{identity-provider => reclaim}/jwt.c (95%) rename src/{identity-provider => reclaim}/jwt.h (89%) rename src/{identity-provider/plugin_gnsrecord_identity_provider.c => reclaim/plugin_gnsrecord_reclaim.c} (97%) rename src/{identity-provider/plugin_identity_provider_sqlite.c => reclaim/plugin_reclaim_sqlite.c} (89%) rename src/{identity-provider => reclaim}/plugin_rest_openid_connect.c (95%) rename src/{identity-provider/plugin_rest_identity_provider.c => reclaim/plugin_rest_reclaim.c} (91%) rename src/{identity-provider/identity-provider.conf => reclaim/reclaim.conf} (59%) rename src/{identity-provider/identity_provider.h => reclaim/reclaim.h} (89%) rename src/{identity-provider/identity_provider_api.c => reclaim/reclaim_api.c} (72%) create mode 100755 src/reclaim/test_reclaim.sh create mode 100755 src/reclaim/test_reclaim_attribute.sh create mode 100755 src/reclaim/test_reclaim_consume.sh rename src/{identity-provider/test_idp_defaults.conf => reclaim/test_reclaim_defaults.conf} (100%) create mode 100755 src/reclaim/test_reclaim_issue.sh create mode 100755 src/reclaim/test_reclaim_revoke.sh diff --git a/configure.ac b/configure.ac index c7314d765..535ce0ffe 100644 --- a/configure.ac +++ b/configure.ac @@ -1759,8 +1759,8 @@ src/zonemaster/Makefile src/zonemaster/zonemaster.conf src/rest/Makefile src/abe/Makefile -src/identity-attribute/Makefile -src/identity-provider/Makefile +src/reclaim-attribute/Makefile +src/reclaim/Makefile pkgconfig/Makefile pkgconfig/gnunetarm.pc pkgconfig/gnunetats.pc diff --git a/po/POTFILES.in b/po/POTFILES.in index 83c3c7bdd..86235f860 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -198,16 +198,6 @@ src/hello/hello.c src/hostlist/gnunet-daemon-hostlist.c src/hostlist/gnunet-daemon-hostlist_client.c src/hostlist/gnunet-daemon-hostlist_server.c -src/identity-attribute/identity_attribute.c -src/identity-attribute/plugin_identity_attribute_gnuid.c -src/identity-provider/gnunet-idp.c -src/identity-provider/gnunet-service-identity-provider.c -src/identity-provider/identity_provider_api.c -src/identity-provider/jwt.c -src/identity-provider/plugin_gnsrecord_identity_provider.c -src/identity-provider/plugin_identity_provider_sqlite.c -src/identity-provider/plugin_rest_identity_provider.c -src/identity-provider/plugin_rest_openid_connect.c src/identity/gnunet-identity.c src/identity/gnunet-service-identity.c src/identity/identity_api.c @@ -297,6 +287,16 @@ src/psycutil/psyc_env.c src/psycutil/psyc_message.c src/psycutil/psyc_slicer.c src/pt/gnunet-daemon-pt.c +src/reclaim-attribute/plugin_reclaim_attribute_gnuid.c +src/reclaim-attribute/reclaim_attribute.c +src/reclaim/gnunet-reclaim.c +src/reclaim/gnunet-service-reclaim.c +src/reclaim/jwt.c +src/reclaim/plugin_gnsrecord_reclaim.c +src/reclaim/plugin_reclaim_sqlite.c +src/reclaim/plugin_rest_openid_connect.c +src/reclaim/plugin_rest_reclaim.c +src/reclaim/reclaim_api.c src/regex/gnunet-daemon-regexprofiler.c src/regex/gnunet-regex-profiler.c src/regex/gnunet-regex-simulation-profiler.c diff --git a/src/Makefile.am b/src/Makefile.am index 00f30adc3..4ded81891 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,11 +19,13 @@ if HAVE_EXPERIMENTAL social # dv (FTBFS) if HAVE_ABE +if HAVE_JSON EXP_DIR += \ abe \ credential \ - identity-attribute \ - identity-provider + reclaim-attribute \ + reclaim +endif endif if HAVE_JSON EXP_DIR += \ diff --git a/src/identity-provider/identity-token.conf b/src/identity-provider/identity-token.conf deleted file mode 100644 index f29f6cdf3..000000000 --- a/src/identity-provider/identity-token.conf +++ /dev/null @@ -1,2 +0,0 @@ -[identity-token] -BINARY=gnunet-service-identity-token diff --git a/src/identity-provider/test_idp.conf b/src/identity-provider/test_idp.conf deleted file mode 100644 index 3e4df561a..000000000 --- a/src/identity-provider/test_idp.conf +++ /dev/null @@ -1,33 +0,0 @@ -@INLINE@ test_idp_defaults.conf - -[PATHS] -GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-idp-peer-1/ - -[dht] -START_ON_DEMAND = YES - -[rest] -START_ON_DEMAND = YES -PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=$GNUNET_TMP/restlog - -[transport] -PLUGINS = - -[identity-provider] -START_ON_DEMAND = YES -#PREFIX = valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes --log-file=$GNUNET_TMP/idplog - -[gns] -#PREFIX = valgrind --leak-check=full --track-origins=yes -START_ON_DEMAND = YES -AUTO_IMPORT_PKEY = YES -MAX_PARALLEL_BACKGROUND_QUERIES = 10 -DEFAULT_LOOKUP_TIMEOUT = 15 s -RECORD_PUT_INTERVAL = 1 h -ZONE_PUBLISH_TIME_WINDOW = 1 h -DNS_ROOT=PD67SGHF3E0447TU9HADIVU9OM7V4QHTOG0EBU69TFRI2LG63DR0 - -[identity-rest-plugin] -address = http://localhost:8000/#/login -psw = mysupersecretpassword -expiration_time = 3600 diff --git a/src/identity-provider/test_idp.sh b/src/identity-provider/test_idp.sh deleted file mode 100755 index 598d1008c..000000000 --- a/src/identity-provider/test_idp.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -#trap "gnunet-arm -e -c test_idp_lookup.conf" SIGINT - -LOCATION=$(which gnunet-config) -if [ -z $LOCATION ] -then - LOCATION="gnunet-config" -fi -$LOCATION --version 1> /dev/null -if test $? != 0 -then - echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" - exit 77 -fi - -rm -rf `gnunet-config -c test_idp.conf -s PATHS -o GNUNET_HOME -f` - -# (1) PKEY1.user -> PKEY2.resu.user -# (2) PKEY2.resu -> PKEY3 -# (3) PKEY3.user -> PKEY4 - - -which timeout &> /dev/null && DO_TIMEOUT="timeout 30" - -TEST_ATTR="test" -gnunet-arm -s -c test_idp.conf -gnunet-identity -C testego -c test_idp.conf -valgrind gnunet-idp -e testego -a email -V john@doe.gnu -c test_idp.conf -gnunet-idp -e testego -a name -V John -c test_idp.conf -gnunet-idp -e testego -D -c test_idp.conf -gnunet-arm -e -c test_idp.conf diff --git a/src/identity-provider/test_idp_attribute.sh b/src/identity-provider/test_idp_attribute.sh deleted file mode 100755 index 7f0f06dac..000000000 --- a/src/identity-provider/test_idp_attribute.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash -trap "gnunet-arm -e -c test_idp.conf" SIGINT - -LOCATION=$(which gnunet-config) -if [ -z $LOCATION ] -then - LOCATION="gnunet-config" -fi -$LOCATION --version 1> /dev/null -if test $? != 0 -then - echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" - exit 77 -fi - -rm -rf `gnunet-config -c test_idp.conf -s PATHS -o GNUNET_HOME -f` - -# (1) PKEY1.user -> PKEY2.resu.user -# (2) PKEY2.resu -> PKEY3 -# (3) PKEY3.user -> PKEY4 - - -which timeout &> /dev/null && DO_TIMEOUT="timeout 30" - -TEST_ATTR="test" -gnunet-arm -s -c test_idp.conf -#gnunet-arm -i rest -c test_idp.conf -gnunet-identity -C testego -c test_idp.conf -gnunet-identity -C rpego -c test_idp.conf -TEST_KEY=$(gnunet-identity -d -c test_idp.conf | grep testego | awk '{print $3}') -gnunet-idp -e testego -a email -V john@doe.gnu -c test_idp.conf -gnunet-idp -e testego -a name -V John -c test_idp.conf > /dev/null 2>&1 -if test $? != 0 -then - echo "Failed." - exit 1 -fi - -#curl localhost:7776/idp/attributes/testego -gnunet-arm -e -c test_idp.conf diff --git a/src/identity-provider/test_idp_consume.sh b/src/identity-provider/test_idp_consume.sh deleted file mode 100755 index 11f6865a4..000000000 --- a/src/identity-provider/test_idp_consume.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash -trap "gnunet-arm -e -c test_idp.conf" SIGINT - -LOCATION=$(which gnunet-config) -if [ -z $LOCATION ] -then - LOCATION="gnunet-config" -fi -$LOCATION --version 1> /dev/null -if test $? != 0 -then - echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" - exit 77 -fi - -rm -rf `gnunet-config -c test_idp.conf -s PATHS -o GNUNET_HOME -f` - -# (1) PKEY1.user -> PKEY2.resu.user -# (2) PKEY2.resu -> PKEY3 -# (3) PKEY3.user -> PKEY4 - - -which timeout &> /dev/null && DO_TIMEOUT="timeout 30" - -TEST_ATTR="test" -gnunet-arm -s -c test_idp.conf -#gnunet-arm -i rest -c test_idp.conf -gnunet-identity -C testego -c test_idp.conf -gnunet-identity -C rpego -c test_idp.conf -SUBJECT_KEY=$(gnunet-identity -d -c test_idp.conf | grep rpego | awk '{print $3}') -TEST_KEY=$(gnunet-identity -d -c test_idp.conf | grep testego | awk '{print $3}') -gnunet-idp -e testego -a email -V john@doe.gnu -c test_idp.conf -gnunet-idp -e testego -a name -V John -c test_idp.conf -TICKET=$(gnunet-idp -e testego -i "email,name" -r $SUBJECT_KEY -c test_idp.conf | awk '{print $1}') -gnunet-idp -e rpego -C $TICKET -c test_idp.conf > /dev/null 2>&1 - -if test $? != 0 -then - "Failed." - exit 1 -fi -#curl http://localhost:7776/idp/tickets/testego -gnunet-arm -e -c test_idp.conf diff --git a/src/identity-provider/test_idp_issue.sh b/src/identity-provider/test_idp_issue.sh deleted file mode 100755 index 90487ee73..000000000 --- a/src/identity-provider/test_idp_issue.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -trap "gnunet-arm -e -c test_idp.conf" SIGINT - -LOCATION=$(which gnunet-config) -if [ -z $LOCATION ] -then - LOCATION="gnunet-config" -fi -$LOCATION --version 1> /dev/null -if test $? != 0 -then - echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" - exit 77 -fi - -rm -rf `gnunet-config -c test_idp.conf -s PATHS -o GNUNET_HOME -f` - -# (1) PKEY1.user -> PKEY2.resu.user -# (2) PKEY2.resu -> PKEY3 -# (3) PKEY3.user -> PKEY4 - - -which timeout &> /dev/null && DO_TIMEOUT="timeout 30" - -TEST_ATTR="test" -gnunet-arm -s -c test_idp.conf -#gnunet-arm -i rest -c test_idp.conf -gnunet-identity -C testego -c test_idp.conf -gnunet-identity -C rpego -c test_idp.conf -SUBJECT_KEY=$(gnunet-identity -d -c test_idp.conf | grep rpego | awk '{print $3}') -TEST_KEY=$(gnunet-identity -d -c test_idp.conf | grep testego | awk '{print $3}') -gnunet-idp -e testego -a email -V john@doe.gnu -c test_idp.conf > /dev/null 2>&1 -gnunet-idp -e testego -a name -V John -c test_idp.conf > /dev/null 2>&1 -#gnunet-idp -e testego -D -c test_idp.conf -gnunet-idp -e testego -i "email,name" -r $SUBJECT_KEY -c test_idp.conf > /dev/null 2>&1 -if test $? != 0 -then - echo "Failed." - exit 1 -fi -#curl http://localhost:7776/idp/attributes/testego -gnunet-arm -e -c test_idp.conf diff --git a/src/identity-provider/test_idp_revoke.sh b/src/identity-provider/test_idp_revoke.sh deleted file mode 100755 index 7a3f5d030..000000000 --- a/src/identity-provider/test_idp_revoke.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -trap "gnunet-arm -e -c test_idp.conf" SIGINT - -LOCATION=$(which gnunet-config) -if [ -z $LOCATION ] -then - LOCATION="gnunet-config" -fi -$LOCATION --version 1> /dev/null -if test $? != 0 -then - echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" - exit 77 -fi - -rm -rf `gnunet-config -c test_idp.conf -s PATHS -o GNUNET_HOME -f` - -# (1) PKEY1.user -> PKEY2.resu.user -# (2) PKEY2.resu -> PKEY3 -# (3) PKEY3.user -> PKEY4 - - -which timeout &> /dev/null && DO_TIMEOUT="timeout 30" - -TEST_ATTR="test" -gnunet-arm -s -c test_idp.conf 2&>1 > /dev/null -gnunet-identity -C alice -c test_idp.conf -gnunet-identity -C bob -c test_idp.conf -gnunet-identity -C eve -c test_idp.conf -ALICE_KEY=$(gnunet-identity -d -c test_idp.conf | grep alice | awk '{print $3}') -BOB_KEY=$(gnunet-identity -d -c test_idp.conf | grep bob | awk '{print $3}') -EVE_KEY=$(gnunet-identity -d -c test_idp.conf | grep eve | awk '{print $3}') - -gnunet-idp -e alice -E 15s -a email -V john@doe.gnu -c test_idp.conf -gnunet-idp -e alice -E 15s -a name -V John -c test_idp.conf -TICKET_BOB=$(gnunet-idp -e alice -i "email,name" -r $BOB_KEY -c test_idp.conf | awk '{print $1}') -#gnunet-idp -e bob -C $TICKET_BOB -c test_idp.conf -TICKET_EVE=$(gnunet-idp -e alice -i "email" -r $EVE_KEY -c test_idp.conf | awk '{print $1}') - -#echo "Consuming $TICKET" -#gnunet-idp -e eve -C $TICKET_EVE -c test_idp.conf -gnunet-idp -e alice -R $TICKET_EVE -c test_idp.conf - -#sleep 6 - -gnunet-idp -e eve -C $TICKET_EVE -c test_idp.conf 2&>1 >/dev/null -if test $? == 0 -then - echo "Eve can still resolve attributes..." - gnunet-arm -e -c test_idp.conf - exit 1 -fi - -gnunet-arm -e -c test_idp.conf -gnunet-arm -s -c test_idp.conf 2&>1 > /dev/null - -gnunet-idp -e bob -C $TICKET_BOB -c test_idp.conf 2&>1 >/dev/null -if test $? != 0 -then - echo "Bob cannot resolve attributes..." - gnunet-arm -e -c test_idp.conf - exit 1 -fi - -gnunet-arm -e -c test_idp.conf diff --git a/src/include/Makefile.am b/src/include/Makefile.am index 08e9dd156..41b2b1382 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -66,7 +66,7 @@ gnunetinclude_HEADERS = \ gnunet_hello_lib.h \ gnunet_helper_lib.h \ gnunet_identity_service.h \ - gnunet_identity_provider_service.h \ + gnunet_reclaim_service.h \ gnunet_json_lib.h \ gnunet_jsonapi_lib.h \ gnunet_jsonapi_util.h \ diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h index 36aa424b4..4400db7e1 100644 --- a/src/include/gnunet_protocols.h +++ b/src/include/gnunet_protocols.h @@ -2656,35 +2656,35 @@ extern "C" * * IDENTITY PROVIDER MESSAGE TYPES */ -#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_STORE 961 +#define GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_STORE 961 -#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_STORE_RESPONSE 962 +#define GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_STORE_RESPONSE 962 -#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_ITERATION_START 963 +#define GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_START 963 -#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_ITERATION_STOP 964 +#define GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_STOP 964 -#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_ITERATION_NEXT 965 +#define GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_NEXT 965 -#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_RESULT 966 +#define GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_RESULT 966 -#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ISSUE_TICKET 967 +#define GNUNET_MESSAGE_TYPE_RECLAIM_ISSUE_TICKET 967 -#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_RESULT 968 +#define GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_RESULT 968 -#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_REVOKE_TICKET 969 +#define GNUNET_MESSAGE_TYPE_RECLAIM_REVOKE_TICKET 969 -#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_REVOKE_TICKET_RESULT 970 +#define GNUNET_MESSAGE_TYPE_RECLAIM_REVOKE_TICKET_RESULT 970 -#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_CONSUME_TICKET 971 +#define GNUNET_MESSAGE_TYPE_RECLAIM_CONSUME_TICKET 971 -#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_CONSUME_TICKET_RESULT 972 +#define GNUNET_MESSAGE_TYPE_RECLAIM_CONSUME_TICKET_RESULT 972 -#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_START 973 +#define GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_START 973 -#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_STOP 974 +#define GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_STOP 974 -#define GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_NEXT 975 +#define GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_NEXT 975 /************************************************** * diff --git a/src/include/gnunet_identity_attribute_lib.h b/src/include/gnunet_reclaim_attribute_lib.h similarity index 72% rename from src/include/gnunet_identity_attribute_lib.h rename to src/include/gnunet_reclaim_attribute_lib.h index eb01f7ac2..df5356d76 100644 --- a/src/include/gnunet_identity_attribute_lib.h +++ b/src/include/gnunet_reclaim_attribute_lib.h @@ -25,8 +25,8 @@ * @defgroup identity-provider Identity Provider service * @{ */ -#ifndef GNUNET_IDENTITY_ATTRIBUTE_LIB_H -#define GNUNET_IDENTITY_ATTRIBUTE_LIB_H +#ifndef GNUNET_RECLAIM_ATTRIBUTE_LIB_H +#define GNUNET_RECLAIM_ATTRIBUTE_LIB_H #ifdef __cplusplus extern "C" @@ -42,19 +42,19 @@ extern "C" /** * No value attribute. */ -#define GNUNET_IDENTITY_ATTRIBUTE_TYPE_NONE 0 +#define GNUNET_RECLAIM_ATTRIBUTE_TYPE_NONE 0 /** * String attribute. */ -#define GNUNET_IDENTITY_ATTRIBUTE_TYPE_STRING 1 +#define GNUNET_RECLAIM_ATTRIBUTE_TYPE_STRING 1 /** * An attribute. */ -struct GNUNET_IDENTITY_ATTRIBUTE_Claim +struct GNUNET_RECLAIM_ATTRIBUTE_Claim { /** * The name of the attribute. Note "name" must never be individually @@ -86,35 +86,35 @@ struct GNUNET_IDENTITY_ATTRIBUTE_Claim }; -struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList +struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList { /** * List head */ - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *list_head; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *list_head; /** * List tail */ - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *list_tail; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *list_tail; }; -struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry +struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry { /** * DLL */ - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *prev; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *prev; /** * DLL */ - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *next; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *next; /** * The attribute claim */ - struct GNUNET_IDENTITY_ATTRIBUTE_Claim *claim; + struct GNUNET_RECLAIM_ATTRIBUTE_Claim *claim; }; /** @@ -126,8 +126,8 @@ struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry * @param data_size the attribute value size * @return the new attribute */ -struct GNUNET_IDENTITY_ATTRIBUTE_Claim * -GNUNET_IDENTITY_ATTRIBUTE_claim_new (const char* attr_name, +struct GNUNET_RECLAIM_ATTRIBUTE_Claim * +GNUNET_RECLAIM_ATTRIBUTE_claim_new (const char* attr_name, uint32_t type, const void* data, size_t data_size); @@ -141,13 +141,13 @@ GNUNET_IDENTITY_ATTRIBUTE_claim_new (const char* attr_name, * @return the required buffer size */ size_t -GNUNET_IDENTITY_ATTRIBUTE_list_serialize_get_size (const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs); +GNUNET_RECLAIM_ATTRIBUTE_list_serialize_get_size (const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs); void -GNUNET_IDENTITY_ATTRIBUTE_list_destroy (struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs); +GNUNET_RECLAIM_ATTRIBUTE_list_destroy (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs); void -GNUNET_IDENTITY_ATTRIBUTE_list_add (struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs, +GNUNET_RECLAIM_ATTRIBUTE_list_add (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs, const char* attr_name, uint32_t type, const void* data, @@ -162,7 +162,7 @@ GNUNET_IDENTITY_ATTRIBUTE_list_add (struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList * * @return length of serialized data */ size_t -GNUNET_IDENTITY_ATTRIBUTE_list_serialize (const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs, +GNUNET_RECLAIM_ATTRIBUTE_list_serialize (const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs, char *result); /** @@ -173,8 +173,8 @@ GNUNET_IDENTITY_ATTRIBUTE_list_serialize (const struct GNUNET_IDENTITY_ATTRIBUTE * * @return a GNUNET_IDENTITY_PROVIDER_AttributeList, must be free'd by caller */ -struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList * -GNUNET_IDENTITY_ATTRIBUTE_list_deserialize (const char* data, +struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList * +GNUNET_RECLAIM_ATTRIBUTE_list_deserialize (const char* data, size_t data_size); @@ -186,7 +186,7 @@ GNUNET_IDENTITY_ATTRIBUTE_list_deserialize (const char* data, * @return the required buffer size */ size_t -GNUNET_IDENTITY_ATTRIBUTE_serialize_get_size (const struct GNUNET_IDENTITY_ATTRIBUTE_Claim *attr); +GNUNET_RECLAIM_ATTRIBUTE_serialize_get_size (const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr); @@ -199,7 +199,7 @@ GNUNET_IDENTITY_ATTRIBUTE_serialize_get_size (const struct GNUNET_IDENTITY_ATTRI * @return length of serialized data */ size_t -GNUNET_IDENTITY_ATTRIBUTE_serialize (const struct GNUNET_IDENTITY_ATTRIBUTE_Claim *attr, +GNUNET_RECLAIM_ATTRIBUTE_serialize (const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr, char *result); /** @@ -210,12 +210,12 @@ GNUNET_IDENTITY_ATTRIBUTE_serialize (const struct GNUNET_IDENTITY_ATTRIBUTE_Clai * * @return a GNUNET_IDENTITY_PROVIDER_Attribute, must be free'd by caller */ -struct GNUNET_IDENTITY_ATTRIBUTE_Claim * -GNUNET_IDENTITY_ATTRIBUTE_deserialize (const char* data, +struct GNUNET_RECLAIM_ATTRIBUTE_Claim * +GNUNET_RECLAIM_ATTRIBUTE_deserialize (const char* data, size_t data_size); -struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList* -GNUNET_IDENTITY_ATTRIBUTE_list_dup (const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs); +struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList* +GNUNET_RECLAIM_ATTRIBUTE_list_dup (const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs); /** * Convert a type name to the corresponding number @@ -224,7 +224,7 @@ GNUNET_IDENTITY_ATTRIBUTE_list_dup (const struct GNUNET_IDENTITY_ATTRIBUTE_Claim * @return corresponding number, UINT32_MAX on error */ uint32_t -GNUNET_IDENTITY_ATTRIBUTE_typename_to_number (const char *typename); +GNUNET_RECLAIM_ATTRIBUTE_typename_to_number (const char *typename); /** * Convert human-readable version of a 'claim' of an attribute to the binary @@ -237,7 +237,7 @@ GNUNET_IDENTITY_ATTRIBUTE_typename_to_number (const char *typename); * @return #GNUNET_OK on success */ int -GNUNET_IDENTITY_ATTRIBUTE_string_to_value (uint32_t type, +GNUNET_RECLAIM_ATTRIBUTE_string_to_value (uint32_t type, const char *s, void **data, size_t *data_size); @@ -251,7 +251,7 @@ GNUNET_IDENTITY_ATTRIBUTE_string_to_value (uint32_t type, * @return NULL on error, otherwise human-readable representation of the claim */ char * -GNUNET_IDENTITY_ATTRIBUTE_value_to_string (uint32_t type, +GNUNET_RECLAIM_ATTRIBUTE_value_to_string (uint32_t type, const void* data, size_t data_size); @@ -262,7 +262,7 @@ GNUNET_IDENTITY_ATTRIBUTE_value_to_string (uint32_t type, * @return corresponding typestring, NULL on error */ const char* -GNUNET_IDENTITY_ATTRIBUTE_number_to_typename (uint32_t type); +GNUNET_RECLAIM_ATTRIBUTE_number_to_typename (uint32_t type); #if 0 /* keep Emacsens' auto-indent happy */ @@ -273,9 +273,9 @@ GNUNET_IDENTITY_ATTRIBUTE_number_to_typename (uint32_t type); #endif -/* ifndef GNUNET_IDENTITY_ATTRIBUTE_LIB_H */ +/* ifndef GNUNET_RECLAIM_ATTRIBUTE_LIB_H */ #endif /** @} */ /* end of group identity */ -/* end of gnunet_identity_attribute_lib.h */ +/* end of gnunet_reclaim_attribute_lib.h */ diff --git a/src/include/gnunet_identity_attribute_plugin.h b/src/include/gnunet_reclaim_attribute_plugin.h similarity index 81% rename from src/include/gnunet_identity_attribute_plugin.h rename to src/include/gnunet_reclaim_attribute_plugin.h index 7c399c616..cf0bb141a 100644 --- a/src/include/gnunet_identity_attribute_plugin.h +++ b/src/include/gnunet_reclaim_attribute_plugin.h @@ -26,11 +26,11 @@ * Plugin API for the idp database backend * @{ */ -#ifndef GNUNET_IDENTITY_ATTRIBUTE_PLUGIN_H -#define GNUNET_IDENTITY_ATTRIBUTE_PLUGIN_H +#ifndef GNUNET_RECLAIM_ATTRIBUTE_PLUGIN_H +#define GNUNET_RECLAIM_ATTRIBUTE_PLUGIN_H #include "gnunet_util_lib.h" -#include "gnunet_identity_attribute_lib.h" +#include "gnunet_reclaim_attribute_lib.h" #ifdef __cplusplus extern "C" @@ -51,7 +51,7 @@ extern "C" * @param data_size number of bytes in @a data * @return NULL on error, otherwise human-readable representation of the value */ -typedef char * (*GNUNET_IDENTITY_ATTRIBUTE_ValueToStringFunction) (void *cls, +typedef char * (*GNUNET_RECLAIM_ATTRIBUTE_ValueToStringFunction) (void *cls, uint32_t type, const void *data, size_t data_size); @@ -69,7 +69,7 @@ typedef char * (*GNUNET_IDENTITY_ATTRIBUTE_ValueToStringFunction) (void *cls, * @param data_size set to number of bytes in @a data * @return #GNUNET_OK on success */ -typedef int (*GNUNET_IDENTITY_ATTRIBUTE_StringToValueFunction) (void *cls, +typedef int (*GNUNET_RECLAIM_ATTRIBUTE_StringToValueFunction) (void *cls, uint32_t type, const char *s, void **data, @@ -84,7 +84,7 @@ typedef int (*GNUNET_IDENTITY_ATTRIBUTE_StringToValueFunction) (void *cls, * @param typename name to convert * @return corresponding number, UINT32_MAX on error */ -typedef uint32_t (*GNUNET_IDENTITY_ATTRIBUTE_TypenameToNumberFunction) (void *cls, +typedef uint32_t (*GNUNET_RECLAIM_ATTRIBUTE_TypenameToNumberFunction) (void *cls, const char *typename); @@ -96,7 +96,7 @@ typedef uint32_t (*GNUNET_IDENTITY_ATTRIBUTE_TypenameToNumberFunction) (void *cl * @param type number of a type to convert * @return corresponding typestring, NULL on error */ -typedef const char * (*GNUNET_IDENTITY_ATTRIBUTE_NumberToTypenameFunction) (void *cls, +typedef const char * (*GNUNET_RECLAIM_ATTRIBUTE_NumberToTypenameFunction) (void *cls, uint32_t type); @@ -104,7 +104,7 @@ typedef const char * (*GNUNET_IDENTITY_ATTRIBUTE_NumberToTypenameFunction) (void * Each plugin is required to return a pointer to a struct of this * type as the return value from its entry point. */ -struct GNUNET_IDENTITY_ATTRIBUTE_PluginFunctions +struct GNUNET_RECLAIM_ATTRIBUTE_PluginFunctions { /** @@ -115,22 +115,22 @@ struct GNUNET_IDENTITY_ATTRIBUTE_PluginFunctions /** * Conversion to string. */ - GNUNET_IDENTITY_ATTRIBUTE_ValueToStringFunction value_to_string; + GNUNET_RECLAIM_ATTRIBUTE_ValueToStringFunction value_to_string; /** * Conversion to binary. */ - GNUNET_IDENTITY_ATTRIBUTE_StringToValueFunction string_to_value; + GNUNET_RECLAIM_ATTRIBUTE_StringToValueFunction string_to_value; /** * Typename to number. */ - GNUNET_IDENTITY_ATTRIBUTE_TypenameToNumberFunction typename_to_number; + GNUNET_RECLAIM_ATTRIBUTE_TypenameToNumberFunction typename_to_number; /** * Number to typename. */ - GNUNET_IDENTITY_ATTRIBUTE_NumberToTypenameFunction number_to_typename; + GNUNET_RECLAIM_ATTRIBUTE_NumberToTypenameFunction number_to_typename; }; diff --git a/src/include/gnunet_identity_provider_plugin.h b/src/include/gnunet_reclaim_plugin.h similarity index 75% rename from src/include/gnunet_identity_provider_plugin.h rename to src/include/gnunet_reclaim_plugin.h index 2330066dd..c400af64c 100644 --- a/src/include/gnunet_identity_provider_plugin.h +++ b/src/include/gnunet_reclaim_plugin.h @@ -22,15 +22,15 @@ * @file * Plugin API for the idp database backend * - * @defgroup identity-provider-plugin IdP service plugin API + * @defgroup reclaim-plugin IdP service plugin API * Plugin API for the idp database backend * @{ */ -#ifndef GNUNET_IDENTITY_PROVIDER_PLUGIN_H -#define GNUNET_IDENTITY_PROVIDER_PLUGIN_H +#ifndef GNUNET_RECLAIM_PLUGIN_H +#define GNUNET_RECLAIM_PLUGIN_H #include "gnunet_util_lib.h" -#include "gnunet_identity_provider_service.h" +#include "gnunet_reclaim_service.h" #ifdef __cplusplus extern "C" @@ -47,15 +47,15 @@ extern "C" * @param cls closure * @param ticket the ticket */ -typedef void (*GNUNET_IDENTITY_PROVIDER_TicketIterator) (void *cls, - const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket, - const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs); +typedef void (*GNUNET_RECLAIM_TicketIterator) (void *cls, + const struct GNUNET_RECLAIM_Ticket *ticket, + const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs); /** * @brief struct returned by the initialization function of the plugin */ -struct GNUNET_IDENTITY_PROVIDER_PluginFunctions +struct GNUNET_RECLAIM_PluginFunctions { /** @@ -71,8 +71,8 @@ struct GNUNET_IDENTITY_PROVIDER_PluginFunctions * @return #GNUNET_OK on success, else #GNUNET_SYSERR */ int (*store_ticket) (void *cls, - const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket, - const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs); + const struct GNUNET_RECLAIM_Ticket *ticket, + const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs); /** * Delete a ticket from the database. @@ -82,7 +82,7 @@ struct GNUNET_IDENTITY_PROVIDER_PluginFunctions * @return #GNUNET_OK on success, else #GNUNET_SYSERR */ int (*delete_ticket) (void *cls, - const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket); + const struct GNUNET_RECLAIM_Ticket *ticket); @@ -101,11 +101,11 @@ struct GNUNET_IDENTITY_PROVIDER_PluginFunctions const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, int audience, uint64_t offset, - GNUNET_IDENTITY_PROVIDER_TicketIterator iter, void *iter_cls); + GNUNET_RECLAIM_TicketIterator iter, void *iter_cls); int (*get_ticket_attributes) (void* cls, - const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket, - GNUNET_IDENTITY_PROVIDER_TicketIterator iter, + const struct GNUNET_RECLAIM_Ticket *ticket, + GNUNET_RECLAIM_TicketIterator iter, void *iter_cls); }; diff --git a/src/include/gnunet_identity_provider_service.h b/src/include/gnunet_reclaim_service.h similarity index 70% rename from src/include/gnunet_identity_provider_service.h rename to src/include/gnunet_reclaim_service.h index 0c72556e8..7e668cd62 100644 --- a/src/include/gnunet_identity_provider_service.h +++ b/src/include/gnunet_reclaim_service.h @@ -22,11 +22,11 @@ * @file * Identity provider service; implements identity provider for GNUnet * - * @defgroup identity-provider Identity Provider service + * @defgroup reclaim Identity Provider service * @{ */ -#ifndef GNUNET_IDENTITY_PROVIDER_SERVICE_H -#define GNUNET_IDENTITY_PROVIDER_SERVICE_H +#ifndef GNUNET_RECLAIM_SERVICE_H +#define GNUNET_RECLAIM_SERVICE_H #ifdef __cplusplus extern "C" @@ -37,27 +37,27 @@ extern "C" #endif #include "gnunet_util_lib.h" -#include "gnunet_identity_attribute_lib.h" +#include "gnunet_reclaim_attribute_lib.h" /** * Version number of GNUnet Identity Provider API. */ -#define GNUNET_IDENTITY_PROVIDER_VERSION 0x00000000 +#define GNUNET_RECLAIM_VERSION 0x00000000 /** * Handle to access the identity service. */ -struct GNUNET_IDENTITY_PROVIDER_Handle; +struct GNUNET_RECLAIM_Handle; /** * Handle for a token. */ -struct GNUNET_IDENTITY_PROVIDER_Token; +struct GNUNET_RECLAIM_Token; /** * The ticket */ -struct GNUNET_IDENTITY_PROVIDER_Ticket +struct GNUNET_RECLAIM_Ticket { /** * The ticket issuer @@ -78,7 +78,7 @@ struct GNUNET_IDENTITY_PROVIDER_Ticket /** * Handle for an operation with the identity provider service. */ -struct GNUNET_IDENTITY_PROVIDER_Operation; +struct GNUNET_RECLAIM_Operation; /** @@ -87,8 +87,8 @@ struct GNUNET_IDENTITY_PROVIDER_Operation; * @param cfg Configuration to contact the identity provider service. * @return handle to communicate with identity provider service */ -struct GNUNET_IDENTITY_PROVIDER_Handle * -GNUNET_IDENTITY_PROVIDER_connect (const struct GNUNET_CONFIGURATION_Handle *cfg); +struct GNUNET_RECLAIM_Handle * +GNUNET_RECLAIM_connect (const struct GNUNET_CONFIGURATION_Handle *cfg); /** * Continuation called to notify client about result of the @@ -101,7 +101,7 @@ GNUNET_IDENTITY_PROVIDER_connect (const struct GNUNET_CONFIGURATION_Handle *cfg) * @param emsg NULL on success, otherwise an error message */ typedef void -(*GNUNET_IDENTITY_PROVIDER_ContinuationWithStatus) (void *cls, +(*GNUNET_RECLAIM_ContinuationWithStatus) (void *cls, int32_t success, const char *emsg); @@ -118,12 +118,12 @@ typedef void * @param cont_cls closure for @a cont * @return handle to abort the request */ -struct GNUNET_IDENTITY_PROVIDER_Operation * -GNUNET_IDENTITY_PROVIDER_attribute_store (struct GNUNET_IDENTITY_PROVIDER_Handle *h, +struct GNUNET_RECLAIM_Operation * +GNUNET_RECLAIM_attribute_store (struct GNUNET_RECLAIM_Handle *h, const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey, - const struct GNUNET_IDENTITY_ATTRIBUTE_Claim *attr, + const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr, const struct GNUNET_TIME_Relative *exp_interval, - GNUNET_IDENTITY_PROVIDER_ContinuationWithStatus cont, + GNUNET_RECLAIM_ContinuationWithStatus cont, void *cont_cls); @@ -135,19 +135,19 @@ GNUNET_IDENTITY_PROVIDER_attribute_store (struct GNUNET_IDENTITY_PROVIDER_Handle * @param attr the attribute */ typedef void -(*GNUNET_IDENTITY_PROVIDER_AttributeResult) (void *cls, +(*GNUNET_RECLAIM_AttributeResult) (void *cls, const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, - const struct GNUNET_IDENTITY_ATTRIBUTE_Claim *attr); + const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr); /** * List all attributes for a local identity. - * This MUST lock the `struct GNUNET_IDENTITY_PROVIDER_Handle` - * for any other calls than #GNUNET_IDENTITY_PROVIDER_get_attributes_next() and - * #GNUNET_IDENTITY_PROVIDER_get_attributes_stop. @a proc will be called once + * This MUST lock the `struct GNUNET_RECLAIM_Handle` + * for any other calls than #GNUNET_RECLAIM_get_attributes_next() and + * #GNUNET_RECLAIM_get_attributes_stop. @a proc will be called once * immediately, and then again after - * #GNUNET_IDENTITY_PROVIDER_get_attributes_next() is invoked. + * #GNUNET_RECLAIM_get_attributes_next() is invoked. * * On error (disconnect), @a error_cb will be invoked. * On normal completion, @a finish_cb proc will be @@ -166,36 +166,36 @@ typedef void * @param finish_cb_cls closure for @a finish_cb * @return an iterator handle to use for iteration */ -struct GNUNET_IDENTITY_PROVIDER_AttributeIterator * -GNUNET_IDENTITY_PROVIDER_get_attributes_start (struct GNUNET_IDENTITY_PROVIDER_Handle *h, +struct GNUNET_RECLAIM_AttributeIterator * +GNUNET_RECLAIM_get_attributes_start (struct GNUNET_RECLAIM_Handle *h, const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, GNUNET_SCHEDULER_TaskCallback error_cb, void *error_cb_cls, - GNUNET_IDENTITY_PROVIDER_AttributeResult proc, + GNUNET_RECLAIM_AttributeResult proc, void *proc_cls, GNUNET_SCHEDULER_TaskCallback finish_cb, void *finish_cb_cls); /** - * Calls the record processor specified in #GNUNET_IDENTITY_PROVIDER_get_attributes_start + * Calls the record processor specified in #GNUNET_RECLAIM_get_attributes_start * for the next record. * * @param it the iterator */ void -GNUNET_IDENTITY_PROVIDER_get_attributes_next (struct GNUNET_IDENTITY_PROVIDER_AttributeIterator *it); +GNUNET_RECLAIM_get_attributes_next (struct GNUNET_RECLAIM_AttributeIterator *it); /** * Stops iteration and releases the idp handle for further calls. Must * be called on any iteration that has not yet completed prior to calling - * #GNUNET_IDENTITY_PROVIDER_disconnect. + * #GNUNET_RECLAIM_disconnect. * * @param it the iterator */ void -GNUNET_IDENTITY_PROVIDER_get_attributes_stop (struct GNUNET_IDENTITY_PROVIDER_AttributeIterator *it); +GNUNET_RECLAIM_get_attributes_stop (struct GNUNET_RECLAIM_AttributeIterator *it); /** @@ -207,12 +207,12 @@ GNUNET_IDENTITY_PROVIDER_get_attributes_stop (struct GNUNET_IDENTITY_PROVIDER_At * @param ticket the ticket */ typedef void -(*GNUNET_IDENTITY_PROVIDER_TicketCallback)(void *cls, - const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket); +(*GNUNET_RECLAIM_TicketCallback)(void *cls, + const struct GNUNET_RECLAIM_Ticket *ticket); /** * Issues a ticket to another identity. The identity may use - * GNUNET_IDENTITY_PROVIDER_ticket_consume to consume the ticket + * GNUNET_RECLAIM_ticket_consume to consume the ticket * and retrieve the attributes specified in the AttributeList. * * @param h the identity provider to use @@ -223,12 +223,12 @@ typedef void * @param cb_cls the callback closure * @return handle to abort the operation */ -struct GNUNET_IDENTITY_PROVIDER_Operation * -GNUNET_IDENTITY_PROVIDER_ticket_issue (struct GNUNET_IDENTITY_PROVIDER_Handle *h, +struct GNUNET_RECLAIM_Operation * +GNUNET_RECLAIM_ticket_issue (struct GNUNET_RECLAIM_Handle *h, const struct GNUNET_CRYPTO_EcdsaPrivateKey *iss, const struct GNUNET_CRYPTO_EcdsaPublicKey *rp, - const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs, - GNUNET_IDENTITY_PROVIDER_TicketCallback cb, + const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs, + GNUNET_RECLAIM_TicketCallback cb, void *cb_cls); /** @@ -242,11 +242,11 @@ GNUNET_IDENTITY_PROVIDER_ticket_issue (struct GNUNET_IDENTITY_PROVIDER_Handle *h * @param cb_cls the callback closure * @return handle to abort the operation */ -struct GNUNET_IDENTITY_PROVIDER_Operation * -GNUNET_IDENTITY_PROVIDER_ticket_revoke (struct GNUNET_IDENTITY_PROVIDER_Handle *h, +struct GNUNET_RECLAIM_Operation * +GNUNET_RECLAIM_ticket_revoke (struct GNUNET_RECLAIM_Handle *h, const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, - const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket, - GNUNET_IDENTITY_PROVIDER_ContinuationWithStatus cb, + const struct GNUNET_RECLAIM_Ticket *ticket, + GNUNET_RECLAIM_ContinuationWithStatus cb, void *cb_cls); @@ -262,11 +262,11 @@ GNUNET_IDENTITY_PROVIDER_ticket_revoke (struct GNUNET_IDENTITY_PROVIDER_Handle * * @param cb_cls the callback closure * @return handle to abort the operation */ -struct GNUNET_IDENTITY_PROVIDER_Operation * -GNUNET_IDENTITY_PROVIDER_ticket_consume (struct GNUNET_IDENTITY_PROVIDER_Handle *h, +struct GNUNET_RECLAIM_Operation * +GNUNET_RECLAIM_ticket_consume (struct GNUNET_RECLAIM_Handle *h, const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, - const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket, - GNUNET_IDENTITY_PROVIDER_AttributeResult cb, + const struct GNUNET_RECLAIM_Ticket *ticket, + GNUNET_RECLAIM_AttributeResult cb, void *cb_cls); /** @@ -286,12 +286,12 @@ GNUNET_IDENTITY_PROVIDER_ticket_consume (struct GNUNET_IDENTITY_PROVIDER_Handle * @param finish_cb_cls closure for @a finish_cb * @return an iterator handle to use for iteration */ -struct GNUNET_IDENTITY_PROVIDER_TicketIterator * -GNUNET_IDENTITY_PROVIDER_ticket_iteration_start (struct GNUNET_IDENTITY_PROVIDER_Handle *h, +struct GNUNET_RECLAIM_TicketIterator * +GNUNET_RECLAIM_ticket_iteration_start (struct GNUNET_RECLAIM_Handle *h, const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, GNUNET_SCHEDULER_TaskCallback error_cb, void *error_cb_cls, - GNUNET_IDENTITY_PROVIDER_TicketCallback proc, + GNUNET_RECLAIM_TicketCallback proc, void *proc_cls, GNUNET_SCHEDULER_TaskCallback finish_cb, void *finish_cb_cls); @@ -313,34 +313,34 @@ GNUNET_IDENTITY_PROVIDER_ticket_iteration_start (struct GNUNET_IDENTITY_PROVIDER * @param finish_cb_cls closure for @a finish_cb * @return an iterator handle to use for iteration */ -struct GNUNET_IDENTITY_PROVIDER_TicketIterator * -GNUNET_IDENTITY_PROVIDER_ticket_iteration_start_rp (struct GNUNET_IDENTITY_PROVIDER_Handle *h, +struct GNUNET_RECLAIM_TicketIterator * +GNUNET_RECLAIM_ticket_iteration_start_rp (struct GNUNET_RECLAIM_Handle *h, const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, GNUNET_SCHEDULER_TaskCallback error_cb, void *error_cb_cls, - GNUNET_IDENTITY_PROVIDER_TicketCallback proc, + GNUNET_RECLAIM_TicketCallback proc, void *proc_cls, GNUNET_SCHEDULER_TaskCallback finish_cb, void *finish_cb_cls); /** - * Calls the record processor specified in #GNUNET_IDENTITY_PROVIDER_ticket_iteration_start + * Calls the record processor specified in #GNUNET_RECLAIM_ticket_iteration_start * for the next record. * * @param it the iterator */ void -GNUNET_IDENTITY_PROVIDER_ticket_iteration_next (struct GNUNET_IDENTITY_PROVIDER_TicketIterator *it); +GNUNET_RECLAIM_ticket_iteration_next (struct GNUNET_RECLAIM_TicketIterator *it); /** * Stops iteration and releases the idp handle for further calls. Must * be called on any iteration that has not yet completed prior to calling - * #GNUNET_IDENTITY_PROVIDER_disconnect. + * #GNUNET_RECLAIM_disconnect. * * @param it the iterator */ void -GNUNET_IDENTITY_PROVIDER_ticket_iteration_stop (struct GNUNET_IDENTITY_PROVIDER_TicketIterator *it); +GNUNET_RECLAIM_ticket_iteration_stop (struct GNUNET_RECLAIM_TicketIterator *it); /** * Disconnect from identity provider service. @@ -348,7 +348,7 @@ GNUNET_IDENTITY_PROVIDER_ticket_iteration_stop (struct GNUNET_IDENTITY_PROVIDER_ * @param h identity provider service to disconnect */ void -GNUNET_IDENTITY_PROVIDER_disconnect (struct GNUNET_IDENTITY_PROVIDER_Handle *h); +GNUNET_RECLAIM_disconnect (struct GNUNET_RECLAIM_Handle *h); /** @@ -360,7 +360,7 @@ GNUNET_IDENTITY_PROVIDER_disconnect (struct GNUNET_IDENTITY_PROVIDER_Handle *h); * @param op operation to cancel */ void -GNUNET_IDENTITY_PROVIDER_cancel (struct GNUNET_IDENTITY_PROVIDER_Operation *op); +GNUNET_RECLAIM_cancel (struct GNUNET_RECLAIM_Operation *op); #if 0 /* keep Emacsens' auto-indent happy */ { @@ -370,9 +370,9 @@ GNUNET_IDENTITY_PROVIDER_cancel (struct GNUNET_IDENTITY_PROVIDER_Operation *op); #endif -/* ifndef GNUNET_IDENTITY_PROVIDER_SERVICE_H */ +/* ifndef GNUNET_RECLAIM_SERVICE_H */ #endif /** @} */ /* end of group identity */ -/* end of gnunet_identity_provider_service.h */ +/* end of gnunet_reclaim_service.h */ diff --git a/src/identity-attribute/Makefile.am b/src/reclaim-attribute/Makefile.am similarity index 57% rename from src/identity-attribute/Makefile.am rename to src/reclaim-attribute/Makefile.am index 2c73a443e..7db2925b1 100644 --- a/src/identity-attribute/Makefile.am +++ b/src/reclaim-attribute/Makefile.am @@ -17,28 +17,28 @@ if USE_COVERAGE endif lib_LTLIBRARIES = \ - libgnunetidentityattribute.la + libgnunetreclaimattribute.la -libgnunetidentityattribute_la_SOURCES = \ - identity_attribute.c -libgnunetidentityattribute_la_LIBADD = \ +libgnunetreclaimattribute_la_SOURCES = \ + reclaim_attribute.c +libgnunetreclaimattribute_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) -libgnunetidentityattribute_la_LDFLAGS = \ +libgnunetreclaimattribute_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) $(WINFLAGS) \ -version-info 0:0:0 plugin_LTLIBRARIES = \ - libgnunet_plugin_identity_attribute_gnuid.la + libgnunet_plugin_reclaim_attribute_gnuid.la -libgnunet_plugin_identity_attribute_gnuid_la_SOURCES = \ - plugin_identity_attribute_gnuid.c -libgnunet_plugin_identity_attribute_gnuid_la_LIBADD = \ +libgnunet_plugin_reclaim_attribute_gnuid_la_SOURCES = \ + plugin_reclaim_attribute_gnuid.c +libgnunet_plugin_reclaim_attribute_gnuid_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(LTLIBINTL) -libgnunet_plugin_identity_attribute_gnuid_la_LDFLAGS = \ +libgnunet_plugin_reclaim_attribute_gnuid_la_LDFLAGS = \ $(GN_PLUGIN_LDFLAGS) diff --git a/src/identity-attribute/plugin_identity_attribute_gnuid.c b/src/reclaim-attribute/plugin_reclaim_attribute_gnuid.c similarity index 86% rename from src/identity-attribute/plugin_identity_attribute_gnuid.c rename to src/reclaim-attribute/plugin_reclaim_attribute_gnuid.c index c09b167f5..48afc0732 100644 --- a/src/identity-attribute/plugin_identity_attribute_gnuid.c +++ b/src/reclaim-attribute/plugin_reclaim_attribute_gnuid.c @@ -17,7 +17,7 @@ */ /** - * @file identity-attribute/plugin_identity_attribute_gnuid.c + * @file reclaim-attribute/plugin_reclaim_attribute_gnuid.c * @brief identity attribute plugin to provide the API for fundamental * attribute types. * @@ -25,7 +25,7 @@ */ #include "platform.h" #include "gnunet_util_lib.h" -#include "gnunet_identity_attribute_plugin.h" +#include "gnunet_reclaim_attribute_plugin.h" #include @@ -47,7 +47,7 @@ gnuid_value_to_string (void *cls, switch (type) { - case GNUNET_IDENTITY_ATTRIBUTE_TYPE_STRING: + case GNUNET_RECLAIM_ATTRIBUTE_TYPE_STRING: return GNUNET_strndup (data, data_size); default: return NULL; @@ -78,7 +78,7 @@ gnuid_string_to_value (void *cls, switch (type) { - case GNUNET_IDENTITY_ATTRIBUTE_TYPE_STRING: + case GNUNET_RECLAIM_ATTRIBUTE_TYPE_STRING: *data = GNUNET_strdup (s); *data_size = strlen (s); return GNUNET_OK; @@ -96,7 +96,7 @@ static struct { const char *name; uint32_t number; } gnuid_name_map[] = { - { "STRING", GNUNET_IDENTITY_ATTRIBUTE_TYPE_STRING }, + { "STRING", GNUNET_RECLAIM_ATTRIBUTE_TYPE_STRING }, { NULL, UINT32_MAX } }; @@ -151,11 +151,11 @@ gnuid_number_to_typename (void *cls, * @return the exported block API */ void * -libgnunet_plugin_identity_attribute_gnuid_init (void *cls) +libgnunet_plugin_reclaim_attribute_gnuid_init (void *cls) { - struct GNUNET_IDENTITY_ATTRIBUTE_PluginFunctions *api; + struct GNUNET_RECLAIM_ATTRIBUTE_PluginFunctions *api; - api = GNUNET_new (struct GNUNET_IDENTITY_ATTRIBUTE_PluginFunctions); + api = GNUNET_new (struct GNUNET_RECLAIM_ATTRIBUTE_PluginFunctions); api->value_to_string = &gnuid_value_to_string; api->string_to_value = &gnuid_string_to_value; api->typename_to_number = &gnuid_typename_to_number; @@ -171,12 +171,12 @@ libgnunet_plugin_identity_attribute_gnuid_init (void *cls) * @return NULL */ void * -libgnunet_plugin_identity_attribute_gnuid_done (void *cls) +libgnunet_plugin_reclaim_attribute_gnuid_done (void *cls) { - struct GNUNET_IDENTITY_ATTRIBUTE_PluginFunctions *api = cls; + struct GNUNET_RECLAIM_ATTRIBUTE_PluginFunctions *api = cls; GNUNET_free (api); return NULL; } -/* end of plugin_identity_attribute_type_gnuid.c */ +/* end of plugin_reclaim_attribute_type_gnuid.c */ diff --git a/src/identity-attribute/identity_attribute.c b/src/reclaim-attribute/reclaim_attribute.c similarity index 75% rename from src/identity-attribute/identity_attribute.c rename to src/reclaim-attribute/reclaim_attribute.c index 7d47c46a7..74d668ea8 100644 --- a/src/identity-attribute/identity_attribute.c +++ b/src/reclaim-attribute/reclaim_attribute.c @@ -17,14 +17,14 @@ */ /** - * @file identity-attribute/identity_attribute.c + * @file reclaim-attribute/reclaim_attribute.c * @brief helper library to manage identity attributes * @author Martin Schanzenbach */ #include "platform.h" #include "gnunet_util_lib.h" -#include "identity_attribute.h" -#include "gnunet_identity_attribute_plugin.h" +#include "reclaim_attribute.h" +#include "gnunet_reclaim_attribute_plugin.h" /** * Handle for a plugin @@ -39,7 +39,7 @@ struct Plugin /** * Plugin API */ - struct GNUNET_IDENTITY_ATTRIBUTE_PluginFunctions *api; + struct GNUNET_RECLAIM_ATTRIBUTE_PluginFunctions *api; }; /** @@ -65,7 +65,7 @@ add_plugin (void* cls, const char *library_name, void *lib_ret) { - struct GNUNET_IDENTITY_ATTRIBUTE_PluginFunctions *api = lib_ret; + struct GNUNET_RECLAIM_ATTRIBUTE_PluginFunctions *api = lib_ret; struct Plugin *plugin; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, @@ -86,7 +86,7 @@ init() if (GNUNET_YES == initialized) return; initialized = GNUNET_YES; - GNUNET_PLUGIN_load_all ("libgnunet_plugin_identity_attribute_", NULL, + GNUNET_PLUGIN_load_all ("libgnunet_plugin_reclaim_attribute_", NULL, &add_plugin, NULL); } @@ -97,7 +97,7 @@ init() * @return corresponding number, UINT32_MAX on error */ uint32_t -GNUNET_IDENTITY_ATTRIBUTE_typename_to_number (const char *typename) +GNUNET_RECLAIM_ATTRIBUTE_typename_to_number (const char *typename) { unsigned int i; struct Plugin *plugin; @@ -121,7 +121,7 @@ GNUNET_IDENTITY_ATTRIBUTE_typename_to_number (const char *typename) * @return corresponding typestring, NULL on error */ const char* -GNUNET_IDENTITY_ATTRIBUTE_number_to_typename (uint32_t type) +GNUNET_RECLAIM_ATTRIBUTE_number_to_typename (uint32_t type) { unsigned int i; struct Plugin *plugin; @@ -149,7 +149,7 @@ GNUNET_IDENTITY_ATTRIBUTE_number_to_typename (uint32_t type) * @return #GNUNET_OK on success */ int -GNUNET_IDENTITY_ATTRIBUTE_string_to_value (uint32_t type, +GNUNET_RECLAIM_ATTRIBUTE_string_to_value (uint32_t type, const char *s, void **data, size_t *data_size) @@ -180,7 +180,7 @@ GNUNET_IDENTITY_ATTRIBUTE_string_to_value (uint32_t type, * @return NULL on error, otherwise human-readable representation of the claim */ char * -GNUNET_IDENTITY_ATTRIBUTE_value_to_string (uint32_t type, +GNUNET_RECLAIM_ATTRIBUTE_value_to_string (uint32_t type, const void* data, size_t data_size) { @@ -210,16 +210,16 @@ GNUNET_IDENTITY_ATTRIBUTE_value_to_string (uint32_t type, * @param data_size the attribute value size * @return the new attribute */ -struct GNUNET_IDENTITY_ATTRIBUTE_Claim * -GNUNET_IDENTITY_ATTRIBUTE_claim_new (const char* attr_name, +struct GNUNET_RECLAIM_ATTRIBUTE_Claim * +GNUNET_RECLAIM_ATTRIBUTE_claim_new (const char* attr_name, uint32_t type, const void* data, size_t data_size) { - struct GNUNET_IDENTITY_ATTRIBUTE_Claim *attr; + struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr; char *write_ptr; - attr = GNUNET_malloc (sizeof (struct GNUNET_IDENTITY_ATTRIBUTE_Claim) + + attr = GNUNET_malloc (sizeof (struct GNUNET_RECLAIM_ATTRIBUTE_Claim) + strlen (attr_name) + 1 + data_size); attr->type = type; @@ -249,15 +249,15 @@ GNUNET_IDENTITY_ATTRIBUTE_claim_new (const char* attr_name, * @return */ void -GNUNET_IDENTITY_ATTRIBUTE_list_add (struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *claim_list, +GNUNET_RECLAIM_ATTRIBUTE_list_add (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *claim_list, const char* attr_name, uint32_t type, const void* data, size_t data_size) { - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *le; - le = GNUNET_new (struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry); - le->claim = GNUNET_IDENTITY_ATTRIBUTE_claim_new (attr_name, + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *le; + le = GNUNET_new (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry); + le->claim = GNUNET_RECLAIM_ATTRIBUTE_claim_new (attr_name, type, data, data_size); @@ -267,20 +267,20 @@ GNUNET_IDENTITY_ATTRIBUTE_list_add (struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList * } size_t -GNUNET_IDENTITY_ATTRIBUTE_list_serialize_get_size (const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs) +GNUNET_RECLAIM_ATTRIBUTE_list_serialize_get_size (const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs) { - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *le; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *le; size_t len = 0; for (le = attrs->list_head; NULL != le; le = le->next) - len += GNUNET_IDENTITY_ATTRIBUTE_serialize_get_size (le->claim); + len += GNUNET_RECLAIM_ATTRIBUTE_serialize_get_size (le->claim); return len; } size_t -GNUNET_IDENTITY_ATTRIBUTE_list_serialize (const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs, +GNUNET_RECLAIM_ATTRIBUTE_list_serialize (const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs, char *result) { - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *le; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *le; size_t len; size_t total_len; char* write_ptr; @@ -289,7 +289,7 @@ GNUNET_IDENTITY_ATTRIBUTE_list_serialize (const struct GNUNET_IDENTITY_ATTRIBUTE total_len = 0; for (le = attrs->list_head; NULL != le; le = le->next) { - len = GNUNET_IDENTITY_ATTRIBUTE_serialize (le->claim, + len = GNUNET_RECLAIM_ATTRIBUTE_serialize (le->claim, write_ptr); total_len += len; write_ptr += len; @@ -297,49 +297,49 @@ GNUNET_IDENTITY_ATTRIBUTE_list_serialize (const struct GNUNET_IDENTITY_ATTRIBUTE return total_len; } -struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList * -GNUNET_IDENTITY_ATTRIBUTE_list_deserialize (const char* data, +struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList * +GNUNET_RECLAIM_ATTRIBUTE_list_deserialize (const char* data, size_t data_size) { - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs; - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *le; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *le; size_t attr_len; const char* read_ptr; if (data_size < sizeof (struct Attribute)) return NULL; - attrs = GNUNET_new (struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList); + attrs = GNUNET_new (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList); read_ptr = data; while (((data + data_size) - read_ptr) >= sizeof (struct Attribute)) { - le = GNUNET_new (struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry); - le->claim = GNUNET_IDENTITY_ATTRIBUTE_deserialize (read_ptr, + le = GNUNET_new (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry); + le->claim = GNUNET_RECLAIM_ATTRIBUTE_deserialize (read_ptr, data_size - (read_ptr - data)); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Deserialized attribute %s\n", le->claim->name); GNUNET_CONTAINER_DLL_insert (attrs->list_head, attrs->list_tail, le); - attr_len = GNUNET_IDENTITY_ATTRIBUTE_serialize_get_size (le->claim); + attr_len = GNUNET_RECLAIM_ATTRIBUTE_serialize_get_size (le->claim); read_ptr += attr_len; } return attrs; } -struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList* -GNUNET_IDENTITY_ATTRIBUTE_list_dup (const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs) +struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList* +GNUNET_RECLAIM_ATTRIBUTE_list_dup (const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs) { - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *le; - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *result_le; - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *result; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *le; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *result_le; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *result; - result = GNUNET_new (struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList); + result = GNUNET_new (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList); for (le = attrs->list_head; NULL != le; le = le->next) { - result_le = GNUNET_new (struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry); - result_le->claim = GNUNET_IDENTITY_ATTRIBUTE_claim_new (le->claim->name, + result_le = GNUNET_new (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry); + result_le->claim = GNUNET_RECLAIM_ATTRIBUTE_claim_new (le->claim->name, le->claim->type, le->claim->data, le->claim->data_size); @@ -352,10 +352,10 @@ GNUNET_IDENTITY_ATTRIBUTE_list_dup (const struct GNUNET_IDENTITY_ATTRIBUTE_Claim void -GNUNET_IDENTITY_ATTRIBUTE_list_destroy (struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs) +GNUNET_RECLAIM_ATTRIBUTE_list_destroy (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs) { - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *le; - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *tmp_le; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *le; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *tmp_le; for (le = attrs->list_head; NULL != le;) { @@ -369,7 +369,7 @@ GNUNET_IDENTITY_ATTRIBUTE_list_destroy (struct GNUNET_IDENTITY_ATTRIBUTE_ClaimLi } size_t -GNUNET_IDENTITY_ATTRIBUTE_serialize_get_size (const struct GNUNET_IDENTITY_ATTRIBUTE_Claim *attr) +GNUNET_RECLAIM_ATTRIBUTE_serialize_get_size (const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr) { return sizeof (struct Attribute) + strlen (attr->name) @@ -377,7 +377,7 @@ GNUNET_IDENTITY_ATTRIBUTE_serialize_get_size (const struct GNUNET_IDENTITY_ATTRI } size_t -GNUNET_IDENTITY_ATTRIBUTE_serialize (const struct GNUNET_IDENTITY_ATTRIBUTE_Claim *attr, +GNUNET_RECLAIM_ATTRIBUTE_serialize (const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr, char *result) { size_t data_len_ser; @@ -403,11 +403,11 @@ GNUNET_IDENTITY_ATTRIBUTE_serialize (const struct GNUNET_IDENTITY_ATTRIBUTE_Clai return sizeof (struct Attribute) + strlen (attr->name) + attr->data_size; } -struct GNUNET_IDENTITY_ATTRIBUTE_Claim * -GNUNET_IDENTITY_ATTRIBUTE_deserialize (const char* data, +struct GNUNET_RECLAIM_ATTRIBUTE_Claim * +GNUNET_RECLAIM_ATTRIBUTE_deserialize (const char* data, size_t data_size) { - struct GNUNET_IDENTITY_ATTRIBUTE_Claim *attr; + struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr; struct Attribute *attr_ser; size_t data_len; size_t name_len; @@ -419,7 +419,7 @@ GNUNET_IDENTITY_ATTRIBUTE_deserialize (const char* data, attr_ser = (struct Attribute*)data; data_len = ntohs (attr_ser->data_size); name_len = ntohs (attr_ser->name_len); - attr = GNUNET_malloc (sizeof (struct GNUNET_IDENTITY_ATTRIBUTE_Claim) + attr = GNUNET_malloc (sizeof (struct GNUNET_RECLAIM_ATTRIBUTE_Claim) + data_len + name_len + 1); attr->type = ntohs (attr_ser->attribute_type); attr->version = ntohl (attr_ser->attribute_version); @@ -441,4 +441,4 @@ GNUNET_IDENTITY_ATTRIBUTE_deserialize (const char* data, } -/* end of identity_attribute.c */ +/* end of reclaim_attribute.c */ diff --git a/src/identity-attribute/identity_attribute.h b/src/reclaim-attribute/reclaim_attribute.h similarity index 85% rename from src/identity-attribute/identity_attribute.h rename to src/reclaim-attribute/reclaim_attribute.h index 2346dcde1..746d32980 100644 --- a/src/identity-attribute/identity_attribute.h +++ b/src/reclaim-attribute/reclaim_attribute.h @@ -17,14 +17,14 @@ */ /** * @author Martin Schanzenbach - * @file identity-attribute/identity_attribute.h - * @brief GNUnet Identity attributes + * @file reclaim-attribute/reclaim_attribute.h + * @brief GNUnet reclaim identity attributes * */ -#ifndef IDENTITY_ATTRIBUTE_H -#define IDENTITY_ATTRIBUTE_H +#ifndef RECLAIM_ATTRIBUTE_H +#define RECLAIM_ATTRIBUTE_H -#include "gnunet_identity_provider_service.h" +#include "gnunet_reclaim_service.h" struct Attribute { diff --git a/src/identity-provider/.gitignore b/src/reclaim/.gitignore similarity index 100% rename from src/identity-provider/.gitignore rename to src/reclaim/.gitignore diff --git a/src/identity-provider/Makefile.am b/src/reclaim/Makefile.am similarity index 66% rename from src/identity-provider/Makefile.am rename to src/reclaim/Makefile.am index 2eb699542..c13c68763 100644 --- a/src/identity-provider/Makefile.am +++ b/src/reclaim/Makefile.am @@ -13,12 +13,12 @@ if USE_COVERAGE endif if HAVE_SQLITE -SQLITE_PLUGIN = libgnunet_plugin_identity_provider_sqlite.la +SQLITE_PLUGIN = libgnunet_plugin_reclaim_sqlite.la endif EXTRA_DIST = \ - test_idp_defaults.conf \ - test_idp.conf \ + test_reclaim_defaults.conf \ + test_reclaim.conf \ $(check_SCRIPTS) pkgcfgdir= $(pkgdatadir)/config.d/ @@ -26,46 +26,46 @@ pkgcfgdir= $(pkgdatadir)/config.d/ libexecdir= $(pkglibdir)/libexec/ pkgcfg_DATA = \ - identity-provider.conf + reclaim.conf lib_LTLIBRARIES = \ libgnunetidentityprovider.la plugin_LTLIBRARIES = \ - libgnunet_plugin_rest_identity_provider.la \ + libgnunet_plugin_rest_reclaim.la \ libgnunet_plugin_rest_openid_connect.la \ - libgnunet_plugin_gnsrecord_identity_provider.la \ + libgnunet_plugin_gnsrecord_reclaim.la \ $(SQLITE_PLUGIN) bin_PROGRAMS = \ - gnunet-idp + gnunet-reclaim libexec_PROGRAMS = \ - gnunet-service-identity-provider + gnunet-service-reclaim -libgnunet_plugin_gnsrecord_identity_provider_la_SOURCES = \ - plugin_gnsrecord_identity_provider.c -libgnunet_plugin_gnsrecord_identity_provider_la_LIBADD = \ +libgnunet_plugin_gnsrecord_reclaim_la_SOURCES = \ + plugin_gnsrecord_reclaim.c +libgnunet_plugin_gnsrecord_reclaim_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(LTLIBINTL) -libgnunet_plugin_gnsrecord_identity_provider_la_LDFLAGS = \ +libgnunet_plugin_gnsrecord_reclaim_la_LDFLAGS = \ $(GN_PLUGIN_LDFLAGS) -libgnunet_plugin_identity_provider_sqlite_la_SOURCES = \ - plugin_identity_provider_sqlite.c -libgnunet_plugin_identity_provider_sqlite_la_LIBADD = \ +libgnunet_plugin_reclaim_sqlite_la_SOURCES = \ + plugin_reclaim_sqlite.c +libgnunet_plugin_reclaim_sqlite_la_LIBADD = \ libgnunetidentityprovider.la \ $(top_builddir)/src/sq/libgnunetsq.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) -lsqlite3 \ $(LTLIBINTL) -libgnunet_plugin_identity_provider_sqlite_la_LDFLAGS = \ +libgnunet_plugin_reclaim_sqlite_la_LDFLAGS = \ $(GN_PLUGIN_LDFLAGS) -gnunet_service_identity_provider_SOURCES = \ - gnunet-service-identity-provider.c -gnunet_service_identity_provider_LDADD = \ +gnunet_service_reclaim_SOURCES = \ + gnunet-service-reclaim.c +gnunet_service_reclaim_LDADD = \ $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/namestore/libgnunetnamestore.la \ @@ -73,14 +73,14 @@ gnunet_service_identity_provider_LDADD = \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ $(top_builddir)/src/abe/libgnunetabe.la \ $(top_builddir)/src/credential/libgnunetcredential.la \ - $(top_builddir)/src/identity-attribute/libgnunetidentityattribute.la \ + $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \ libgnunetidentityprovider.la \ $(top_builddir)/src/gns/libgnunetgns.la \ $(GN_LIBINTL) libgnunetidentityprovider_la_SOURCES = \ - identity_provider_api.c \ - identity_provider.h + reclaim_api.c \ + reclaim.h libgnunetidentityprovider_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(GN_LIBINTL) $(XLIB) @@ -88,19 +88,19 @@ libgnunetidentityprovider_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) $(WINFLAGS) \ -version-info 0:0:0 -libgnunet_plugin_rest_identity_provider_la_SOURCES = \ - plugin_rest_identity_provider.c \ +libgnunet_plugin_rest_reclaim_la_SOURCES = \ + plugin_rest_reclaim.c \ jwt.c -libgnunet_plugin_rest_identity_provider_la_LIBADD = \ +libgnunet_plugin_rest_reclaim_la_LIBADD = \ $(top_builddir)/src/identity/libgnunetidentity.la \ libgnunetidentityprovider.la \ $(top_builddir)/src/rest/libgnunetrest.la \ $(top_builddir)/src/jsonapi/libgnunetjsonapi.la \ - $(top_builddir)/src/identity-attribute/libgnunetidentityattribute.la \ + $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \ $(top_builddir)/src/namestore/libgnunetnamestore.la \ $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ $(LTLIBINTL) -ljansson -lmicrohttpd -libgnunet_plugin_rest_identity_provider_la_LDFLAGS = \ +libgnunet_plugin_rest_reclaim_la_LDFLAGS = \ $(GN_PLUGIN_LDFLAGS) libgnunet_plugin_rest_openid_connect_la_SOURCES = \ @@ -111,28 +111,28 @@ libgnunet_plugin_rest_openid_connect_la_LIBADD = \ libgnunetidentityprovider.la \ $(top_builddir)/src/rest/libgnunetrest.la \ $(top_builddir)/src/jsonapi/libgnunetjsonapi.la \ - $(top_builddir)/src/identity-attribute/libgnunetidentityattribute.la \ + $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \ $(top_builddir)/src/namestore/libgnunetnamestore.la \ $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \ $(LTLIBINTL) -ljansson -lmicrohttpd libgnunet_plugin_rest_openid_connect_la_LDFLAGS = \ $(GN_PLUGIN_LDFLAGS) -gnunet_idp_SOURCES = \ - gnunet-idp.c -gnunet_idp_LDADD = \ +gnunet_reclaim_SOURCES = \ + gnunet-reclaim.c +gnunet_reclaim_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/namestore/libgnunetnamestore.la \ libgnunetidentityprovider.la \ $(top_builddir)/src/identity/libgnunetidentity.la \ - $(top_builddir)/src/identity-attribute/libgnunetidentityattribute.la \ + $(top_builddir)/src/reclaim-attribute/libgnunetreclaimattribute.la \ $(GN_LIBINTL) check_SCRIPTS = \ - test_idp_attribute.sh \ - test_idp_issue.sh \ - test_idp_consume.sh \ - test_idp_revoke.sh + test_reclaim_attribute.sh \ + test_reclaim_issue.sh \ + test_reclaim_consume.sh \ + test_reclaim_revoke.sh if ENABLE_TEST_RUN AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; diff --git a/src/identity-provider/gnunet-idp.c b/src/reclaim/gnunet-reclaim.c similarity index 71% rename from src/identity-provider/gnunet-idp.c rename to src/reclaim/gnunet-reclaim.c index 79e4f8d27..9947eac6d 100644 --- a/src/identity-provider/gnunet-idp.c +++ b/src/reclaim/gnunet-reclaim.c @@ -17,7 +17,7 @@ */ /** * @author Martin Schanzenbach - * @file src/identity-provider/gnunet-idp.c + * @file src/reclaim/gnunet-reclaim.c * @brief Identity Provider utility * */ @@ -25,7 +25,7 @@ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_namestore_service.h" -#include "gnunet_identity_provider_service.h" +#include "gnunet_reclaim_service.h" #include "gnunet_identity_service.h" #include "gnunet_signatures.h" @@ -85,19 +85,19 @@ static char* ego_name; static struct GNUNET_IDENTITY_Handle *identity_handle; /** - * IdP handle + * reclaim handle */ -static struct GNUNET_IDENTITY_PROVIDER_Handle *idp_handle; +static struct GNUNET_RECLAIM_Handle *reclaim_handle; /** - * IdP operation + * reclaim operation */ -static struct GNUNET_IDENTITY_PROVIDER_Operation *idp_op; +static struct GNUNET_RECLAIM_Operation *reclaim_op; /** * Attribute iterator */ -static struct GNUNET_IDENTITY_PROVIDER_AttributeIterator *attr_iterator; +static struct GNUNET_RECLAIM_AttributeIterator *attr_iterator; /** * Master ABE key @@ -117,12 +117,12 @@ static struct GNUNET_CRYPTO_EcdsaPublicKey rp_key; /** * Ticket to consume */ -static struct GNUNET_IDENTITY_PROVIDER_Ticket ticket; +static struct GNUNET_RECLAIM_Ticket ticket; /** * Attribute list */ -static struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attr_list; +static struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attr_list; /** * Attribute expiration interval @@ -139,12 +139,12 @@ do_cleanup(void *cls) { if (NULL != timeout) GNUNET_SCHEDULER_cancel (timeout); - if (NULL != idp_op) - GNUNET_IDENTITY_PROVIDER_cancel (idp_op); + if (NULL != reclaim_op) + GNUNET_RECLAIM_cancel (reclaim_op); if (NULL != attr_iterator) - GNUNET_IDENTITY_PROVIDER_get_attributes_stop (attr_iterator); - if (NULL != idp_handle) - GNUNET_IDENTITY_PROVIDER_disconnect (idp_handle); + GNUNET_RECLAIM_get_attributes_stop (attr_iterator); + if (NULL != reclaim_handle) + GNUNET_RECLAIM_disconnect (reclaim_handle); if (NULL != identity_handle) GNUNET_IDENTITY_disconnect (identity_handle); if (NULL != abe_key) @@ -155,13 +155,13 @@ do_cleanup(void *cls) static void ticket_issue_cb (void* cls, - const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket) + const struct GNUNET_RECLAIM_Ticket *ticket) { char* ticket_str; - idp_op = NULL; + reclaim_op = NULL; if (NULL != ticket) { ticket_str = GNUNET_STRINGS_data_to_string_alloc (ticket, - sizeof (struct GNUNET_IDENTITY_PROVIDER_Ticket)); + sizeof (struct GNUNET_RECLAIM_Ticket)); printf("%s\n", ticket_str); GNUNET_free (ticket_str); @@ -174,7 +174,7 @@ store_attr_cont (void *cls, int32_t success, const char*emsg) { - idp_op = NULL; + reclaim_op = NULL; if (GNUNET_SYSERR == success) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s\n", emsg); @@ -185,12 +185,12 @@ store_attr_cont (void *cls, static void process_attrs (void *cls, const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, - const struct GNUNET_IDENTITY_ATTRIBUTE_Claim *attr) + const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr) { char *value_str; if (NULL == identity) { - idp_op = NULL; + reclaim_op = NULL; GNUNET_SCHEDULER_add_now (&do_cleanup, NULL); return; } @@ -199,9 +199,9 @@ process_attrs (void *cls, ret = 1; return; } - value_str = GNUNET_IDENTITY_ATTRIBUTE_value_to_string (attr->type, - attr->data, - attr->data_size); + value_str = GNUNET_RECLAIM_ATTRIBUTE_value_to_string (attr->type, + attr->data, + attr->data_size); GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, "%s: %s\n", attr->name, value_str); } @@ -229,7 +229,7 @@ timeout_task (void *cls) static void process_rvk (void *cls, int success, const char* msg) { - idp_op = NULL; + reclaim_op = NULL; if (GNUNET_OK != success) { GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, @@ -242,7 +242,7 @@ process_rvk (void *cls, int success, const char* msg) static void iter_finished (void *cls) { - struct GNUNET_IDENTITY_ATTRIBUTE_Claim *claim; + struct GNUNET_RECLAIM_ATTRIBUTE_Claim *claim; char *data; size_t data_size; int type; @@ -256,21 +256,21 @@ iter_finished (void *cls) if (issue_attrs) { - idp_op = GNUNET_IDENTITY_PROVIDER_ticket_issue (idp_handle, - pkey, - &rp_key, - attr_list, - &ticket_issue_cb, - NULL); + reclaim_op = GNUNET_RECLAIM_ticket_issue (reclaim_handle, + pkey, + &rp_key, + attr_list, + &ticket_issue_cb, + NULL); return; } if (consume_ticket) { - idp_op = GNUNET_IDENTITY_PROVIDER_ticket_consume (idp_handle, - pkey, - &ticket, - &process_attrs, - NULL); + reclaim_op = GNUNET_RECLAIM_ticket_consume (reclaim_handle, + pkey, + &ticket, + &process_attrs, + NULL); timeout = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 10), &timeout_task, NULL); @@ -278,34 +278,34 @@ iter_finished (void *cls) } if (revoke_ticket) { - idp_op = GNUNET_IDENTITY_PROVIDER_ticket_revoke (idp_handle, - pkey, - &ticket, - &process_rvk, - NULL); + reclaim_op = GNUNET_RECLAIM_ticket_revoke (reclaim_handle, + pkey, + &ticket, + &process_rvk, + NULL); return; } if (attr_name) { if (NULL == type_str) - type = GNUNET_IDENTITY_ATTRIBUTE_TYPE_STRING; + type = GNUNET_RECLAIM_ATTRIBUTE_TYPE_STRING; else - type = GNUNET_IDENTITY_ATTRIBUTE_typename_to_number (type_str); + type = GNUNET_RECLAIM_ATTRIBUTE_typename_to_number (type_str); - GNUNET_assert (GNUNET_SYSERR != GNUNET_IDENTITY_ATTRIBUTE_string_to_value (type, - attr_value, - (void**)&data, - &data_size)); - claim = GNUNET_IDENTITY_ATTRIBUTE_claim_new (attr_name, + GNUNET_assert (GNUNET_SYSERR != GNUNET_RECLAIM_ATTRIBUTE_string_to_value (type, + attr_value, + (void**)&data, + &data_size)); + claim = GNUNET_RECLAIM_ATTRIBUTE_claim_new (attr_name, type, data, data_size); - idp_op = GNUNET_IDENTITY_PROVIDER_attribute_store (idp_handle, - pkey, - claim, - &exp_interval, - &store_attr_cont, - NULL); + reclaim_op = GNUNET_RECLAIM_attribute_store (reclaim_handle, + pkey, + claim, + &exp_interval, + &store_attr_cont, + NULL); return; } GNUNET_SCHEDULER_add_now (&do_cleanup, NULL); @@ -314,9 +314,9 @@ iter_finished (void *cls) static void iter_cb (void *cls, const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, - const struct GNUNET_IDENTITY_ATTRIBUTE_Claim *attr) + const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr) { - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *le; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *le; char *attrs_tmp; char *attr_str; @@ -329,11 +329,11 @@ iter_cb (void *cls, attr_str = strtok (NULL, ","); continue; } - le = GNUNET_new (struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry); - le->claim = GNUNET_IDENTITY_ATTRIBUTE_claim_new (attr->name, - attr->type, - attr->data, - attr->data_size); + le = GNUNET_new (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry); + le->claim = GNUNET_RECLAIM_ATTRIBUTE_claim_new (attr->name, + attr->type, + attr->data, + attr->data_size); GNUNET_CONTAINER_DLL_insert (attr_list->list_head, attr_list->list_tail, le); @@ -344,7 +344,7 @@ iter_cb (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, "%s: %s\n", attr->name, (char*)attr->data); } - GNUNET_IDENTITY_PROVIDER_get_attributes_next (attr_iterator); + GNUNET_RECLAIM_get_attributes_next (attr_iterator); } static void @@ -365,24 +365,24 @@ ego_iter_finished (void *cls) GNUNET_STRINGS_string_to_data (consume_ticket, strlen (consume_ticket), &ticket, - sizeof (struct GNUNET_IDENTITY_PROVIDER_Ticket)); + sizeof (struct GNUNET_RECLAIM_Ticket)); if (NULL != revoke_ticket) GNUNET_STRINGS_string_to_data (revoke_ticket, strlen (revoke_ticket), &ticket, - sizeof (struct GNUNET_IDENTITY_PROVIDER_Ticket)); + sizeof (struct GNUNET_RECLAIM_Ticket)); - attr_list = GNUNET_new (struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList); + attr_list = GNUNET_new (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList); - attr_iterator = GNUNET_IDENTITY_PROVIDER_get_attributes_start (idp_handle, - pkey, - &iter_error, - NULL, - &iter_cb, - NULL, - &iter_finished, - NULL); + attr_iterator = GNUNET_RECLAIM_get_attributes_start (reclaim_handle, + pkey, + &iter_error, + NULL, + &iter_cb, + NULL, + &iter_finished, + NULL); } @@ -439,7 +439,7 @@ run (void *cls, return; } - idp_handle = GNUNET_IDENTITY_PROVIDER_connect (c); + reclaim_handle = GNUNET_RECLAIM_connect (c); //Get Ego identity_handle = GNUNET_IDENTITY_connect (c, &ego_cb, diff --git a/src/identity-provider/gnunet-service-identity-provider.c b/src/reclaim/gnunet-service-reclaim.c similarity index 93% rename from src/identity-provider/gnunet-service-identity-provider.c rename to src/reclaim/gnunet-service-reclaim.c index 4563fdfa1..bf8780a92 100644 --- a/src/identity-provider/gnunet-service-identity-provider.c +++ b/src/reclaim/gnunet-service-reclaim.c @@ -17,8 +17,8 @@ */ /** * @author Martin Schanzenbach - * @file src/identity-provider/gnunet-service-identity-provider.c - * @brief Identity Token Service + * @file src/reclaim/gnunet-service-reclaim.c + * @brief reclaim Service * */ #include "platform.h" @@ -32,10 +32,10 @@ #include "gnunet_credential_service.h" #include "gnunet_statistics_service.h" #include "gnunet_gns_service.h" -#include "gnunet_identity_provider_plugin.h" -#include "gnunet_identity_attribute_lib.h" +#include "gnunet_reclaim_plugin.h" +#include "gnunet_reclaim_attribute_lib.h" #include "gnunet_signatures.h" -#include "identity_provider.h" +#include "reclaim.h" /** * First pass state @@ -65,7 +65,7 @@ static struct GNUNET_IDENTITY_Handle *identity_handle; /** * Database handle */ -static struct GNUNET_IDENTITY_PROVIDER_PluginFunctions *TKT_database; +static struct GNUNET_RECLAIM_PluginFunctions *TKT_database; /** * Name of DB plugin @@ -396,7 +396,7 @@ struct AttributeStoreHandle /** * The attribute to store */ - struct GNUNET_IDENTITY_ATTRIBUTE_Claim *claim; + struct GNUNET_RECLAIM_ATTRIBUTE_Claim *claim; /** * The attribute expiration interval @@ -433,7 +433,7 @@ struct ConsumeTicketHandle /** * Ticket */ - struct GNUNET_IDENTITY_PROVIDER_Ticket ticket; + struct GNUNET_RECLAIM_Ticket ticket; /** * LookupRequest @@ -473,7 +473,7 @@ struct ConsumeTicketHandle /** * Attributes */ - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs; /** * Lookup time @@ -535,12 +535,12 @@ struct TicketRevocationHandle /** * Attributes to reissue */ - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs; /** * Attributes to revoke */ - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *rvk_attrs; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *rvk_attrs; /** * Issuer Key @@ -550,7 +550,7 @@ struct TicketRevocationHandle /** * Ticket to issue */ - struct GNUNET_IDENTITY_PROVIDER_Ticket ticket; + struct GNUNET_RECLAIM_Ticket ticket; /** * QueueEntry @@ -603,7 +603,7 @@ struct TicketIssueHandle /** * Attributes to issue */ - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs; /** * Issuer Key @@ -613,7 +613,7 @@ struct TicketIssueHandle /** * Ticket to issue */ - struct GNUNET_IDENTITY_PROVIDER_Ticket ticket; + struct GNUNET_RECLAIM_Ticket ticket; /** * QueueEntry @@ -861,7 +861,7 @@ static void cleanup_ticket_issue_handle (struct TicketIssueHandle *handle) { if (NULL != handle->attrs) - GNUNET_IDENTITY_ATTRIBUTE_list_destroy (handle->attrs); + GNUNET_RECLAIM_ATTRIBUTE_list_destroy (handle->attrs); if (NULL != handle->ns_qe) GNUNET_NAMESTORE_cancel (handle->ns_qe); GNUNET_free (handle); @@ -871,12 +871,12 @@ cleanup_ticket_issue_handle (struct TicketIssueHandle *handle) static void send_ticket_result (struct IdpClient *client, uint32_t r_id, - const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket, - const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs) + const struct GNUNET_RECLAIM_Ticket *ticket, + const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs) { struct TicketResultMessage *irm; struct GNUNET_MQ_Envelope *env; - struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket_buf; + struct GNUNET_RECLAIM_Ticket *ticket_buf; /* store ticket in DB */ if (GNUNET_OK != TKT_database->store_ticket (TKT_database->cls, @@ -889,9 +889,9 @@ send_ticket_result (struct IdpClient *client, } env = GNUNET_MQ_msg_extra (irm, - sizeof (struct GNUNET_IDENTITY_PROVIDER_Ticket), - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_RESULT); - ticket_buf = (struct GNUNET_IDENTITY_PROVIDER_Ticket *)&irm[1]; + sizeof (struct GNUNET_RECLAIM_Ticket), + GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_RESULT); + ticket_buf = (struct GNUNET_RECLAIM_Ticket *)&irm[1]; *ticket_buf = *ticket; irm->id = htonl (r_id); GNUNET_MQ_send (client->mq, @@ -927,14 +927,14 @@ store_ticket_issue_cont (void *cls, int -serialize_abe_keyinfo2 (const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket, - const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs, +serialize_abe_keyinfo2 (const struct GNUNET_RECLAIM_Ticket *ticket, + const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs, const struct GNUNET_ABE_AbeKey *rp_key, struct GNUNET_CRYPTO_EcdhePrivateKey **ecdh_privkey, char **result) { struct GNUNET_CRYPTO_EcdhePublicKey ecdh_pubkey; - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *le; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *le; char *enc_keyinfo; char *serialized_key; char *buf; @@ -1009,7 +1009,7 @@ issue_ticket_after_abe_bootstrap (void *cls, struct GNUNET_ABE_AbeMasterKey *abe_key) { struct TicketIssueHandle *ih = cls; - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *le; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *le; struct GNUNET_CRYPTO_EcdhePrivateKey *ecdhe_privkey; struct GNUNET_GNSRECORD_Data code_record[1]; struct GNUNET_ABE_AbeKey *rp_key; @@ -1101,7 +1101,7 @@ handle_issue_ticket_message (void *cls, ih = GNUNET_new (struct TicketIssueHandle); attrs_len = ntohs (im->attr_len); - ih->attrs = GNUNET_IDENTITY_ATTRIBUTE_list_deserialize ((char*)&im[1], attrs_len); + ih->attrs = GNUNET_RECLAIM_ATTRIBUTE_list_deserialize ((char*)&im[1], attrs_len); ih->r_id = ntohl (im->id); ih->client = idp; ih->identity = im->identity; @@ -1132,9 +1132,9 @@ static void cleanup_revoke_ticket_handle (struct TicketRevocationHandle *rh) { if (NULL != rh->attrs) - GNUNET_IDENTITY_ATTRIBUTE_list_destroy (rh->attrs); + GNUNET_RECLAIM_ATTRIBUTE_list_destroy (rh->attrs); if (NULL != rh->rvk_attrs) - GNUNET_IDENTITY_ATTRIBUTE_list_destroy (rh->rvk_attrs); + GNUNET_RECLAIM_ATTRIBUTE_list_destroy (rh->rvk_attrs); if (NULL != rh->abe_key) GNUNET_ABE_cpabe_delete_master_key (rh->abe_key); if (NULL != rh->ns_qe) @@ -1162,7 +1162,7 @@ send_revocation_finished (struct TicketRevocationHandle *rh, &rh->ticket)); env = GNUNET_MQ_msg (trm, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_REVOKE_TICKET_RESULT); + GNUNET_MESSAGE_TYPE_RECLAIM_REVOKE_TICKET_RESULT); trm->id = htonl (rh->r_id); trm->success = htonl (success); GNUNET_MQ_send (rh->client->mq, @@ -1182,8 +1182,8 @@ send_revocation_finished (struct TicketRevocationHandle *rh, */ static void ticket_reissue_proc (void *cls, - const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket, - const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs); + const struct GNUNET_RECLAIM_Ticket *ticket, + const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs); static void revocation_reissue_tickets (struct TicketRevocationHandle *rh); @@ -1226,12 +1226,12 @@ reissue_ticket_cont (void *cls, */ static void ticket_reissue_proc (void *cls, - const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket, - const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs) + const struct GNUNET_RECLAIM_Ticket *ticket, + const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs) { struct TicketRevocationHandle *rh = cls; - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *le; - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *le_rollover; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *le; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *le_rollover; struct GNUNET_CRYPTO_EcdhePrivateKey *ecdhe_privkey; struct GNUNET_GNSRECORD_Data code_record[1]; struct GNUNET_ABE_AbeKey *rp_key; @@ -1437,9 +1437,9 @@ check_attr_cb (void *cls, return; } - buf_size = GNUNET_IDENTITY_ATTRIBUTE_serialize_get_size (rh->attrs->list_head->claim); + buf_size = GNUNET_RECLAIM_ATTRIBUTE_serialize_get_size (rh->attrs->list_head->claim); buf = GNUNET_malloc (buf_size); - GNUNET_IDENTITY_ATTRIBUTE_serialize (rh->attrs->list_head->claim, + GNUNET_RECLAIM_ATTRIBUTE_serialize (rh->attrs->list_head->claim, buf); rh->attrs->list_head->claim->version++; GNUNET_asprintf (&policy, "%s_%lu", @@ -1527,7 +1527,7 @@ attr_reenc_cont (void *cls, const char *emsg) { struct TicketRevocationHandle *rh = cls; - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *le; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *le; rh->ns_qe = NULL; if (GNUNET_SYSERR == success) @@ -1561,12 +1561,12 @@ attr_reenc_cont (void *cls, static void process_attributes_to_update (void *cls, - const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket, - const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs) + const struct GNUNET_RECLAIM_Ticket *ticket, + const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs) { struct TicketRevocationHandle *rh = cls; - rh->attrs = GNUNET_IDENTITY_ATTRIBUTE_list_dup (attrs); + rh->attrs = GNUNET_RECLAIM_ATTRIBUTE_list_dup (attrs); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Revocation Phase I: Collecting attributes\n"); /* Reencrypt all attributes with new key */ @@ -1621,11 +1621,11 @@ handle_revoke_ticket_message (void *cls, { struct TicketRevocationHandle *rh; struct IdpClient *idp = cls; - struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket; + struct GNUNET_RECLAIM_Ticket *ticket; rh = GNUNET_new (struct TicketRevocationHandle); - ticket = (struct GNUNET_IDENTITY_PROVIDER_Ticket*)&rm[1]; - rh->rvk_attrs = GNUNET_new (struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList); + ticket = (struct GNUNET_RECLAIM_Ticket*)&rm[1]; + rh->rvk_attrs = GNUNET_new (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList); rh->ticket = *ticket; rh->r_id = ntohl (rm->id); rh->client = idp; @@ -1667,7 +1667,7 @@ cleanup_consume_ticket_handle (struct ConsumeTicketHandle *handle) GNUNET_ABE_cpabe_delete_key (handle->key, GNUNET_YES); if (NULL != handle->attrs) - GNUNET_IDENTITY_ATTRIBUTE_list_destroy (handle->attrs); + GNUNET_RECLAIM_ATTRIBUTE_list_destroy (handle->attrs); GNUNET_free (handle); } @@ -1698,7 +1698,7 @@ process_parallel_lookup2 (void *cls, uint32_t rd_count, struct ConsumeTicketHandle *handle = parallel_lookup->handle; struct ConsumeTicketResultMessage *crm; struct GNUNET_MQ_Envelope *env; - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *attr_le; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *attr_le; struct GNUNET_TIME_Absolute decrypt_duration; char *data; char *data_tmp; @@ -1741,8 +1741,8 @@ process_parallel_lookup2 (void *cls, uint32_t rd_count, 1, GNUNET_YES); - attr_le = GNUNET_new (struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry); - attr_le->claim = GNUNET_IDENTITY_ATTRIBUTE_deserialize (data, + attr_le = GNUNET_new (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry); + attr_le->claim = GNUNET_RECLAIM_ATTRIBUTE_deserialize (data, attr_len); attr_le->claim->version = ntohl(*(uint32_t*)rd->data); GNUNET_CONTAINER_DLL_insert (handle->attrs->list_head, @@ -1766,15 +1766,15 @@ process_parallel_lookup2 (void *cls, uint32_t rd_count, } GNUNET_SCHEDULER_cancel (handle->kill_task); - attrs_len = GNUNET_IDENTITY_ATTRIBUTE_list_serialize_get_size (handle->attrs); + attrs_len = GNUNET_RECLAIM_ATTRIBUTE_list_serialize_get_size (handle->attrs); env = GNUNET_MQ_msg_extra (crm, attrs_len, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_CONSUME_TICKET_RESULT); + GNUNET_MESSAGE_TYPE_RECLAIM_CONSUME_TICKET_RESULT); crm->id = htonl (handle->r_id); crm->attrs_len = htons (attrs_len); crm->identity = handle->ticket.identity; data_tmp = (char *) &crm[1]; - GNUNET_IDENTITY_ATTRIBUTE_list_serialize (handle->attrs, + GNUNET_RECLAIM_ATTRIBUTE_list_serialize (handle->attrs, data_tmp); GNUNET_MQ_send (handle->client->mq, env); GNUNET_CONTAINER_DLL_remove (handle->client->consume_op_head, @@ -1805,7 +1805,7 @@ abort_parallel_lookups2 (void *cls) lu = tmp; } env = GNUNET_MQ_msg (arm, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_RESULT); + GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_RESULT); arm->id = htonl (handle->r_id); arm->attr_len = htons (0); GNUNET_MQ_send (handle->client->mq, env); @@ -1918,10 +1918,10 @@ handle_consume_ticket_message (void *cls, ch->r_id = ntohl (cm->id); ch->client = idp; ch->identity = cm->identity; - ch->attrs = GNUNET_new (struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList); + ch->attrs = GNUNET_new (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList); GNUNET_CRYPTO_ecdsa_key_get_public (&ch->identity, &ch->identity_pub); - ch->ticket = *((struct GNUNET_IDENTITY_PROVIDER_Ticket*)&cm[1]); + ch->ticket = *((struct GNUNET_RECLAIM_Ticket*)&cm[1]); rnd_label = GNUNET_STRINGS_data_to_string_alloc (&ch->ticket.rnd, sizeof (uint64_t)); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, @@ -1986,7 +1986,7 @@ attr_store_cont (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending ATTRIBUTE_STORE_RESPONSE message\n"); env = GNUNET_MQ_msg (acr_msg, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_STORE_RESPONSE); + GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_STORE_RESPONSE); acr_msg->id = htonl (as_handle->r_id); acr_msg->op_result = htonl (GNUNET_OK); GNUNET_MQ_send (as_handle->client->mq, @@ -2009,10 +2009,10 @@ attr_store_task (void *cls) GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Storing attribute\n"); - buf_size = GNUNET_IDENTITY_ATTRIBUTE_serialize_get_size (as_handle->claim); + buf_size = GNUNET_RECLAIM_ATTRIBUTE_serialize_get_size (as_handle->claim); buf = GNUNET_malloc (buf_size); - GNUNET_IDENTITY_ATTRIBUTE_serialize (as_handle->claim, + GNUNET_RECLAIM_ATTRIBUTE_serialize (as_handle->claim, buf); GNUNET_asprintf (&policy, @@ -2111,7 +2111,7 @@ handle_attribute_store_message (void *cls, data_len = ntohs (sam->attr_len); as_handle = GNUNET_new (struct AttributeStoreHandle); - as_handle->claim = GNUNET_IDENTITY_ATTRIBUTE_deserialize ((char*)&sam[1], + as_handle->claim = GNUNET_RECLAIM_ATTRIBUTE_deserialize ((char*)&sam[1], data_len); as_handle->r_id = ntohl (sam->id); @@ -2158,7 +2158,7 @@ attr_iter_finished (void *cls) struct AttributeResultMessage *arm; env = GNUNET_MQ_msg (arm, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_RESULT); + GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_RESULT); arm->id = htonl (ai->request_id); arm->attr_len = htons (0); GNUNET_MQ_send (ai->client->mq, env); @@ -2224,7 +2224,7 @@ attr_iter_cb (void *cls, "Found attribute: %s\n", label); env = GNUNET_MQ_msg_extra (arm, msg_extra_len, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_RESULT); + GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_RESULT); arm->id = htonl (ai->request_id); arm->attr_len = htons (msg_extra_len); GNUNET_CRYPTO_ecdsa_key_get_public (zone, @@ -2406,8 +2406,8 @@ cleanup_ticket_iter_handle (struct TicketIteration *ti) */ static void ticket_iterate_proc (void *cls, - const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket, - const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs) + const struct GNUNET_RECLAIM_Ticket *ticket, + const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs) { struct TicketIterationProcResult *proc = cls; @@ -2467,7 +2467,7 @@ run_ticket_iteration_round (struct TicketIteration *ti) } /* send empty response to indicate end of list */ env = GNUNET_MQ_msg (trm, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_RESULT); + GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_RESULT); trm->id = htonl (ti->r_id); GNUNET_MQ_send (ti->client->mq, env); @@ -2572,7 +2572,7 @@ run (void *cls, char *database; cfg = c; - stats = GNUNET_STATISTICS_create ("identity-provider", cfg); + stats = GNUNET_STATISTICS_create ("reclaim", cfg); //Connect to identity and namestore services ns_handle = GNUNET_NAMESTORE_connect (cfg); @@ -2597,13 +2597,13 @@ run (void *cls, /* Loading DB plugin */ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg, - "identity-provider", + "reclaim", "database", &database)) GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No database backend configured\n"); GNUNET_asprintf (&db_lib_name, - "libgnunet_plugin_identity_provider_%s", + "libgnunet_plugin_reclaim_%s", database); TKT_database = GNUNET_PLUGIN_load (db_lib_name, (void *) cfg); @@ -2619,7 +2619,7 @@ run (void *cls, if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_time (cfg, - "identity-provider", + "reclaim", "TOKEN_EXPIRATION_INTERVAL", &token_expiration_interval)) { @@ -2736,51 +2736,51 @@ client_connect_cb (void *cls, * Define "main" method using service macro. */ GNUNET_SERVICE_MAIN -("identity-provider", +("reclaim", GNUNET_SERVICE_OPTION_NONE, &run, &client_connect_cb, &client_disconnect_cb, NULL, GNUNET_MQ_hd_var_size (attribute_store_message, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_STORE, + GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_STORE, struct AttributeStoreMessage, NULL), GNUNET_MQ_hd_fixed_size (iteration_start, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_ITERATION_START, + GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_START, struct AttributeIterationStartMessage, NULL), GNUNET_MQ_hd_fixed_size (iteration_next, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_ITERATION_NEXT, + GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_NEXT, struct AttributeIterationNextMessage, NULL), GNUNET_MQ_hd_fixed_size (iteration_stop, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_ITERATION_STOP, + GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_STOP, struct AttributeIterationStopMessage, NULL), GNUNET_MQ_hd_var_size (issue_ticket_message, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ISSUE_TICKET, + GNUNET_MESSAGE_TYPE_RECLAIM_ISSUE_TICKET, struct IssueTicketMessage, NULL), GNUNET_MQ_hd_var_size (consume_ticket_message, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_CONSUME_TICKET, + GNUNET_MESSAGE_TYPE_RECLAIM_CONSUME_TICKET, struct ConsumeTicketMessage, NULL), GNUNET_MQ_hd_fixed_size (ticket_iteration_start, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_START, + GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_START, struct TicketIterationStartMessage, NULL), GNUNET_MQ_hd_fixed_size (ticket_iteration_next, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_NEXT, + GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_NEXT, struct TicketIterationNextMessage, NULL), GNUNET_MQ_hd_fixed_size (ticket_iteration_stop, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_STOP, + GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_STOP, struct TicketIterationStopMessage, NULL), GNUNET_MQ_hd_var_size (revoke_ticket_message, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_REVOKE_TICKET, + GNUNET_MESSAGE_TYPE_RECLAIM_REVOKE_TICKET, struct RevokeTicketMessage, NULL), GNUNET_MQ_handler_end()); -/* end of gnunet-service-identity-provider.c */ +/* end of gnunet-service-reclaim.c */ diff --git a/src/identity-provider/jwt.c b/src/reclaim/jwt.c similarity index 95% rename from src/identity-provider/jwt.c rename to src/reclaim/jwt.c index 7ac4f0025..45b5d73f6 100644 --- a/src/identity-provider/jwt.c +++ b/src/reclaim/jwt.c @@ -17,14 +17,14 @@ */ /** - * @file identity-provider/jwt.c + * @file reclaim/jwt.c * @brief helper library for JSON-Web-Tokens * @author Martin Schanzenbach */ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_signatures.h" -#include "gnunet_identity_attribute_lib.h" +#include "gnunet_reclaim_attribute_lib.h" #include @@ -65,10 +65,10 @@ create_jwt_header(void) char* jwt_create_from_list (const struct GNUNET_CRYPTO_EcdsaPublicKey *aud_key, const struct GNUNET_CRYPTO_EcdsaPublicKey *sub_key, - const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs, + const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs, const struct GNUNET_CRYPTO_AuthKey *priv_key) { - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *le; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *le; struct GNUNET_HashCode signature; char* audience; char* subject; @@ -107,7 +107,7 @@ jwt_create_from_list (const struct GNUNET_CRYPTO_EcdsaPublicKey *aud_key, "aud", json_string (audience)); for (le = attrs->list_head; NULL != le; le = le->next) { - attr_val_str = GNUNET_IDENTITY_ATTRIBUTE_value_to_string (le->claim->type, + attr_val_str = GNUNET_RECLAIM_ATTRIBUTE_value_to_string (le->claim->type, le->claim->data, le->claim->data_size); json_object_set_new (body, diff --git a/src/identity-provider/jwt.h b/src/reclaim/jwt.h similarity index 89% rename from src/identity-provider/jwt.h rename to src/reclaim/jwt.h index 80b6caa33..4b0b01be3 100644 --- a/src/identity-provider/jwt.h +++ b/src/reclaim/jwt.h @@ -4,7 +4,7 @@ char* jwt_create_from_list (const struct GNUNET_CRYPTO_EcdsaPublicKey *aud_key, const struct GNUNET_CRYPTO_EcdsaPublicKey *sub_key, - const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs, + const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs, const struct GNUNET_CRYPTO_AuthKey *priv_key); #endif diff --git a/src/identity-provider/plugin_gnsrecord_identity_provider.c b/src/reclaim/plugin_gnsrecord_reclaim.c similarity index 97% rename from src/identity-provider/plugin_gnsrecord_identity_provider.c rename to src/reclaim/plugin_gnsrecord_reclaim.c index f0dc563dc..0322df752 100644 --- a/src/identity-provider/plugin_gnsrecord_identity_provider.c +++ b/src/reclaim/plugin_gnsrecord_reclaim.c @@ -17,7 +17,7 @@ */ /** - * @file identity-provider/plugin_gnsrecord_identity_provider.c + * @file reclaim/plugin_gnsrecord_reclaim.c * @brief gnsrecord plugin to provide the API for identity records * @author Martin Schanzenbach */ @@ -234,7 +234,7 @@ number_to_typename (void *cls, * @return the exported block API */ void * -libgnunet_plugin_gnsrecord_identity_provider_init (void *cls) +libgnunet_plugin_gnsrecord_reclaim_init (void *cls) { struct GNUNET_GNSRECORD_PluginFunctions *api; @@ -254,7 +254,7 @@ libgnunet_plugin_gnsrecord_identity_provider_init (void *cls) * @return NULL */ void * -libgnunet_plugin_gnsrecord_identity_provider_done (void *cls) +libgnunet_plugin_gnsrecord_reclaim_done (void *cls) { struct GNUNET_GNSRECORD_PluginFunctions *api = cls; diff --git a/src/identity-provider/plugin_identity_provider_sqlite.c b/src/reclaim/plugin_reclaim_sqlite.c similarity index 89% rename from src/identity-provider/plugin_identity_provider_sqlite.c rename to src/reclaim/plugin_reclaim_sqlite.c index f2a8b7b54..b545a94e8 100644 --- a/src/identity-provider/plugin_identity_provider_sqlite.c +++ b/src/reclaim/plugin_reclaim_sqlite.c @@ -17,15 +17,15 @@ */ /** - * @file identity-provider/plugin_identity_provider_sqlite.c + * @file reclaim/plugin_reclaim_sqlite.c * @brief sqlite-based idp backend * @author Martin Schanzenbach */ #include "platform.h" -#include "gnunet_identity_provider_service.h" -#include "gnunet_identity_provider_plugin.h" -#include "gnunet_identity_attribute_lib.h" +#include "gnunet_reclaim_service.h" +#include "gnunet_reclaim_plugin.h" +#include "gnunet_reclaim_attribute_lib.h" #include "gnunet_sq_lib.h" #include @@ -47,9 +47,9 @@ * a failure of the command 'cmd' on file 'filename' * with the message given by strerror(errno). */ -#define LOG_SQLITE(db, level, cmd) do { GNUNET_log_from (level, "identity-provider", _("`%s' failed at %s:%d with error: %s\n"), cmd, __FILE__, __LINE__, sqlite3_errmsg(db->dbh)); } while(0) +#define LOG_SQLITE(db, level, cmd) do { GNUNET_log_from (level, "reclaim", _("`%s' failed at %s:%d with error: %s\n"), cmd, __FILE__, __LINE__, sqlite3_errmsg(db->dbh)); } while(0) -#define LOG(kind,...) GNUNET_log_from (kind, "identity-provider-sqlite", __VA_ARGS__) +#define LOG(kind,...) GNUNET_log_from (kind, "reclaim-sqlite", __VA_ARGS__) /** @@ -180,12 +180,12 @@ database_setup (struct Plugin *plugin) if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (plugin->cfg, - "identity-provider-sqlite", + "reclaim-sqlite", "FILENAME", &afsdir)) { GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, - "identity-provider-sqlite", + "reclaim-sqlite", "FILENAME"); return GNUNET_SYSERR; } @@ -370,9 +370,9 @@ database_shutdown (struct Plugin *plugin) * @return #GNUNET_OK on success, else #GNUNET_SYSERR */ static int -identity_provider_sqlite_store_ticket (void *cls, - const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket, - const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs) +reclaim_sqlite_store_ticket (void *cls, + const struct GNUNET_RECLAIM_Ticket *ticket, + const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs) { struct Plugin *plugin = cls; size_t attrs_len; @@ -401,9 +401,9 @@ identity_provider_sqlite_store_ticket (void *cls, GNUNET_SQ_reset (plugin->dbh, plugin->delete_ticket); - attrs_len = GNUNET_IDENTITY_ATTRIBUTE_list_serialize_get_size (attrs); + attrs_len = GNUNET_RECLAIM_ATTRIBUTE_list_serialize_get_size (attrs); attrs_ser = GNUNET_malloc (attrs_len); - GNUNET_IDENTITY_ATTRIBUTE_list_serialize (attrs, + GNUNET_RECLAIM_ATTRIBUTE_list_serialize (attrs, attrs_ser); struct GNUNET_SQ_QueryParam sparams[] = { GNUNET_SQ_query_param_auto_from_type (&ticket->identity), @@ -458,8 +458,8 @@ identity_provider_sqlite_store_ticket (void *cls, * @return #GNUNET_OK on success, else #GNUNET_SYSERR */ static int -identity_provider_sqlite_delete_ticket (void *cls, - const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket) +reclaim_sqlite_delete_ticket (void *cls, + const struct GNUNET_RECLAIM_Ticket *ticket) { struct Plugin *plugin = cls; int n; @@ -521,11 +521,11 @@ identity_provider_sqlite_delete_ticket (void *cls, static int get_ticket_and_call_iterator (struct Plugin *plugin, sqlite3_stmt *stmt, - GNUNET_IDENTITY_PROVIDER_TicketIterator iter, + GNUNET_RECLAIM_TicketIterator iter, void *iter_cls) { - struct GNUNET_IDENTITY_PROVIDER_Ticket ticket; - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs; + struct GNUNET_RECLAIM_Ticket ticket; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs; int ret; int sret; size_t attrs_len; @@ -552,13 +552,13 @@ get_ticket_and_call_iterator (struct Plugin *plugin, } else { - attrs = GNUNET_IDENTITY_ATTRIBUTE_list_deserialize (attrs_ser, + attrs = GNUNET_RECLAIM_ATTRIBUTE_list_deserialize (attrs_ser, attrs_len); if (NULL != iter) iter (iter_cls, &ticket, attrs); - GNUNET_IDENTITY_ATTRIBUTE_list_destroy (attrs); + GNUNET_RECLAIM_ATTRIBUTE_list_destroy (attrs); ret = GNUNET_YES; } GNUNET_SQ_cleanup_result (rs); @@ -586,9 +586,9 @@ get_ticket_and_call_iterator (struct Plugin *plugin, * @return #GNUNET_OK on success, else #GNUNET_SYSERR */ static int -identity_provider_sqlite_ticket_get_attrs (void *cls, - const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket, - GNUNET_IDENTITY_PROVIDER_TicketIterator iter, +reclaim_sqlite_ticket_get_attrs (void *cls, + const struct GNUNET_RECLAIM_Ticket *ticket, + GNUNET_RECLAIM_TicketIterator iter, void *iter_cls) { struct Plugin *plugin = cls; @@ -628,11 +628,11 @@ identity_provider_sqlite_ticket_get_attrs (void *cls, * @return #GNUNET_OK on success, #GNUNET_NO if there were no results, #GNUNET_SYSERR on error */ static int -identity_provider_sqlite_iterate_tickets (void *cls, +reclaim_sqlite_iterate_tickets (void *cls, const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, int audience, uint64_t offset, - GNUNET_IDENTITY_PROVIDER_TicketIterator iter, + GNUNET_RECLAIM_TicketIterator iter, void *iter_cls) { struct Plugin *plugin = cls; @@ -680,15 +680,15 @@ identity_provider_sqlite_iterate_tickets (void *cls, /** * Entry point for the plugin. * - * @param cls the "struct GNUNET_IDENTITY_PROVIDER_PluginEnvironment*" + * @param cls the "struct GNUNET_RECLAIM_PluginEnvironment*" * @return NULL on error, otherwise the plugin context */ void * -libgnunet_plugin_identity_provider_sqlite_init (void *cls) +libgnunet_plugin_reclaim_sqlite_init (void *cls) { static struct Plugin plugin; const struct GNUNET_CONFIGURATION_Handle *cfg = cls; - struct GNUNET_IDENTITY_PROVIDER_PluginFunctions *api; + struct GNUNET_RECLAIM_PluginFunctions *api; if (NULL != plugin.cfg) return NULL; /* can only initialize once! */ @@ -699,12 +699,12 @@ libgnunet_plugin_identity_provider_sqlite_init (void *cls) database_shutdown (&plugin); return NULL; } - api = GNUNET_new (struct GNUNET_IDENTITY_PROVIDER_PluginFunctions); + api = GNUNET_new (struct GNUNET_RECLAIM_PluginFunctions); api->cls = &plugin; - api->store_ticket = &identity_provider_sqlite_store_ticket; - api->delete_ticket = &identity_provider_sqlite_delete_ticket; - api->iterate_tickets = &identity_provider_sqlite_iterate_tickets; - api->get_ticket_attributes = &identity_provider_sqlite_ticket_get_attrs; + api->store_ticket = &reclaim_sqlite_store_ticket; + api->delete_ticket = &reclaim_sqlite_delete_ticket; + api->iterate_tickets = &reclaim_sqlite_iterate_tickets; + api->get_ticket_attributes = &reclaim_sqlite_ticket_get_attrs; LOG (GNUNET_ERROR_TYPE_INFO, _("Sqlite database running\n")); return api; @@ -718,9 +718,9 @@ libgnunet_plugin_identity_provider_sqlite_init (void *cls) * @return always NULL */ void * -libgnunet_plugin_identity_provider_sqlite_done (void *cls) +libgnunet_plugin_reclaim_sqlite_done (void *cls) { - struct GNUNET_IDENTITY_PROVIDER_PluginFunctions *api = cls; + struct GNUNET_RECLAIM_PluginFunctions *api = cls; struct Plugin *plugin = api->cls; database_shutdown (plugin); @@ -731,4 +731,4 @@ libgnunet_plugin_identity_provider_sqlite_done (void *cls) return NULL; } -/* end of plugin_identity_provider_sqlite.c */ +/* end of plugin_reclaim_sqlite.c */ diff --git a/src/identity-provider/plugin_rest_openid_connect.c b/src/reclaim/plugin_rest_openid_connect.c similarity index 95% rename from src/identity-provider/plugin_rest_openid_connect.c rename to src/reclaim/plugin_rest_openid_connect.c index cc4b83dae..abb3f59f5 100644 --- a/src/identity-provider/plugin_rest_openid_connect.c +++ b/src/reclaim/plugin_rest_openid_connect.c @@ -36,8 +36,8 @@ #include #include #include "gnunet_signatures.h" -#include "gnunet_identity_attribute_lib.h" -#include "gnunet_identity_provider_service.h" +#include "gnunet_reclaim_attribute_lib.h" +#include "gnunet_reclaim_service.h" #include "jwt.h" /** @@ -68,7 +68,7 @@ /** * Attribute key */ -#define GNUNET_REST_JSONAPI_IDENTITY_ATTRIBUTE "attribute" +#define GNUNET_REST_JSONAPI_RECLAIM_ATTRIBUTE "attribute" /** * Ticket key @@ -79,7 +79,7 @@ /** * Value key */ -#define GNUNET_REST_JSONAPI_IDENTITY_ATTRIBUTE_VALUE "value" +#define GNUNET_REST_JSONAPI_RECLAIM_ATTRIBUTE_VALUE "value" /** * State while collecting all egos @@ -359,7 +359,7 @@ struct RequestHandle /** * Attribute claim list */ - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attr_list; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attr_list; /** * IDENTITY Operation @@ -369,27 +369,27 @@ struct RequestHandle /** * Identity Provider */ - struct GNUNET_IDENTITY_PROVIDER_Handle *idp; + struct GNUNET_RECLAIM_Handle *idp; /** * Idp Operation */ - struct GNUNET_IDENTITY_PROVIDER_Operation *idp_op; + struct GNUNET_RECLAIM_Operation *idp_op; /** * Attribute iterator */ - struct GNUNET_IDENTITY_PROVIDER_AttributeIterator *attr_it; + struct GNUNET_RECLAIM_AttributeIterator *attr_it; /** * Ticket iterator */ - struct GNUNET_IDENTITY_PROVIDER_TicketIterator *ticket_it; + struct GNUNET_RECLAIM_TicketIterator *ticket_it; /** * A ticket */ - struct GNUNET_IDENTITY_PROVIDER_Ticket ticket; + struct GNUNET_RECLAIM_Ticket ticket; /** * Desired timeout for the lookup (default is no timeout). @@ -450,8 +450,8 @@ struct RequestHandle static void cleanup_handle (struct RequestHandle *handle) { - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *claim_entry; - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *claim_tmp; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *claim_entry; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *claim_tmp; struct EgoEntry *ego_entry; struct EgoEntry *ego_tmp; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, @@ -463,11 +463,11 @@ cleanup_handle (struct RequestHandle *handle) if (NULL != handle->identity_handle) GNUNET_IDENTITY_disconnect (handle->identity_handle); if (NULL != handle->attr_it) - GNUNET_IDENTITY_PROVIDER_get_attributes_stop (handle->attr_it); + GNUNET_RECLAIM_get_attributes_stop (handle->attr_it); if (NULL != handle->ticket_it) - GNUNET_IDENTITY_PROVIDER_ticket_iteration_stop (handle->ticket_it); + GNUNET_RECLAIM_ticket_iteration_stop (handle->ticket_it); if (NULL != handle->idp) - GNUNET_IDENTITY_PROVIDER_disconnect (handle->idp); + GNUNET_RECLAIM_disconnect (handle->idp); if (NULL != handle->url) GNUNET_free (handle->url); if (NULL != handle->tld) @@ -818,7 +818,7 @@ static void get_client_name_result (void *cls, char *tmp_prefix; char *prefix; ticket_str = GNUNET_STRINGS_data_to_string_alloc (&handle->ticket, - sizeof (struct GNUNET_IDENTITY_PROVIDER_Ticket)); + sizeof (struct GNUNET_RECLAIM_Ticket)); //TODO change if more attributes are needed (see max_age) GNUNET_asprintf (&code_json_string, "{\"ticket\":\"%s\"%s%s%s}", ticket_str, @@ -869,7 +869,7 @@ get_client_name_error (void *cls) */ static void oidc_ticket_issue_cb (void* cls, - const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket) + const struct GNUNET_RECLAIM_Ticket *ticket) { struct RequestHandle *handle = cls; handle->idp_op = NULL; @@ -902,7 +902,7 @@ oidc_collect_finished_cb (void *cls) GNUNET_SCHEDULER_add_now (&do_redirect_error, handle); return; } - handle->idp_op = GNUNET_IDENTITY_PROVIDER_ticket_issue (handle->idp, + handle->idp_op = GNUNET_RECLAIM_ticket_issue (handle->idp, &handle->priv_key, &handle->oidc->client_pkey, handle->attr_list, @@ -917,17 +917,17 @@ oidc_collect_finished_cb (void *cls) static void oidc_attr_collect (void *cls, const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, - const struct GNUNET_IDENTITY_ATTRIBUTE_Claim *attr) + const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr) { struct RequestHandle *handle = cls; - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *le; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *le; char* scope_variables; char* scope_variable; char delimiter[]=" "; if ( (NULL == attr->name) || (NULL == attr->data) ) { - GNUNET_IDENTITY_PROVIDER_get_attributes_next (handle->attr_it); + GNUNET_RECLAIM_get_attributes_next (handle->attr_it); return; } @@ -943,18 +943,18 @@ oidc_attr_collect (void *cls, } if ( NULL == scope_variable ) { - GNUNET_IDENTITY_PROVIDER_get_attributes_next (handle->attr_it); + GNUNET_RECLAIM_get_attributes_next (handle->attr_it); GNUNET_free(scope_variables); return; } GNUNET_free(scope_variables); - le = GNUNET_new(struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry); - le->claim = GNUNET_IDENTITY_ATTRIBUTE_claim_new (attr->name, attr->type, + le = GNUNET_new(struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry); + le->claim = GNUNET_RECLAIM_ATTRIBUTE_claim_new (attr->name, attr->type, attr->data, attr->data_size); GNUNET_CONTAINER_DLL_insert(handle->attr_list->list_head, handle->attr_list->list_tail, le); - GNUNET_IDENTITY_PROVIDER_get_attributes_next (handle->attr_it); + GNUNET_RECLAIM_get_attributes_next (handle->attr_it); } @@ -1007,10 +1007,10 @@ login_check (void *cls) handle->priv_key = *GNUNET_IDENTITY_ego_get_private_key ( handle->ego_entry->ego); handle->resp_object = GNUNET_JSONAPI_document_new (); - handle->idp = GNUNET_IDENTITY_PROVIDER_connect (cfg); + handle->idp = GNUNET_RECLAIM_connect (cfg); handle->attr_list = GNUNET_new( - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList); - handle->attr_it = GNUNET_IDENTITY_PROVIDER_get_attributes_start ( + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList); + handle->attr_it = GNUNET_RECLAIM_get_attributes_start ( handle->idp, &handle->priv_key, &oidc_iteration_error, handle, &oidc_attr_collect, handle, &oidc_collect_finished_cb, handle); return; @@ -1616,12 +1616,12 @@ token_endpoint (struct GNUNET_REST_RequestHandle *con_handle, return; } - struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket = GNUNET_new(struct GNUNET_IDENTITY_PROVIDER_Ticket); + struct GNUNET_RECLAIM_Ticket *ticket = GNUNET_new(struct GNUNET_RECLAIM_Ticket); if ( GNUNET_OK != GNUNET_STRINGS_string_to_data (json_string_value(ticket_string), strlen (json_string_value(ticket_string)), ticket, - sizeof(struct GNUNET_IDENTITY_PROVIDER_Ticket))) + sizeof(struct GNUNET_RECLAIM_Ticket))) { GNUNET_free_non_null(user_psw); handle->emsg = GNUNET_strdup("invalid_request"); @@ -1660,11 +1660,11 @@ token_endpoint (struct GNUNET_REST_RequestHandle *con_handle, return; } - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *cl = GNUNET_new (struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList); + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *cl = GNUNET_new (struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList); //aud REQUIRED public key client_id must be there - GNUNET_IDENTITY_ATTRIBUTE_list_add(cl, + GNUNET_RECLAIM_ATTRIBUTE_list_add(cl, "aud", - GNUNET_IDENTITY_ATTRIBUTE_TYPE_STRING, + GNUNET_RECLAIM_ATTRIBUTE_TYPE_STRING, client_id, strlen(client_id)); //exp REQUIRED time expired from config @@ -1672,34 +1672,34 @@ token_endpoint (struct GNUNET_REST_RequestHandle *con_handle, GNUNET_TIME_relative_multiply (GNUNET_TIME_relative_get_second_ (), expiration_time)); const char* exp_time_string = GNUNET_STRINGS_absolute_time_to_string(exp_time); - GNUNET_IDENTITY_ATTRIBUTE_list_add (cl, + GNUNET_RECLAIM_ATTRIBUTE_list_add (cl, "exp", - GNUNET_IDENTITY_ATTRIBUTE_TYPE_STRING, + GNUNET_RECLAIM_ATTRIBUTE_TYPE_STRING, exp_time_string, strlen(exp_time_string)); //iat REQUIRED time now struct GNUNET_TIME_Absolute time_now = GNUNET_TIME_absolute_get(); const char* time_now_string = GNUNET_STRINGS_absolute_time_to_string(time_now); - GNUNET_IDENTITY_ATTRIBUTE_list_add (cl, + GNUNET_RECLAIM_ATTRIBUTE_list_add (cl, "iat", - GNUNET_IDENTITY_ATTRIBUTE_TYPE_STRING, + GNUNET_RECLAIM_ATTRIBUTE_TYPE_STRING, time_now_string, strlen(time_now_string)); //nonce only if nonce is provided if ( NULL != nonce && json_is_string(nonce) ) { - GNUNET_IDENTITY_ATTRIBUTE_list_add (cl, + GNUNET_RECLAIM_ATTRIBUTE_list_add (cl, "nonce", - GNUNET_IDENTITY_ATTRIBUTE_TYPE_STRING, + GNUNET_RECLAIM_ATTRIBUTE_TYPE_STRING, json_string_value(nonce), strlen(json_string_value(nonce))); } //auth_time only if max_age is provided if ( NULL != max_age && json_is_string(max_age) ) { - GNUNET_IDENTITY_ATTRIBUTE_list_add (cl, + GNUNET_RECLAIM_ATTRIBUTE_list_add (cl, "auth_time", - GNUNET_IDENTITY_ATTRIBUTE_TYPE_STRING, + GNUNET_RECLAIM_ATTRIBUTE_TYPE_STRING, json_string_value(max_age), strlen(json_string_value(max_age))); } @@ -1781,7 +1781,7 @@ token_endpoint (struct GNUNET_REST_RequestHandle *con_handle, MHD_add_response_header (resp, "Content-Type", "application/json"); handle->proc (handle->proc_cls, resp, MHD_HTTP_OK); - GNUNET_IDENTITY_ATTRIBUTE_list_destroy(cl); + GNUNET_RECLAIM_ATTRIBUTE_list_destroy(cl); GNUNET_free(access_token_number); GNUNET_free(access_token); GNUNET_free(user_psw); @@ -1798,7 +1798,7 @@ token_endpoint (struct GNUNET_REST_RequestHandle *con_handle, static void consume_ticket (void *cls, const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, - const struct GNUNET_IDENTITY_ATTRIBUTE_Claim *attr) + const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr) { struct RequestHandle *handle = cls; char *tmp_value; @@ -1810,7 +1810,7 @@ consume_ticket (void *cls, return; } - tmp_value = GNUNET_IDENTITY_ATTRIBUTE_value_to_string (attr->type, + tmp_value = GNUNET_RECLAIM_ATTRIBUTE_value_to_string (attr->type, attr->data, attr->data_size); @@ -1841,7 +1841,7 @@ userinfo_endpoint (struct GNUNET_REST_RequestHandle *con_handle, struct GNUNET_HashCode cache_key; char *authorization, *authorization_type, *authorization_access_token; char *client_ticket, *client, *ticket_str; - struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket; + struct GNUNET_RECLAIM_Ticket *ticket; GNUNET_CRYPTO_hash (OIDC_AUTHORIZATION_HEADER_KEY, strlen (OIDC_AUTHORIZATION_HEADER_KEY), @@ -1939,12 +1939,12 @@ userinfo_endpoint (struct GNUNET_REST_RequestHandle *con_handle, GNUNET_free(client_ticket); return; } - ticket = GNUNET_new(struct GNUNET_IDENTITY_PROVIDER_Ticket); + ticket = GNUNET_new(struct GNUNET_RECLAIM_Ticket); if ( GNUNET_OK != GNUNET_STRINGS_string_to_data (ticket_str, strlen (ticket_str), ticket, - sizeof(struct GNUNET_IDENTITY_PROVIDER_Ticket))) + sizeof(struct GNUNET_RECLAIM_Ticket))) { handle->emsg = GNUNET_strdup("invalid_token"); handle->edesc = GNUNET_strdup("The Access Token expired"); @@ -1956,10 +1956,10 @@ userinfo_endpoint (struct GNUNET_REST_RequestHandle *con_handle, return; } - handle->idp = GNUNET_IDENTITY_PROVIDER_connect (cfg); + handle->idp = GNUNET_RECLAIM_connect (cfg); handle->oidc->response = json_object(); json_object_set_new( handle->oidc->response, "sub", json_string( handle->ego_entry->keystring)); - handle->idp_op = GNUNET_IDENTITY_PROVIDER_ticket_consume ( + handle->idp_op = GNUNET_RECLAIM_ticket_consume ( handle->idp, GNUNET_IDENTITY_ego_get_private_key (handle->ego_entry->ego), ticket, diff --git a/src/identity-provider/plugin_rest_identity_provider.c b/src/reclaim/plugin_rest_reclaim.c similarity index 91% rename from src/identity-provider/plugin_rest_identity_provider.c rename to src/reclaim/plugin_rest_reclaim.c index f8176a101..b54aed5f3 100644 --- a/src/identity-provider/plugin_rest_identity_provider.c +++ b/src/reclaim/plugin_rest_reclaim.c @@ -18,8 +18,8 @@ /** * @author Martin Schanzenbach * @author Philippe Buschmann - * @file identity/plugin_rest_identity.c - * @brief GNUnet Namestore REST plugin + * @file reclaim/plugin_rest_reclaim.c + * @brief GNUnet reclaim REST plugin * */ @@ -36,18 +36,18 @@ #include #include #include "gnunet_signatures.h" -#include "gnunet_identity_attribute_lib.h" -#include "gnunet_identity_provider_service.h" +#include "gnunet_reclaim_attribute_lib.h" +#include "gnunet_reclaim_service.h" /** * REST root namespace */ -#define GNUNET_REST_API_NS_IDENTITY_PROVIDER "/idp" +#define GNUNET_REST_API_NS_RECLAIM "/idp" /** * Attribute namespace */ -#define GNUNET_REST_API_NS_IDENTITY_ATTRIBUTES "/idp/attributes" +#define GNUNET_REST_API_NS_RECLAIM_ATTRIBUTES "/idp/attributes" /** * Ticket namespace @@ -67,7 +67,7 @@ /** * Attribute key */ -#define GNUNET_REST_JSONAPI_IDENTITY_ATTRIBUTE "attribute" +#define GNUNET_REST_JSONAPI_RECLAIM_ATTRIBUTE "attribute" /** * Ticket key @@ -78,7 +78,7 @@ /** * Value key */ -#define GNUNET_REST_JSONAPI_IDENTITY_ATTRIBUTE_VALUE "value" +#define GNUNET_REST_JSONAPI_RECLAIM_ATTRIBUTE_VALUE "value" /** * State while collecting all egos @@ -190,7 +190,7 @@ struct RequestHandle /** * Attribute claim list */ - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attr_list; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attr_list; /** * IDENTITY Operation @@ -200,27 +200,27 @@ struct RequestHandle /** * Identity Provider */ - struct GNUNET_IDENTITY_PROVIDER_Handle *idp; + struct GNUNET_RECLAIM_Handle *idp; /** * Idp Operation */ - struct GNUNET_IDENTITY_PROVIDER_Operation *idp_op; + struct GNUNET_RECLAIM_Operation *idp_op; /** * Attribute iterator */ - struct GNUNET_IDENTITY_PROVIDER_AttributeIterator *attr_it; + struct GNUNET_RECLAIM_AttributeIterator *attr_it; /** * Ticket iterator */ - struct GNUNET_IDENTITY_PROVIDER_TicketIterator *ticket_it; + struct GNUNET_RECLAIM_TicketIterator *ticket_it; /** * A ticket */ - struct GNUNET_IDENTITY_PROVIDER_Ticket ticket; + struct GNUNET_RECLAIM_Ticket ticket; /** * Desired timeout for the lookup (default is no timeout). @@ -271,8 +271,8 @@ struct RequestHandle static void cleanup_handle (struct RequestHandle *handle) { - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *claim_entry; - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *claim_tmp; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *claim_entry; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *claim_tmp; struct EgoEntry *ego_entry; struct EgoEntry *ego_tmp; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, @@ -284,11 +284,11 @@ cleanup_handle (struct RequestHandle *handle) if (NULL != handle->identity_handle) GNUNET_IDENTITY_disconnect (handle->identity_handle); if (NULL != handle->attr_it) - GNUNET_IDENTITY_PROVIDER_get_attributes_stop (handle->attr_it); + GNUNET_RECLAIM_get_attributes_stop (handle->attr_it); if (NULL != handle->ticket_it) - GNUNET_IDENTITY_PROVIDER_ticket_iteration_stop (handle->ticket_it); + GNUNET_RECLAIM_ticket_iteration_stop (handle->ticket_it); if (NULL != handle->idp) - GNUNET_IDENTITY_PROVIDER_disconnect (handle->idp); + GNUNET_RECLAIM_disconnect (handle->idp); if (NULL != handle->url) GNUNET_free (handle->url); if (NULL != handle->emsg) @@ -435,7 +435,7 @@ collect_finished_cb (void *cls) */ static void ticket_collect (void *cls, - const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket) + const struct GNUNET_RECLAIM_Ticket *ticket) { struct GNUNET_JSONAPI_Resource *json_resource; struct RequestHandle *handle = cls; @@ -474,7 +474,7 @@ ticket_collect (void *cls, value); GNUNET_free (tmp); json_decref (value); - GNUNET_IDENTITY_PROVIDER_ticket_iteration_next (handle->ticket_it); + GNUNET_RECLAIM_ticket_iteration_next (handle->ticket_it); } @@ -523,8 +523,8 @@ list_tickets_cont (struct GNUNET_REST_RequestHandle *con_handle, return; } priv_key = GNUNET_IDENTITY_ego_get_private_key (ego_entry->ego); - handle->idp = GNUNET_IDENTITY_PROVIDER_connect (cfg); - handle->ticket_it = GNUNET_IDENTITY_PROVIDER_ticket_iteration_start (handle->idp, + handle->idp = GNUNET_RECLAIM_connect (cfg); + handle->ticket_it = GNUNET_RECLAIM_ticket_iteration_start (handle->idp, priv_key, &collect_error_cb, handle, @@ -549,7 +549,7 @@ add_attribute_cont (struct GNUNET_REST_RequestHandle *con_handle, struct RequestHandle *handle = cls; struct EgoEntry *ego_entry; struct MHD_Response *resp; - struct GNUNET_IDENTITY_ATTRIBUTE_Claim *attribute; + struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attribute; struct GNUNET_JSONAPI_Document *json_obj; struct GNUNET_JSONAPI_Resource *json_res; struct GNUNET_TIME_Relative exp; @@ -565,14 +565,14 @@ add_attribute_cont (struct GNUNET_REST_RequestHandle *con_handle, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding an attribute for %s.\n", handle->url); - if ( strlen (GNUNET_REST_API_NS_IDENTITY_ATTRIBUTES) >= + if ( strlen (GNUNET_REST_API_NS_RECLAIM_ATTRIBUTES) >= strlen (handle->url)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No identity given.\n"); GNUNET_SCHEDULER_add_now (&do_error, handle); return; } - identity = handle->url + strlen (GNUNET_REST_API_NS_IDENTITY_ATTRIBUTES) + 1; + identity = handle->url + strlen (GNUNET_REST_API_NS_RECLAIM_ATTRIBUTES) + 1; for (ego_entry = handle->ego_head; NULL != ego_entry; @@ -625,7 +625,7 @@ add_attribute_cont (struct GNUNET_REST_RequestHandle *con_handle, } json_res = GNUNET_JSONAPI_document_get_resource (json_obj, 0); if (GNUNET_NO == GNUNET_JSONAPI_resource_check_type (json_res, - GNUNET_REST_JSONAPI_IDENTITY_ATTRIBUTE)) + GNUNET_REST_JSONAPI_RECLAIM_ATTRIBUTE)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unsupported JSON data type\n"); @@ -651,12 +651,12 @@ add_attribute_cont (struct GNUNET_REST_RequestHandle *con_handle, value_json = GNUNET_JSONAPI_resource_read_attr (json_res, "value"); value_str = json_string_value (value_json); - attribute = GNUNET_IDENTITY_ATTRIBUTE_claim_new (name_str, - GNUNET_IDENTITY_ATTRIBUTE_TYPE_STRING, + attribute = GNUNET_RECLAIM_ATTRIBUTE_claim_new (name_str, + GNUNET_RECLAIM_ATTRIBUTE_TYPE_STRING, value_str, strlen (value_str) + 1); - handle->idp = GNUNET_IDENTITY_PROVIDER_connect (cfg); - handle->idp_op = GNUNET_IDENTITY_PROVIDER_attribute_store (handle->idp, + handle->idp = GNUNET_RECLAIM_connect (cfg); + handle->idp_op = GNUNET_RECLAIM_attribute_store (handle->idp, identity_priv, attribute, &exp, @@ -675,7 +675,7 @@ add_attribute_cont (struct GNUNET_REST_RequestHandle *con_handle, static void attr_collect (void *cls, const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, - const struct GNUNET_IDENTITY_ATTRIBUTE_Claim *attr) + const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr) { struct GNUNET_JSONAPI_Resource *json_resource; struct RequestHandle *handle = cls; @@ -684,17 +684,17 @@ attr_collect (void *cls, if ((NULL == attr->name) || (NULL == attr->data)) { - GNUNET_IDENTITY_PROVIDER_get_attributes_next (handle->attr_it); + GNUNET_RECLAIM_get_attributes_next (handle->attr_it); return; } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding attribute: %s\n", attr->name); - json_resource = GNUNET_JSONAPI_resource_new (GNUNET_REST_JSONAPI_IDENTITY_ATTRIBUTE, + json_resource = GNUNET_JSONAPI_resource_new (GNUNET_REST_JSONAPI_RECLAIM_ATTRIBUTE, attr->name); GNUNET_JSONAPI_document_resource_add (handle->resp_object, json_resource); - tmp_value = GNUNET_IDENTITY_ATTRIBUTE_value_to_string (attr->type, + tmp_value = GNUNET_RECLAIM_ATTRIBUTE_value_to_string (attr->type, attr->data, attr->data_size); @@ -705,7 +705,7 @@ attr_collect (void *cls, value); json_decref (value); GNUNET_free(tmp_value); - GNUNET_IDENTITY_PROVIDER_get_attributes_next (handle->attr_it); + GNUNET_RECLAIM_get_attributes_next (handle->attr_it); } @@ -729,14 +729,14 @@ list_attribute_cont (struct GNUNET_REST_RequestHandle *con_handle, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Getting attributes for %s.\n", handle->url); - if ( strlen (GNUNET_REST_API_NS_IDENTITY_ATTRIBUTES) >= + if ( strlen (GNUNET_REST_API_NS_RECLAIM_ATTRIBUTES) >= strlen (handle->url)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No identity given.\n"); GNUNET_SCHEDULER_add_now (&do_error, handle); return; } - identity = handle->url + strlen (GNUNET_REST_API_NS_IDENTITY_ATTRIBUTES) + 1; + identity = handle->url + strlen (GNUNET_REST_API_NS_RECLAIM_ATTRIBUTES) + 1; for (ego_entry = handle->ego_head; NULL != ego_entry; @@ -755,8 +755,8 @@ list_attribute_cont (struct GNUNET_REST_RequestHandle *con_handle, return; } priv_key = GNUNET_IDENTITY_ego_get_private_key (ego_entry->ego); - handle->idp = GNUNET_IDENTITY_PROVIDER_connect (cfg); - handle->attr_it = GNUNET_IDENTITY_PROVIDER_get_attributes_start (handle->idp, + handle->idp = GNUNET_RECLAIM_connect (cfg); + handle->attr_it = GNUNET_RECLAIM_get_attributes_start (handle->idp, priv_key, &collect_error_cb, handle, @@ -780,7 +780,7 @@ revoke_ticket_cont (struct GNUNET_REST_RequestHandle *con_handle, struct RequestHandle *handle = cls; struct EgoEntry *ego_entry; struct MHD_Response *resp; - struct GNUNET_IDENTITY_PROVIDER_Ticket ticket; + struct GNUNET_RECLAIM_Ticket ticket; struct GNUNET_JSONAPI_Document *json_obj; struct GNUNET_JSONAPI_Resource *json_res; struct GNUNET_CRYPTO_EcdsaPublicKey tmp_pk; @@ -884,8 +884,8 @@ revoke_ticket_cont (struct GNUNET_REST_RequestHandle *con_handle, } identity_priv = GNUNET_IDENTITY_ego_get_private_key (ego_entry->ego); - handle->idp = GNUNET_IDENTITY_PROVIDER_connect (cfg); - handle->idp_op = GNUNET_IDENTITY_PROVIDER_ticket_revoke (handle->idp, + handle->idp = GNUNET_RECLAIM_connect (cfg); + handle->idp_op = GNUNET_RECLAIM_ticket_revoke (handle->idp, identity_priv, &ticket, &finished_cont, @@ -896,7 +896,7 @@ revoke_ticket_cont (struct GNUNET_REST_RequestHandle *con_handle, static void consume_cont (void *cls, const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, - const struct GNUNET_IDENTITY_ATTRIBUTE_Claim *attr) + const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr) { struct RequestHandle *handle = cls; struct GNUNET_JSONAPI_Resource *json_resource; @@ -910,7 +910,7 @@ consume_cont (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding attribute: %s\n", attr->name); - json_resource = GNUNET_JSONAPI_resource_new (GNUNET_REST_JSONAPI_IDENTITY_ATTRIBUTE, + json_resource = GNUNET_JSONAPI_resource_new (GNUNET_REST_JSONAPI_RECLAIM_ATTRIBUTE, attr->name); GNUNET_JSONAPI_document_resource_add (handle->resp_object, json_resource); @@ -934,7 +934,7 @@ consume_ticket_cont (struct GNUNET_REST_RequestHandle *con_handle, struct RequestHandle *handle = cls; struct EgoEntry *ego_entry; struct MHD_Response *resp; - struct GNUNET_IDENTITY_PROVIDER_Ticket ticket; + struct GNUNET_RECLAIM_Ticket ticket; struct GNUNET_JSONAPI_Document *json_obj; struct GNUNET_JSONAPI_Resource *json_res; struct GNUNET_CRYPTO_EcdsaPublicKey tmp_pk; @@ -1038,8 +1038,8 @@ consume_ticket_cont (struct GNUNET_REST_RequestHandle *con_handle, } identity_priv = GNUNET_IDENTITY_ego_get_private_key (ego_entry->ego); handle->resp_object = GNUNET_JSONAPI_document_new (); - handle->idp = GNUNET_IDENTITY_PROVIDER_connect (cfg); - handle->idp_op = GNUNET_IDENTITY_PROVIDER_ticket_consume (handle->idp, + handle->idp = GNUNET_RECLAIM_connect (cfg); + handle->idp_op = GNUNET_RECLAIM_ticket_consume (handle->idp, identity_priv, &ticket, &consume_cont, @@ -1084,12 +1084,12 @@ init_cont (struct RequestHandle *handle) { struct GNUNET_REST_RequestHandlerError err; static const struct GNUNET_REST_RequestHandler handlers[] = { - {MHD_HTTP_METHOD_GET, GNUNET_REST_API_NS_IDENTITY_ATTRIBUTES, &list_attribute_cont}, - {MHD_HTTP_METHOD_POST, GNUNET_REST_API_NS_IDENTITY_ATTRIBUTES, &add_attribute_cont}, + {MHD_HTTP_METHOD_GET, GNUNET_REST_API_NS_RECLAIM_ATTRIBUTES, &list_attribute_cont}, + {MHD_HTTP_METHOD_POST, GNUNET_REST_API_NS_RECLAIM_ATTRIBUTES, &add_attribute_cont}, {MHD_HTTP_METHOD_GET, GNUNET_REST_API_NS_IDENTITY_TICKETS, &list_tickets_cont}, {MHD_HTTP_METHOD_POST, GNUNET_REST_API_NS_IDENTITY_REVOKE, &revoke_ticket_cont}, {MHD_HTTP_METHOD_POST, GNUNET_REST_API_NS_IDENTITY_CONSUME, &consume_ticket_cont}, - {MHD_HTTP_METHOD_OPTIONS, GNUNET_REST_API_NS_IDENTITY_PROVIDER, + {MHD_HTTP_METHOD_OPTIONS, GNUNET_REST_API_NS_RECLAIM, &options_cont}, GNUNET_REST_HANDLER_END }; @@ -1202,7 +1202,7 @@ rest_identity_process_request(struct GNUNET_REST_RequestHandle *rest_handle, * @return NULL on error, otherwise the plugin context */ void * -libgnunet_plugin_rest_identity_provider_init (void *cls) +libgnunet_plugin_rest_reclaim_init (void *cls) { static struct Plugin plugin; struct GNUNET_REST_Plugin *api; @@ -1214,7 +1214,7 @@ libgnunet_plugin_rest_identity_provider_init (void *cls) plugin.cfg = cfg; api = GNUNET_new (struct GNUNET_REST_Plugin); api->cls = &plugin; - api->name = GNUNET_REST_API_NS_IDENTITY_PROVIDER; + api->name = GNUNET_REST_API_NS_RECLAIM; api->process_request = &rest_identity_process_request; GNUNET_asprintf (&allow_methods, "%s, %s, %s, %s, %s", @@ -1237,7 +1237,7 @@ libgnunet_plugin_rest_identity_provider_init (void *cls) * @return always NULL */ void * -libgnunet_plugin_rest_identity_provider_done (void *cls) +libgnunet_plugin_rest_reclaim_done (void *cls) { struct GNUNET_REST_Plugin *api = cls; struct Plugin *plugin = api->cls; @@ -1250,4 +1250,4 @@ libgnunet_plugin_rest_identity_provider_done (void *cls) return NULL; } -/* end of plugin_rest_identity_provider.c */ +/* end of plugin_rest_reclaim.c */ diff --git a/src/identity-provider/identity-provider.conf b/src/reclaim/reclaim.conf similarity index 59% rename from src/identity-provider/identity-provider.conf rename to src/reclaim/reclaim.conf index 99c0a50be..e93899e05 100644 --- a/src/identity-provider/identity-provider.conf +++ b/src/reclaim/reclaim.conf @@ -1,23 +1,23 @@ -[identity-provider] +[reclaim] START_ON_DEMAND = NO RUN_PER_USER = YES #PORT = 2108 HOSTNAME = localhost -BINARY = gnunet-service-identity-provider +BINARY = gnunet-service-reclaim ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; -UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-identity-provider.sock +UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-reclaim.sock UNIX_MATCH_UID = NO UNIX_MATCH_GID = YES TOKEN_EXPIRATION_INTERVAL = 30 m DATABASE = sqlite -[identity-rest-plugin] +[reclaim-rest-plugin] #ADDRESS = https://identity.gnu:8000#/login ADDRESS = https://reclaim.ui/#/login PSW = secret JWT_SECRET = secret EXPIRATION_TIME = 3600 -[identity-provider-sqlite] -FILENAME = $GNUNET_DATA_HOME/identity-provider/sqlite.db +[reclaim-sqlite] +FILENAME = $GNUNET_DATA_HOME/reclaim/sqlite.db diff --git a/src/identity-provider/identity_provider.h b/src/reclaim/reclaim.h similarity index 89% rename from src/identity-provider/identity_provider.h rename to src/reclaim/reclaim.h index 6a4b7769f..d2c84686d 100644 --- a/src/identity-provider/identity_provider.h +++ b/src/reclaim/reclaim.h @@ -18,13 +18,13 @@ /** * @author Martin Schanzenbach - * @file identity-provider/identity_provider.h + * @file reclaim/reclaim.h * * @brief Common type definitions for the identity provider * service and API. */ -#ifndef IDENTITY_PROVIDER_H -#define IDENTITY_PROVIDER_H +#ifndef RECLAIM_H +#define RECLAIM_H #include "gnunet_common.h" @@ -152,7 +152,7 @@ struct AttributeIterationStartMessage struct AttributeIterationNextMessage { /** - * Type will be #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_ITERATION_NEXT + * Type will be #GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_NEXT */ struct GNUNET_MessageHeader header; @@ -170,7 +170,7 @@ struct AttributeIterationNextMessage struct AttributeIterationStopMessage { /** - * Type will be #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_ITERATION_STOP + * Type will be #GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_STOP */ struct GNUNET_MessageHeader header; @@ -214,7 +214,7 @@ struct TicketIterationStartMessage struct TicketIterationNextMessage { /** - * Type will be #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_NEXT + * Type will be #GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_NEXT */ struct GNUNET_MessageHeader header; @@ -232,7 +232,7 @@ struct TicketIterationNextMessage struct TicketIterationStopMessage { /** - * Type will be #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_STOP + * Type will be #GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_STOP */ struct GNUNET_MessageHeader header; @@ -251,7 +251,7 @@ struct TicketIterationStopMessage struct IssueTicketMessage { /** - * Type will be #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ISSUE_TICKET + * Type will be #GNUNET_MESSAGE_TYPE_RECLAIM_ISSUE_TICKET */ struct GNUNET_MessageHeader header; @@ -284,7 +284,7 @@ struct IssueTicketMessage struct RevokeTicketMessage { /** - * Type will be #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_REVOKE_TICKET + * Type will be #GNUNET_MESSAGE_TYPE_RECLAIM_REVOKE_TICKET */ struct GNUNET_MessageHeader header; @@ -312,7 +312,7 @@ struct RevokeTicketMessage struct RevokeTicketResultMessage { /** - * Type will be #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_REVOKE_TICKET_RESULT + * Type will be #GNUNET_MESSAGE_TYPE_RECLAIM_REVOKE_TICKET_RESULT */ struct GNUNET_MessageHeader header; @@ -334,7 +334,7 @@ struct RevokeTicketResultMessage struct TicketResultMessage { /** - * Type will be #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_RESULT + * Type will be #GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_RESULT */ struct GNUNET_MessageHeader header; @@ -351,7 +351,7 @@ struct TicketResultMessage struct ConsumeTicketMessage { /** - * Type will be #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_CONSUME_TICKET + * Type will be #GNUNET_MESSAGE_TYPE_RECLAIM_CONSUME_TICKET */ struct GNUNET_MessageHeader header; diff --git a/src/identity-provider/identity_provider_api.c b/src/reclaim/reclaim_api.c similarity index 72% rename from src/identity-provider/identity_provider_api.c rename to src/reclaim/reclaim_api.c index 33efe726f..3f1584ccd 100644 --- a/src/identity-provider/identity_provider_api.c +++ b/src/reclaim/reclaim_api.c @@ -17,8 +17,8 @@ */ /** - * @file identity-provider/identity_provider_api.c - * @brief api to interact with the identity provider service + * @file reclaim/reclaim_api.c + * @brief api to interact with the reclaim service * @author Martin Schanzenbach */ #include "platform.h" @@ -26,33 +26,33 @@ #include "gnunet_constants.h" #include "gnunet_protocols.h" #include "gnunet_mq_lib.h" -#include "gnunet_identity_provider_service.h" -#include "gnunet_identity_attribute_lib.h" -#include "identity_provider.h" +#include "gnunet_reclaim_service.h" +#include "gnunet_reclaim_attribute_lib.h" +#include "reclaim.h" -#define LOG(kind,...) GNUNET_log_from (kind, "identity-api",__VA_ARGS__) +#define LOG(kind,...) GNUNET_log_from (kind, "reclaim-api",__VA_ARGS__) /** * Handle for an operation with the service. */ -struct GNUNET_IDENTITY_PROVIDER_Operation +struct GNUNET_RECLAIM_Operation { /** * Main handle. */ - struct GNUNET_IDENTITY_PROVIDER_Handle *h; + struct GNUNET_RECLAIM_Handle *h; /** * We keep operations in a DLL. */ - struct GNUNET_IDENTITY_PROVIDER_Operation *next; + struct GNUNET_RECLAIM_Operation *next; /** * We keep operations in a DLL. */ - struct GNUNET_IDENTITY_PROVIDER_Operation *prev; + struct GNUNET_RECLAIM_Operation *prev; /** * Message to send to the service. @@ -63,22 +63,22 @@ struct GNUNET_IDENTITY_PROVIDER_Operation /** * Continuation to invoke after attribute store call */ - GNUNET_IDENTITY_PROVIDER_ContinuationWithStatus as_cb; + GNUNET_RECLAIM_ContinuationWithStatus as_cb; /** * Attribute result callback */ - GNUNET_IDENTITY_PROVIDER_AttributeResult ar_cb; + GNUNET_RECLAIM_AttributeResult ar_cb; /** * Revocation result callback */ - GNUNET_IDENTITY_PROVIDER_ContinuationWithStatus rvk_cb; + GNUNET_RECLAIM_ContinuationWithStatus rvk_cb; /** * Ticket result callback */ - GNUNET_IDENTITY_PROVIDER_TicketCallback tr_cb; + GNUNET_RECLAIM_TicketCallback tr_cb; /** * Envelope with the message for this queue entry. @@ -100,23 +100,23 @@ struct GNUNET_IDENTITY_PROVIDER_Operation /** * Handle for a ticket iterator operation */ -struct GNUNET_IDENTITY_PROVIDER_TicketIterator +struct GNUNET_RECLAIM_TicketIterator { /** * Kept in a DLL. */ - struct GNUNET_IDENTITY_PROVIDER_TicketIterator *next; + struct GNUNET_RECLAIM_TicketIterator *next; /** * Kept in a DLL. */ - struct GNUNET_IDENTITY_PROVIDER_TicketIterator *prev; + struct GNUNET_RECLAIM_TicketIterator *prev; /** * Main handle to access the idp. */ - struct GNUNET_IDENTITY_PROVIDER_Handle *h; + struct GNUNET_RECLAIM_Handle *h; /** * Function to call on completion. @@ -131,7 +131,7 @@ struct GNUNET_IDENTITY_PROVIDER_TicketIterator /** * The continuation to call with the results */ - GNUNET_IDENTITY_PROVIDER_TicketCallback tr_cb; + GNUNET_RECLAIM_TicketCallback tr_cb; /** * Closure for @e tr_cb. @@ -165,23 +165,23 @@ struct GNUNET_IDENTITY_PROVIDER_TicketIterator /** * Handle for a attribute iterator operation */ -struct GNUNET_IDENTITY_PROVIDER_AttributeIterator +struct GNUNET_RECLAIM_AttributeIterator { /** * Kept in a DLL. */ - struct GNUNET_IDENTITY_PROVIDER_AttributeIterator *next; + struct GNUNET_RECLAIM_AttributeIterator *next; /** * Kept in a DLL. */ - struct GNUNET_IDENTITY_PROVIDER_AttributeIterator *prev; + struct GNUNET_RECLAIM_AttributeIterator *prev; /** * Main handle to access the idp. */ - struct GNUNET_IDENTITY_PROVIDER_Handle *h; + struct GNUNET_RECLAIM_Handle *h; /** * Function to call on completion. @@ -196,7 +196,7 @@ struct GNUNET_IDENTITY_PROVIDER_AttributeIterator /** * The continuation to call with the results */ - GNUNET_IDENTITY_PROVIDER_AttributeResult proc; + GNUNET_RECLAIM_AttributeResult proc; /** * Closure for @e proc. @@ -235,7 +235,7 @@ struct GNUNET_IDENTITY_PROVIDER_AttributeIterator /** * Handle for the service. */ -struct GNUNET_IDENTITY_PROVIDER_Handle +struct GNUNET_RECLAIM_Handle { /** * Configuration to use. @@ -255,32 +255,32 @@ struct GNUNET_IDENTITY_PROVIDER_Handle /** * Head of active operations. */ - struct GNUNET_IDENTITY_PROVIDER_Operation *op_head; + struct GNUNET_RECLAIM_Operation *op_head; /** * Tail of active operations. */ - struct GNUNET_IDENTITY_PROVIDER_Operation *op_tail; + struct GNUNET_RECLAIM_Operation *op_tail; /** * Head of active iterations */ - struct GNUNET_IDENTITY_PROVIDER_AttributeIterator *it_head; + struct GNUNET_RECLAIM_AttributeIterator *it_head; /** * Tail of active iterations */ - struct GNUNET_IDENTITY_PROVIDER_AttributeIterator *it_tail; + struct GNUNET_RECLAIM_AttributeIterator *it_tail; /** * Head of active iterations */ - struct GNUNET_IDENTITY_PROVIDER_TicketIterator *ticket_it_head; + struct GNUNET_RECLAIM_TicketIterator *ticket_it_head; /** * Tail of active iterations */ - struct GNUNET_IDENTITY_PROVIDER_TicketIterator *ticket_it_tail; + struct GNUNET_RECLAIM_TicketIterator *ticket_it_tail; /** @@ -318,10 +318,10 @@ struct GNUNET_IDENTITY_PROVIDER_Handle /** * Try again to connect to the service. * - * @param h handle to the identity provider service. + * @param h handle to the reclaim service. */ static void -reconnect (struct GNUNET_IDENTITY_PROVIDER_Handle *h); +reconnect (struct GNUNET_RECLAIM_Handle *h); /** * Reconnect @@ -331,7 +331,7 @@ reconnect (struct GNUNET_IDENTITY_PROVIDER_Handle *h); static void reconnect_task (void *cls) { - struct GNUNET_IDENTITY_PROVIDER_Handle *handle = cls; + struct GNUNET_RECLAIM_Handle *handle = cls; handle->reconnect_task = NULL; reconnect (handle); @@ -344,7 +344,7 @@ reconnect_task (void *cls) * @param handle our service */ static void -force_reconnect (struct GNUNET_IDENTITY_PROVIDER_Handle *handle) +force_reconnect (struct GNUNET_RECLAIM_Handle *handle) { GNUNET_MQ_destroy (handle->mq); handle->mq = NULL; @@ -362,9 +362,9 @@ force_reconnect (struct GNUNET_IDENTITY_PROVIDER_Handle *handle) * @param it entry to free */ static void -free_it (struct GNUNET_IDENTITY_PROVIDER_AttributeIterator *it) +free_it (struct GNUNET_RECLAIM_AttributeIterator *it) { - struct GNUNET_IDENTITY_PROVIDER_Handle *h = it->h; + struct GNUNET_RECLAIM_Handle *h = it->h; GNUNET_CONTAINER_DLL_remove (h->it_head, h->it_tail, @@ -375,7 +375,7 @@ free_it (struct GNUNET_IDENTITY_PROVIDER_AttributeIterator *it) } static void -free_op (struct GNUNET_IDENTITY_PROVIDER_Operation* op) +free_op (struct GNUNET_RECLAIM_Operation* op) { if (NULL == op) return; @@ -397,7 +397,7 @@ static void mq_error_handler (void *cls, enum GNUNET_MQ_Error error) { - struct GNUNET_IDENTITY_PROVIDER_Handle *handle = cls; + struct GNUNET_RECLAIM_Handle *handle = cls; force_reconnect (handle); } @@ -412,8 +412,8 @@ static void handle_attribute_store_response (void *cls, const struct AttributeStoreResultMessage *msg) { - struct GNUNET_IDENTITY_PROVIDER_Handle *h = cls; - struct GNUNET_IDENTITY_PROVIDER_Operation *op; + struct GNUNET_RECLAIM_Handle *h = cls; + struct GNUNET_RECLAIM_Operation *op; uint32_t r_id = ntohl (msg->id); int res; const char *emsg; @@ -448,7 +448,7 @@ handle_attribute_store_response (void *cls, /** * Handle an incoming message of type - * #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_CONSUME_TICKET_RESULT + * #GNUNET_MESSAGE_TYPE_RECLAIM_CONSUME_TICKET_RESULT * * @param cls * @param msg the message we received @@ -474,7 +474,7 @@ check_consume_ticket_result (void *cls, /** * Handle an incoming message of type - * #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_CONSUME_TICKET_RESULT + * #GNUNET_MESSAGE_TYPE_RECLAIM_CONSUME_TICKET_RESULT * * @param cls * @param msg the message we received @@ -483,8 +483,8 @@ static void handle_consume_ticket_result (void *cls, const struct ConsumeTicketResultMessage *msg) { - struct GNUNET_IDENTITY_PROVIDER_Handle *h = cls; - struct GNUNET_IDENTITY_PROVIDER_Operation *op; + struct GNUNET_RECLAIM_Handle *h = cls; + struct GNUNET_RECLAIM_Operation *op; size_t attrs_len; uint32_t r_id = ntohl (msg->id); @@ -500,9 +500,9 @@ handle_consume_ticket_result (void *cls, return; { - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs; - struct GNUNET_IDENTITY_ATTRIBUTE_ClaimListEntry *le; - attrs = GNUNET_IDENTITY_ATTRIBUTE_list_deserialize ((char*)&msg[1], + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs; + struct GNUNET_RECLAIM_ATTRIBUTE_ClaimListEntry *le; + attrs = GNUNET_RECLAIM_ATTRIBUTE_list_deserialize ((char*)&msg[1], attrs_len); if (NULL != op->ar_cb) { @@ -518,7 +518,7 @@ handle_consume_ticket_result (void *cls, op->ar_cb (op->cls, &msg->identity, le->claim); - GNUNET_IDENTITY_ATTRIBUTE_list_destroy (attrs); + GNUNET_RECLAIM_ATTRIBUTE_list_destroy (attrs); } } if (NULL != op) @@ -539,7 +539,7 @@ handle_consume_ticket_result (void *cls, /** * Handle an incoming message of type - * #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_RESULT + * #GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_RESULT * * @param cls * @param msg the message we received @@ -565,7 +565,7 @@ check_attribute_result (void *cls, /** * Handle an incoming message of type - * #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_RESULT + * #GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_RESULT * * @param cls * @param msg the message we received @@ -575,9 +575,9 @@ handle_attribute_result (void *cls, const struct AttributeResultMessage *msg) { static struct GNUNET_CRYPTO_EcdsaPrivateKey identity_dummy; - struct GNUNET_IDENTITY_PROVIDER_Handle *h = cls; - struct GNUNET_IDENTITY_PROVIDER_AttributeIterator *it; - struct GNUNET_IDENTITY_PROVIDER_Operation *op; + struct GNUNET_RECLAIM_Handle *h = cls; + struct GNUNET_RECLAIM_AttributeIterator *it; + struct GNUNET_RECLAIM_Operation *op; size_t attr_len; uint32_t r_id = ntohl (msg->id); @@ -627,8 +627,8 @@ handle_attribute_result (void *cls, } { - struct GNUNET_IDENTITY_ATTRIBUTE_Claim *attr; - attr = GNUNET_IDENTITY_ATTRIBUTE_deserialize ((char*)&msg[1], + struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr; + attr = GNUNET_RECLAIM_ATTRIBUTE_deserialize ((char*)&msg[1], attr_len); if (NULL != it) { @@ -652,7 +652,7 @@ handle_attribute_result (void *cls, /** * Handle an incoming message of type - * #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_RESULT + * #GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_RESULT * * @param cls * @param msg the message we received @@ -677,7 +677,7 @@ check_ticket_result (void *cls, /** * Handle an incoming message of type - * #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_RESULT + * #GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_RESULT * * @param cls * @param msg the message we received @@ -686,10 +686,10 @@ static void handle_ticket_result (void *cls, const struct TicketResultMessage *msg) { - struct GNUNET_IDENTITY_PROVIDER_Handle *handle = cls; - struct GNUNET_IDENTITY_PROVIDER_Operation *op; - struct GNUNET_IDENTITY_PROVIDER_TicketIterator *it; - const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket; + struct GNUNET_RECLAIM_Handle *handle = cls; + struct GNUNET_RECLAIM_Operation *op; + struct GNUNET_RECLAIM_TicketIterator *it; + const struct GNUNET_RECLAIM_Ticket *ticket; uint32_t r_id = ntohl (msg->id); size_t msg_len; @@ -712,7 +712,7 @@ handle_ticket_result (void *cls, if (NULL != op->tr_cb) op->tr_cb (op->cls, NULL); } else { - ticket = (struct GNUNET_IDENTITY_PROVIDER_Ticket *)&msg[1]; + ticket = (struct GNUNET_RECLAIM_Ticket *)&msg[1]; if (NULL != op->tr_cb) op->tr_cb (op->cls, ticket); } @@ -728,7 +728,7 @@ handle_ticket_result (void *cls, it->finish_cb (it->finish_cb_cls); GNUNET_free (it); } else { - ticket = (struct GNUNET_IDENTITY_PROVIDER_Ticket *)&msg[1]; + ticket = (struct GNUNET_RECLAIM_Ticket *)&msg[1]; if (NULL != it->tr_cb) it->tr_cb (it->cls, ticket); } @@ -740,7 +740,7 @@ handle_ticket_result (void *cls, /** * Handle an incoming message of type - * #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_REVOKE_TICKET_RESULT + * #GNUNET_MESSAGE_TYPE_RECLAIM_REVOKE_TICKET_RESULT * * @param cls * @param msg the message we received @@ -749,8 +749,8 @@ static void handle_revoke_ticket_result (void *cls, const struct RevokeTicketResultMessage *msg) { - struct GNUNET_IDENTITY_PROVIDER_Handle *h = cls; - struct GNUNET_IDENTITY_PROVIDER_Operation *op; + struct GNUNET_RECLAIM_Handle *h = cls; + struct GNUNET_RECLAIM_Operation *op; uint32_t r_id = ntohl (msg->id); int32_t success; @@ -785,42 +785,42 @@ handle_revoke_ticket_result (void *cls, /** * Try again to connect to the service. * - * @param h handle to the identity provider service. + * @param h handle to the reclaim service. */ static void -reconnect (struct GNUNET_IDENTITY_PROVIDER_Handle *h) +reconnect (struct GNUNET_RECLAIM_Handle *h) { struct GNUNET_MQ_MessageHandler handlers[] = { GNUNET_MQ_hd_fixed_size (attribute_store_response, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_STORE_RESPONSE, + GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_STORE_RESPONSE, struct AttributeStoreResultMessage, h), GNUNET_MQ_hd_var_size (attribute_result, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_RESULT, + GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_RESULT, struct AttributeResultMessage, h), GNUNET_MQ_hd_var_size (ticket_result, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_RESULT, + GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_RESULT, struct TicketResultMessage, h), GNUNET_MQ_hd_var_size (consume_ticket_result, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_CONSUME_TICKET_RESULT, + GNUNET_MESSAGE_TYPE_RECLAIM_CONSUME_TICKET_RESULT, struct ConsumeTicketResultMessage, h), GNUNET_MQ_hd_fixed_size (revoke_ticket_result, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_REVOKE_TICKET_RESULT, + GNUNET_MESSAGE_TYPE_RECLAIM_REVOKE_TICKET_RESULT, struct RevokeTicketResultMessage, h), GNUNET_MQ_handler_end () }; - struct GNUNET_IDENTITY_PROVIDER_Operation *op; + struct GNUNET_RECLAIM_Operation *op; GNUNET_assert (NULL == h->mq); LOG (GNUNET_ERROR_TYPE_DEBUG, - "Connecting to identity provider service.\n"); + "Connecting to reclaim service.\n"); h->mq = GNUNET_CLIENT_connect (h->cfg, - "identity-provider", + "reclaim", handlers, &mq_error_handler, h); @@ -833,17 +833,17 @@ reconnect (struct GNUNET_IDENTITY_PROVIDER_Handle *h) /** - * Connect to the identity provider service. + * Connect to the reclaim service. * * @param cfg the configuration to use * @return handle to use */ -struct GNUNET_IDENTITY_PROVIDER_Handle * -GNUNET_IDENTITY_PROVIDER_connect (const struct GNUNET_CONFIGURATION_Handle *cfg) +struct GNUNET_RECLAIM_Handle * +GNUNET_RECLAIM_connect (const struct GNUNET_CONFIGURATION_Handle *cfg) { - struct GNUNET_IDENTITY_PROVIDER_Handle *h; + struct GNUNET_RECLAIM_Handle *h; - h = GNUNET_new (struct GNUNET_IDENTITY_PROVIDER_Handle); + h = GNUNET_new (struct GNUNET_RECLAIM_Handle); h->cfg = cfg; reconnect (h); if (NULL == h->mq) @@ -864,9 +864,9 @@ GNUNET_IDENTITY_PROVIDER_connect (const struct GNUNET_CONFIGURATION_Handle *cfg) * @param op operation to cancel */ void -GNUNET_IDENTITY_PROVIDER_cancel (struct GNUNET_IDENTITY_PROVIDER_Operation *op) +GNUNET_RECLAIM_cancel (struct GNUNET_RECLAIM_Operation *op) { - struct GNUNET_IDENTITY_PROVIDER_Handle *h = op->h; + struct GNUNET_RECLAIM_Handle *h = op->h; GNUNET_CONTAINER_DLL_remove (h->op_head, h->op_tail, @@ -881,7 +881,7 @@ GNUNET_IDENTITY_PROVIDER_cancel (struct GNUNET_IDENTITY_PROVIDER_Operation *op) * @param h handle to destroy */ void -GNUNET_IDENTITY_PROVIDER_disconnect (struct GNUNET_IDENTITY_PROVIDER_Handle *h) +GNUNET_RECLAIM_disconnect (struct GNUNET_RECLAIM_Handle *h) { GNUNET_assert (NULL != h); if (NULL != h->mq) @@ -902,7 +902,7 @@ GNUNET_IDENTITY_PROVIDER_disconnect (struct GNUNET_IDENTITY_PROVIDER_Handle *h) * Store an attribute. If the attribute is already present, * it is replaced with the new attribute. * - * @param h handle to the identity provider + * @param h handle to the reclaim * @param pkey private key of the identity * @param attr the attribute value * @param exp_interval the relative expiration interval for the attribute @@ -910,19 +910,19 @@ GNUNET_IDENTITY_PROVIDER_disconnect (struct GNUNET_IDENTITY_PROVIDER_Handle *h) * @param cont_cls closure for @a cont * @return handle to abort the request */ -struct GNUNET_IDENTITY_PROVIDER_Operation * -GNUNET_IDENTITY_PROVIDER_attribute_store (struct GNUNET_IDENTITY_PROVIDER_Handle *h, +struct GNUNET_RECLAIM_Operation * +GNUNET_RECLAIM_attribute_store (struct GNUNET_RECLAIM_Handle *h, const struct GNUNET_CRYPTO_EcdsaPrivateKey *pkey, - const struct GNUNET_IDENTITY_ATTRIBUTE_Claim *attr, + const struct GNUNET_RECLAIM_ATTRIBUTE_Claim *attr, const struct GNUNET_TIME_Relative *exp_interval, - GNUNET_IDENTITY_PROVIDER_ContinuationWithStatus cont, + GNUNET_RECLAIM_ContinuationWithStatus cont, void *cont_cls) { - struct GNUNET_IDENTITY_PROVIDER_Operation *op; + struct GNUNET_RECLAIM_Operation *op; struct AttributeStoreMessage *sam; size_t attr_len; - op = GNUNET_new (struct GNUNET_IDENTITY_PROVIDER_Operation); + op = GNUNET_new (struct GNUNET_RECLAIM_Operation); op->h = h; op->as_cb = cont; op->cls = cont_cls; @@ -930,15 +930,15 @@ GNUNET_IDENTITY_PROVIDER_attribute_store (struct GNUNET_IDENTITY_PROVIDER_Handle GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, op); - attr_len = GNUNET_IDENTITY_ATTRIBUTE_serialize_get_size (attr); + attr_len = GNUNET_RECLAIM_ATTRIBUTE_serialize_get_size (attr); op->env = GNUNET_MQ_msg_extra (sam, attr_len, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_STORE); + GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_STORE); sam->identity = *pkey; sam->id = htonl (op->r_id); sam->exp = GNUNET_htonll (exp_interval->rel_value_us); - GNUNET_IDENTITY_ATTRIBUTE_serialize (attr, + GNUNET_RECLAIM_ATTRIBUTE_serialize (attr, (char*)&sam[1]); sam->attr_len = htons (attr_len); @@ -952,11 +952,11 @@ GNUNET_IDENTITY_PROVIDER_attribute_store (struct GNUNET_IDENTITY_PROVIDER_Handle /** * List all attributes for a local identity. - * This MUST lock the `struct GNUNET_IDENTITY_PROVIDER_Handle` - * for any other calls than #GNUNET_IDENTITY_PROVIDER_get_attributes_next() and - * #GNUNET_IDENTITY_PROVIDER_get_attributes_stop. @a proc will be called once + * This MUST lock the `struct GNUNET_RECLAIM_Handle` + * for any other calls than #GNUNET_RECLAIM_get_attributes_next() and + * #GNUNET_RECLAIM_get_attributes_stop. @a proc will be called once * immediately, and then again after - * #GNUNET_IDENTITY_PROVIDER_get_attributes_next() is invoked. + * #GNUNET_RECLAIM_get_attributes_next() is invoked. * * On error (disconnect), @a error_cb will be invoked. * On normal completion, @a finish_cb proc will be @@ -975,23 +975,23 @@ GNUNET_IDENTITY_PROVIDER_attribute_store (struct GNUNET_IDENTITY_PROVIDER_Handle * @param finish_cb_cls closure for @a finish_cb * @return an iterator handle to use for iteration */ -struct GNUNET_IDENTITY_PROVIDER_AttributeIterator * -GNUNET_IDENTITY_PROVIDER_get_attributes_start (struct GNUNET_IDENTITY_PROVIDER_Handle *h, +struct GNUNET_RECLAIM_AttributeIterator * +GNUNET_RECLAIM_get_attributes_start (struct GNUNET_RECLAIM_Handle *h, const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, GNUNET_SCHEDULER_TaskCallback error_cb, void *error_cb_cls, - GNUNET_IDENTITY_PROVIDER_AttributeResult proc, + GNUNET_RECLAIM_AttributeResult proc, void *proc_cls, GNUNET_SCHEDULER_TaskCallback finish_cb, void *finish_cb_cls) { - struct GNUNET_IDENTITY_PROVIDER_AttributeIterator *it; + struct GNUNET_RECLAIM_AttributeIterator *it; struct GNUNET_MQ_Envelope *env; struct AttributeIterationStartMessage *msg; uint32_t rid; rid = h->r_id_gen++; - it = GNUNET_new (struct GNUNET_IDENTITY_PROVIDER_AttributeIterator); + it = GNUNET_new (struct GNUNET_RECLAIM_AttributeIterator); it->h = h; it->error_cb = error_cb; it->error_cb_cls = error_cb_cls; @@ -1005,7 +1005,7 @@ GNUNET_IDENTITY_PROVIDER_get_attributes_start (struct GNUNET_IDENTITY_PROVIDER_H h->it_tail, it); env = GNUNET_MQ_msg (msg, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_ITERATION_START); + GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_START); msg->id = htonl (rid); msg->identity = *identity; if (NULL == h->mq) @@ -1018,20 +1018,20 @@ GNUNET_IDENTITY_PROVIDER_get_attributes_start (struct GNUNET_IDENTITY_PROVIDER_H /** - * Calls the record processor specified in #GNUNET_IDENTITY_PROVIDER_get_attributes_start + * Calls the record processor specified in #GNUNET_RECLAIM_get_attributes_start * for the next record. * * @param it the iterator */ void -GNUNET_IDENTITY_PROVIDER_get_attributes_next (struct GNUNET_IDENTITY_PROVIDER_AttributeIterator *it) +GNUNET_RECLAIM_get_attributes_next (struct GNUNET_RECLAIM_AttributeIterator *it) { - struct GNUNET_IDENTITY_PROVIDER_Handle *h = it->h; + struct GNUNET_RECLAIM_Handle *h = it->h; struct AttributeIterationNextMessage *msg; struct GNUNET_MQ_Envelope *env; env = GNUNET_MQ_msg (msg, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_ITERATION_NEXT); + GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_NEXT); msg->id = htonl (it->r_id); GNUNET_MQ_send (h->mq, env); @@ -1041,21 +1041,21 @@ GNUNET_IDENTITY_PROVIDER_get_attributes_next (struct GNUNET_IDENTITY_PROVIDER_At /** * Stops iteration and releases the idp handle for further calls. Must * be called on any iteration that has not yet completed prior to calling - * #GNUNET_IDENTITY_PROVIDER_disconnect. + * #GNUNET_RECLAIM_disconnect. * * @param it the iterator */ void -GNUNET_IDENTITY_PROVIDER_get_attributes_stop (struct GNUNET_IDENTITY_PROVIDER_AttributeIterator *it) +GNUNET_RECLAIM_get_attributes_stop (struct GNUNET_RECLAIM_AttributeIterator *it) { - struct GNUNET_IDENTITY_PROVIDER_Handle *h = it->h; + struct GNUNET_RECLAIM_Handle *h = it->h; struct GNUNET_MQ_Envelope *env; struct AttributeIterationStopMessage *msg; if (NULL != h->mq) { env = GNUNET_MQ_msg (msg, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_ITERATION_STOP); + GNUNET_MESSAGE_TYPE_RECLAIM_ATTRIBUTE_ITERATION_STOP); msg->id = htonl (it->r_id); GNUNET_MQ_send (h->mq, env); @@ -1066,10 +1066,10 @@ GNUNET_IDENTITY_PROVIDER_get_attributes_stop (struct GNUNET_IDENTITY_PROVIDER_At /** TODO * Issues a ticket to another identity. The identity may use - * @GNUNET_IDENTITY_PROVIDER_authorization_ticket_consume to consume the ticket + * @GNUNET_RECLAIM_authorization_ticket_consume to consume the ticket * and retrieve the attributes specified in the AttributeList. * - * @param h the identity provider to use + * @param h the reclaim to use * @param iss the issuing identity * @param rp the subject of the ticket (the relying party) * @param attrs the attributes that the relying party is given access to @@ -1077,19 +1077,19 @@ GNUNET_IDENTITY_PROVIDER_get_attributes_stop (struct GNUNET_IDENTITY_PROVIDER_At * @param cb_cls the callback closure * @return handle to abort the operation */ -struct GNUNET_IDENTITY_PROVIDER_Operation * -GNUNET_IDENTITY_PROVIDER_ticket_issue (struct GNUNET_IDENTITY_PROVIDER_Handle *h, +struct GNUNET_RECLAIM_Operation * +GNUNET_RECLAIM_ticket_issue (struct GNUNET_RECLAIM_Handle *h, const struct GNUNET_CRYPTO_EcdsaPrivateKey *iss, const struct GNUNET_CRYPTO_EcdsaPublicKey *rp, - const struct GNUNET_IDENTITY_ATTRIBUTE_ClaimList *attrs, - GNUNET_IDENTITY_PROVIDER_TicketCallback cb, + const struct GNUNET_RECLAIM_ATTRIBUTE_ClaimList *attrs, + GNUNET_RECLAIM_TicketCallback cb, void *cb_cls) { - struct GNUNET_IDENTITY_PROVIDER_Operation *op; + struct GNUNET_RECLAIM_Operation *op; struct IssueTicketMessage *tim; size_t attr_len; - op = GNUNET_new (struct GNUNET_IDENTITY_PROVIDER_Operation); + op = GNUNET_new (struct GNUNET_RECLAIM_Operation); op->h = h; op->tr_cb = cb; op->cls = cb_cls; @@ -1097,15 +1097,15 @@ GNUNET_IDENTITY_PROVIDER_ticket_issue (struct GNUNET_IDENTITY_PROVIDER_Handle *h GNUNET_CONTAINER_DLL_insert_tail (h->op_head, h->op_tail, op); - attr_len = GNUNET_IDENTITY_ATTRIBUTE_list_serialize_get_size (attrs); + attr_len = GNUNET_RECLAIM_ATTRIBUTE_list_serialize_get_size (attrs); op->env = GNUNET_MQ_msg_extra (tim, attr_len, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ISSUE_TICKET); + GNUNET_MESSAGE_TYPE_RECLAIM_ISSUE_TICKET); tim->identity = *iss; tim->rp = *rp; tim->id = htonl (op->r_id); - GNUNET_IDENTITY_ATTRIBUTE_list_serialize (attrs, + GNUNET_RECLAIM_ATTRIBUTE_list_serialize (attrs, (char*)&tim[1]); tim->attr_len = htons (attr_len); @@ -1119,24 +1119,24 @@ GNUNET_IDENTITY_PROVIDER_ticket_issue (struct GNUNET_IDENTITY_PROVIDER_Handle *h * Consumes an issued ticket. The ticket is persisted * and used to retrieve identity information from the issuer * - * @param h the identity provider to use + * @param h the reclaim to use * @param identity the identity that is the subject of the issued ticket (the relying party) * @param ticket the issued ticket to consume * @param cb the callback to call * @param cb_cls the callback closure * @return handle to abort the operation */ -struct GNUNET_IDENTITY_PROVIDER_Operation * -GNUNET_IDENTITY_PROVIDER_ticket_consume (struct GNUNET_IDENTITY_PROVIDER_Handle *h, +struct GNUNET_RECLAIM_Operation * +GNUNET_RECLAIM_ticket_consume (struct GNUNET_RECLAIM_Handle *h, const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, - const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket, - GNUNET_IDENTITY_PROVIDER_AttributeResult cb, + const struct GNUNET_RECLAIM_Ticket *ticket, + GNUNET_RECLAIM_AttributeResult cb, void *cb_cls) { - struct GNUNET_IDENTITY_PROVIDER_Operation *op; + struct GNUNET_RECLAIM_Operation *op; struct ConsumeTicketMessage *ctm; - op = GNUNET_new (struct GNUNET_IDENTITY_PROVIDER_Operation); + op = GNUNET_new (struct GNUNET_RECLAIM_Operation); op->h = h; op->ar_cb = cb; op->cls = cb_cls; @@ -1145,14 +1145,14 @@ GNUNET_IDENTITY_PROVIDER_ticket_consume (struct GNUNET_IDENTITY_PROVIDER_Handle h->op_tail, op); op->env = GNUNET_MQ_msg_extra (ctm, - sizeof (const struct GNUNET_IDENTITY_PROVIDER_Ticket), - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_CONSUME_TICKET); + sizeof (const struct GNUNET_RECLAIM_Ticket), + GNUNET_MESSAGE_TYPE_RECLAIM_CONSUME_TICKET); ctm->identity = *identity; ctm->id = htonl (op->r_id); GNUNET_memcpy ((char*)&ctm[1], ticket, - sizeof (const struct GNUNET_IDENTITY_PROVIDER_Ticket)); + sizeof (const struct GNUNET_RECLAIM_Ticket)); if (NULL != h->mq) GNUNET_MQ_send_copy (h->mq, @@ -1166,7 +1166,7 @@ GNUNET_IDENTITY_PROVIDER_ticket_consume (struct GNUNET_IDENTITY_PROVIDER_Handle * Lists all tickets that have been issued to remote * identites (relying parties) * - * @param h the identity provider to use + * @param h the reclaim to use * @param identity the issuing identity * @param error_cb function to call on error (i.e. disconnect), * the handle is afterwards invalid @@ -1179,17 +1179,17 @@ GNUNET_IDENTITY_PROVIDER_ticket_consume (struct GNUNET_IDENTITY_PROVIDER_Handle * @param finish_cb_cls closure for @a finish_cb * @return an iterator handle to use for iteration */ -struct GNUNET_IDENTITY_PROVIDER_TicketIterator * -GNUNET_IDENTITY_PROVIDER_ticket_iteration_start (struct GNUNET_IDENTITY_PROVIDER_Handle *h, +struct GNUNET_RECLAIM_TicketIterator * +GNUNET_RECLAIM_ticket_iteration_start (struct GNUNET_RECLAIM_Handle *h, const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, GNUNET_SCHEDULER_TaskCallback error_cb, void *error_cb_cls, - GNUNET_IDENTITY_PROVIDER_TicketCallback proc, + GNUNET_RECLAIM_TicketCallback proc, void *proc_cls, GNUNET_SCHEDULER_TaskCallback finish_cb, void *finish_cb_cls) { - struct GNUNET_IDENTITY_PROVIDER_TicketIterator *it; + struct GNUNET_RECLAIM_TicketIterator *it; struct GNUNET_CRYPTO_EcdsaPublicKey identity_pub; struct GNUNET_MQ_Envelope *env; struct TicketIterationStartMessage *msg; @@ -1198,7 +1198,7 @@ GNUNET_IDENTITY_PROVIDER_ticket_iteration_start (struct GNUNET_IDENTITY_PROVIDER GNUNET_CRYPTO_ecdsa_key_get_public (identity, &identity_pub); rid = h->r_id_gen++; - it = GNUNET_new (struct GNUNET_IDENTITY_PROVIDER_TicketIterator); + it = GNUNET_new (struct GNUNET_RECLAIM_TicketIterator); it->h = h; it->error_cb = error_cb; it->error_cb_cls = error_cb_cls; @@ -1211,7 +1211,7 @@ GNUNET_IDENTITY_PROVIDER_ticket_iteration_start (struct GNUNET_IDENTITY_PROVIDER h->ticket_it_tail, it); env = GNUNET_MQ_msg (msg, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_START); + GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_START); msg->id = htonl (rid); msg->identity = identity_pub; msg->is_audience = htonl (GNUNET_NO); @@ -1229,7 +1229,7 @@ GNUNET_IDENTITY_PROVIDER_ticket_iteration_start (struct GNUNET_IDENTITY_PROVIDER * Lists all tickets that have been issued to remote * identites (relying parties) * - * @param h the identity provider to use + * @param h the reclaim to use * @param identity the issuing identity * @param error_cb function to call on error (i.e. disconnect), * the handle is afterwards invalid @@ -1242,23 +1242,23 @@ GNUNET_IDENTITY_PROVIDER_ticket_iteration_start (struct GNUNET_IDENTITY_PROVIDER * @param finish_cb_cls closure for @a finish_cb * @return an iterator handle to use for iteration */ -struct GNUNET_IDENTITY_PROVIDER_TicketIterator * -GNUNET_IDENTITY_PROVIDER_ticket_iteration_start_rp (struct GNUNET_IDENTITY_PROVIDER_Handle *h, +struct GNUNET_RECLAIM_TicketIterator * +GNUNET_RECLAIM_ticket_iteration_start_rp (struct GNUNET_RECLAIM_Handle *h, const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, GNUNET_SCHEDULER_TaskCallback error_cb, void *error_cb_cls, - GNUNET_IDENTITY_PROVIDER_TicketCallback proc, + GNUNET_RECLAIM_TicketCallback proc, void *proc_cls, GNUNET_SCHEDULER_TaskCallback finish_cb, void *finish_cb_cls) { - struct GNUNET_IDENTITY_PROVIDER_TicketIterator *it; + struct GNUNET_RECLAIM_TicketIterator *it; struct GNUNET_MQ_Envelope *env; struct TicketIterationStartMessage *msg; uint32_t rid; rid = h->r_id_gen++; - it = GNUNET_new (struct GNUNET_IDENTITY_PROVIDER_TicketIterator); + it = GNUNET_new (struct GNUNET_RECLAIM_TicketIterator); it->h = h; it->error_cb = error_cb; it->error_cb_cls = error_cb_cls; @@ -1271,7 +1271,7 @@ GNUNET_IDENTITY_PROVIDER_ticket_iteration_start_rp (struct GNUNET_IDENTITY_PROVI h->ticket_it_tail, it); env = GNUNET_MQ_msg (msg, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_START); + GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_START); msg->id = htonl (rid); msg->identity = *identity; msg->is_audience = htonl (GNUNET_YES); @@ -1286,20 +1286,20 @@ GNUNET_IDENTITY_PROVIDER_ticket_iteration_start_rp (struct GNUNET_IDENTITY_PROVI } /** - * Calls the record processor specified in #GNUNET_IDENTITY_PROVIDER_ticket_iteration_start + * Calls the record processor specified in #GNUNET_RECLAIM_ticket_iteration_start * for the next record. * * @param it the iterator */ void -GNUNET_IDENTITY_PROVIDER_ticket_iteration_next (struct GNUNET_IDENTITY_PROVIDER_TicketIterator *it) +GNUNET_RECLAIM_ticket_iteration_next (struct GNUNET_RECLAIM_TicketIterator *it) { - struct GNUNET_IDENTITY_PROVIDER_Handle *h = it->h; + struct GNUNET_RECLAIM_Handle *h = it->h; struct TicketIterationNextMessage *msg; struct GNUNET_MQ_Envelope *env; env = GNUNET_MQ_msg (msg, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_NEXT); + GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_NEXT); msg->id = htonl (it->r_id); GNUNET_MQ_send (h->mq, env); @@ -1309,21 +1309,21 @@ GNUNET_IDENTITY_PROVIDER_ticket_iteration_next (struct GNUNET_IDENTITY_PROVIDER_ /** * Stops iteration and releases the idp handle for further calls. Must * be called on any iteration that has not yet completed prior to calling - * #GNUNET_IDENTITY_PROVIDER_disconnect. + * #GNUNET_RECLAIM_disconnect. * * @param it the iterator */ void -GNUNET_IDENTITY_PROVIDER_ticket_iteration_stop (struct GNUNET_IDENTITY_PROVIDER_TicketIterator *it) +GNUNET_RECLAIM_ticket_iteration_stop (struct GNUNET_RECLAIM_TicketIterator *it) { - struct GNUNET_IDENTITY_PROVIDER_Handle *h = it->h; + struct GNUNET_RECLAIM_Handle *h = it->h; struct GNUNET_MQ_Envelope *env; struct TicketIterationStopMessage *msg; if (NULL != h->mq) { env = GNUNET_MQ_msg (msg, - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_STOP); + GNUNET_MESSAGE_TYPE_RECLAIM_TICKET_ITERATION_STOP); msg->id = htonl (it->r_id); GNUNET_MQ_send (h->mq, env); @@ -1335,26 +1335,26 @@ GNUNET_IDENTITY_PROVIDER_ticket_iteration_stop (struct GNUNET_IDENTITY_PROVIDER_ * Revoked an issued ticket. The relying party will be unable to retrieve * updated attributes. * - * @param h the identity provider to use + * @param h the reclaim to use * @param identity the issuing identity * @param ticket the ticket to revoke * @param cb the callback * @param cb_cls the callback closure * @return handle to abort the operation */ -struct GNUNET_IDENTITY_PROVIDER_Operation * -GNUNET_IDENTITY_PROVIDER_ticket_revoke (struct GNUNET_IDENTITY_PROVIDER_Handle *h, +struct GNUNET_RECLAIM_Operation * +GNUNET_RECLAIM_ticket_revoke (struct GNUNET_RECLAIM_Handle *h, const struct GNUNET_CRYPTO_EcdsaPrivateKey *identity, - const struct GNUNET_IDENTITY_PROVIDER_Ticket *ticket, - GNUNET_IDENTITY_PROVIDER_ContinuationWithStatus cb, + const struct GNUNET_RECLAIM_Ticket *ticket, + GNUNET_RECLAIM_ContinuationWithStatus cb, void *cb_cls) { - struct GNUNET_IDENTITY_PROVIDER_Operation *op; + struct GNUNET_RECLAIM_Operation *op; struct RevokeTicketMessage *msg; uint32_t rid; rid = h->r_id_gen++; - op = GNUNET_new (struct GNUNET_IDENTITY_PROVIDER_Operation); + op = GNUNET_new (struct GNUNET_RECLAIM_Operation); op->h = h; op->rvk_cb = cb; op->cls = cb_cls; @@ -1363,13 +1363,13 @@ GNUNET_IDENTITY_PROVIDER_ticket_revoke (struct GNUNET_IDENTITY_PROVIDER_Handle * h->op_tail, op); op->env = GNUNET_MQ_msg_extra (msg, - sizeof (struct GNUNET_IDENTITY_PROVIDER_Ticket), - GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_REVOKE_TICKET); + sizeof (struct GNUNET_RECLAIM_Ticket), + GNUNET_MESSAGE_TYPE_RECLAIM_REVOKE_TICKET); msg->id = htonl (rid); msg->identity = *identity; GNUNET_memcpy (&msg[1], ticket, - sizeof (struct GNUNET_IDENTITY_PROVIDER_Ticket)); + sizeof (struct GNUNET_RECLAIM_Ticket)); if (NULL != h->mq) { GNUNET_MQ_send (h->mq, op->env); @@ -1380,4 +1380,4 @@ GNUNET_IDENTITY_PROVIDER_ticket_revoke (struct GNUNET_IDENTITY_PROVIDER_Handle * -/* end of identity_provider_api.c */ +/* end of reclaim_api.c */ diff --git a/src/reclaim/test_reclaim.sh b/src/reclaim/test_reclaim.sh new file mode 100755 index 000000000..311f5382a --- /dev/null +++ b/src/reclaim/test_reclaim.sh @@ -0,0 +1,31 @@ +#!/bin/bash +#trap "gnunet-arm -e -c test_reclaim_lookup.conf" SIGINT + +LOCATION=$(which gnunet-config) +if [ -z $LOCATION ] +then + LOCATION="gnunet-config" +fi +$LOCATION --version 1> /dev/null +if test $? != 0 +then + echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" + exit 77 +fi + +rm -rf `gnunet-config -c test_reclaim.conf -s PATHS -o GNUNET_HOME -f` + +# (1) PKEY1.user -> PKEY2.resu.user +# (2) PKEY2.resu -> PKEY3 +# (3) PKEY3.user -> PKEY4 + + +which timeout &> /dev/null && DO_TIMEOUT="timeout 30" + +TEST_ATTR="test" +gnunet-arm -s -c test_reclaim.conf +gnunet-identity -C testego -c test_reclaim.conf +valgrind gnunet-reclaim -e testego -a email -V john@doe.gnu -c test_reclaim.conf +gnunet-reclaim -e testego -a name -V John -c test_reclaim.conf +gnunet-reclaim -e testego -D -c test_reclaim.conf +gnunet-arm -e -c test_reclaim.conf diff --git a/src/reclaim/test_reclaim_attribute.sh b/src/reclaim/test_reclaim_attribute.sh new file mode 100755 index 000000000..39bd715b7 --- /dev/null +++ b/src/reclaim/test_reclaim_attribute.sh @@ -0,0 +1,40 @@ +#!/bin/bash +trap "gnunet-arm -e -c test_reclaim.conf" SIGINT + +LOCATION=$(which gnunet-config) +if [ -z $LOCATION ] +then + LOCATION="gnunet-config" +fi +$LOCATION --version 1> /dev/null +if test $? != 0 +then + echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" + exit 77 +fi + +rm -rf `gnunet-config -c test_reclaim.conf -s PATHS -o GNUNET_HOME -f` + +# (1) PKEY1.user -> PKEY2.resu.user +# (2) PKEY2.resu -> PKEY3 +# (3) PKEY3.user -> PKEY4 + + +which timeout &> /dev/null && DO_TIMEOUT="timeout 30" + +TEST_ATTR="test" +gnunet-arm -s -c test_reclaim.conf +#gnunet-arm -i rest -c test_reclaim.conf +gnunet-identity -C testego -c test_reclaim.conf +gnunet-identity -C rpego -c test_reclaim.conf +TEST_KEY=$(gnunet-identity -d -c test_reclaim.conf | grep testego | awk '{print $3}') +gnunet-reclaim -e testego -a email -V john@doe.gnu -c test_reclaim.conf +gnunet-reclaim -e testego -a name -V John -c test_reclaim.conf > /dev/null 2>&1 +if test $? != 0 +then + echo "Failed." + exit 1 +fi + +#curl localhost:7776/reclaim/attributes/testego +gnunet-arm -e -c test_reclaim.conf diff --git a/src/reclaim/test_reclaim_consume.sh b/src/reclaim/test_reclaim_consume.sh new file mode 100755 index 000000000..36c8052d0 --- /dev/null +++ b/src/reclaim/test_reclaim_consume.sh @@ -0,0 +1,43 @@ +#!/bin/bash +trap "gnunet-arm -e -c test_reclaim.conf" SIGINT + +LOCATION=$(which gnunet-config) +if [ -z $LOCATION ] +then + LOCATION="gnunet-config" +fi +$LOCATION --version 1> /dev/null +if test $? != 0 +then + echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" + exit 77 +fi + +rm -rf `gnunet-config -c test_reclaim.conf -s PATHS -o GNUNET_HOME -f` + +# (1) PKEY1.user -> PKEY2.resu.user +# (2) PKEY2.resu -> PKEY3 +# (3) PKEY3.user -> PKEY4 + + +which timeout &> /dev/null && DO_TIMEOUT="timeout 30" + +TEST_ATTR="test" +gnunet-arm -s -c test_reclaim.conf +#gnunet-arm -i rest -c test_reclaim.conf +gnunet-identity -C testego -c test_reclaim.conf +gnunet-identity -C rpego -c test_reclaim.conf +SUBJECT_KEY=$(gnunet-identity -d -c test_reclaim.conf | grep rpego | awk '{print $3}') +TEST_KEY=$(gnunet-identity -d -c test_reclaim.conf | grep testego | awk '{print $3}') +gnunet-reclaim -e testego -a email -V john@doe.gnu -c test_reclaim.conf +gnunet-reclaim -e testego -a name -V John -c test_reclaim.conf +TICKET=$(gnunet-reclaim -e testego -i "email,name" -r $SUBJECT_KEY -c test_reclaim.conf | awk '{print $1}') +gnunet-reclaim -e rpego -C $TICKET -c test_reclaim.conf > /dev/null 2>&1 + +if test $? != 0 +then + "Failed." + exit 1 +fi +#curl http://localhost:7776/reclaim/tickets/testego +gnunet-arm -e -c test_reclaim.conf diff --git a/src/identity-provider/test_idp_defaults.conf b/src/reclaim/test_reclaim_defaults.conf similarity index 100% rename from src/identity-provider/test_idp_defaults.conf rename to src/reclaim/test_reclaim_defaults.conf diff --git a/src/reclaim/test_reclaim_issue.sh b/src/reclaim/test_reclaim_issue.sh new file mode 100755 index 000000000..6a71470e1 --- /dev/null +++ b/src/reclaim/test_reclaim_issue.sh @@ -0,0 +1,42 @@ +#!/bin/bash +trap "gnunet-arm -e -c test_reclaim.conf" SIGINT + +LOCATION=$(which gnunet-config) +if [ -z $LOCATION ] +then + LOCATION="gnunet-config" +fi +$LOCATION --version 1> /dev/null +if test $? != 0 +then + echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" + exit 77 +fi + +rm -rf `gnunet-config -c test_reclaim.conf -s PATHS -o GNUNET_HOME -f` + +# (1) PKEY1.user -> PKEY2.resu.user +# (2) PKEY2.resu -> PKEY3 +# (3) PKEY3.user -> PKEY4 + + +which timeout &> /dev/null && DO_TIMEOUT="timeout 30" + +TEST_ATTR="test" +gnunet-arm -s -c test_reclaim.conf +#gnunet-arm -i rest -c test_reclaim.conf +gnunet-identity -C testego -c test_reclaim.conf +gnunet-identity -C rpego -c test_reclaim.conf +SUBJECT_KEY=$(gnunet-identity -d -c test_reclaim.conf | grep rpego | awk '{print $3}') +TEST_KEY=$(gnunet-identity -d -c test_reclaim.conf | grep testego | awk '{print $3}') +gnunet-reclaim -e testego -a email -V john@doe.gnu -c test_reclaim.conf > /dev/null 2>&1 +gnunet-reclaim -e testego -a name -V John -c test_reclaim.conf > /dev/null 2>&1 +#gnunet-reclaim -e testego -D -c test_reclaim.conf +gnunet-reclaim -e testego -i "email,name" -r $SUBJECT_KEY -c test_reclaim.conf > /dev/null 2>&1 +if test $? != 0 +then + echo "Failed." + exit 1 +fi +#curl http://localhost:7776/reclaim/attributes/testego +gnunet-arm -e -c test_reclaim.conf diff --git a/src/reclaim/test_reclaim_revoke.sh b/src/reclaim/test_reclaim_revoke.sh new file mode 100755 index 000000000..595752fd8 --- /dev/null +++ b/src/reclaim/test_reclaim_revoke.sh @@ -0,0 +1,65 @@ +#!/bin/bash +trap "gnunet-arm -e -c test_reclaim.conf" SIGINT + +LOCATION=$(which gnunet-config) +if [ -z $LOCATION ] +then + LOCATION="gnunet-config" +fi +$LOCATION --version 1> /dev/null +if test $? != 0 +then + echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" + exit 77 +fi + +rm -rf `gnunet-config -c test_reclaim.conf -s PATHS -o GNUNET_HOME -f` + +# (1) PKEY1.user -> PKEY2.resu.user +# (2) PKEY2.resu -> PKEY3 +# (3) PKEY3.user -> PKEY4 + + +which timeout &> /dev/null && DO_TIMEOUT="timeout 30" + +TEST_ATTR="test" +gnunet-arm -s -c test_reclaim.conf 2&>1 > /dev/null +gnunet-identity -C alice -c test_reclaim.conf +gnunet-identity -C bob -c test_reclaim.conf +gnunet-identity -C eve -c test_reclaim.conf +ALICE_KEY=$(gnunet-identity -d -c test_reclaim.conf | grep alice | awk '{print $3}') +BOB_KEY=$(gnunet-identity -d -c test_reclaim.conf | grep bob | awk '{print $3}') +EVE_KEY=$(gnunet-identity -d -c test_reclaim.conf | grep eve | awk '{print $3}') + +gnunet-reclaim -e alice -E 15s -a email -V john@doe.gnu -c test_reclaim.conf +gnunet-reclaim -e alice -E 15s -a name -V John -c test_reclaim.conf +TICKET_BOB=$(gnunet-reclaim -e alice -i "email,name" -r $BOB_KEY -c test_reclaim.conf | awk '{print $1}') +#gnunet-reclaim -e bob -C $TICKET_BOB -c test_reclaim.conf +TICKET_EVE=$(gnunet-reclaim -e alice -i "email" -r $EVE_KEY -c test_reclaim.conf | awk '{print $1}') + +#echo "Consuming $TICKET" +#gnunet-reclaim -e eve -C $TICKET_EVE -c test_reclaim.conf +gnunet-reclaim -e alice -R $TICKET_EVE -c test_reclaim.conf + +#sleep 6 + +gnunet-reclaim -e eve -C $TICKET_EVE -c test_reclaim.conf 2&>1 >/dev/null +if test $? == 0 +then + echo "Eve can still resolve attributes..." + gnunet-arm -e -c test_reclaim.conf + exit 1 +fi + +gnunet-arm -e -c test_reclaim.conf +gnunet-arm -s -c test_reclaim.conf 2&>1 > /dev/null + +gnunet-reclaim -e bob -C $TICKET_BOB -c test_reclaim.conf 2&>1 >/dev/null +if test $? != 0 +then + echo "Bob cannot resolve attributes..." + gnunet-arm -e -c test_reclaim.conf + exit 1 +fi + +gnunet-arm -e -c test_reclaim.conf -- 2.25.1