Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add default cred to HTTP link
[src/app-framework-binder.git]
/
src
/
afb-xreq.c
diff --git
a/src/afb-xreq.c
b/src/afb-xreq.c
index
b54b436
..
0aef608
100644
(file)
--- a/
src/afb-xreq.c
+++ b/
src/afb-xreq.c
@@
-16,7
+16,7
@@
*/
#define _GNU_SOURCE
*/
#define _GNU_SOURCE
-#define
NO_BINDING
_VERBOSE_MACRO
+#define
AFB_BINDING_PRAGMA_NO
_VERBOSE_MACRO
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
@@
-439,11
+439,11
@@
void afb_xreq_subcall(struct afb_xreq *xreq, const char *api, const char *verb,
afb_req_subcall(to_req(xreq), api, verb, args, callback, cb_closure);
}
afb_req_subcall(to_req(xreq), api, verb, args, callback, cb_closure);
}
-
int xreq_session_check
(struct afb_xreq *xreq, int sessionflags)
+
static int xreq_session_check_apply
(struct afb_xreq *xreq, int sessionflags)
{
int loa;
{
int loa;
- if ((sessionflags & (AFB_SESSION_C
REATE|AFB_SESSION_C
LOSE|AFB_SESSION_RENEW|AFB_SESSION_CHECK|AFB_SESSION_LOA_EQ)) != 0) {
+ if ((sessionflags & (AFB_SESSION_CLOSE|AFB_SESSION_RENEW|AFB_SESSION_CHECK|AFB_SESSION_LOA_EQ)) != 0) {
if (!afb_context_check(&xreq->context)) {
afb_context_close(&xreq->context);
afb_xreq_fail_f(xreq, "failed", "invalid token's identity");
if (!afb_context_check(&xreq->context)) {
afb_context_close(&xreq->context);
afb_xreq_fail_f(xreq, "failed", "invalid token's identity");
@@
-452,14
+452,6
@@
int xreq_session_check(struct afb_xreq *xreq, int sessionflags)
}
}
}
}
- if ((sessionflags & AFB_SESSION_CREATE) != 0) {
- if (afb_context_check_loa(&xreq->context, 1)) {
- afb_xreq_fail_f(xreq, "failed", "invalid creation state");
- errno = EINVAL;
- return -1;
- }
- }
-
if ((sessionflags & AFB_SESSION_LOA_GE) != 0) {
loa = (sessionflags >> AFB_SESSION_LOA_SHIFT) & AFB_SESSION_LOA_MASK;
if (!afb_context_check_loa(&xreq->context, loa)) {
if ((sessionflags & AFB_SESSION_LOA_GE) != 0) {
loa = (sessionflags >> AFB_SESSION_LOA_SHIFT) & AFB_SESSION_LOA_MASK;
if (!afb_context_check_loa(&xreq->context, loa)) {
@@
-478,38
+470,33
@@
int xreq_session_check(struct afb_xreq *xreq, int sessionflags)
}
}
}
}
- return 0;
-}
-
-void xreq_session_apply(struct afb_xreq *xreq, int sessionflags)
-{
- if ((sessionflags & (AFB_SESSION_CREATE | AFB_SESSION_RENEW)) != 0) {
+ if ((sessionflags & AFB_SESSION_RENEW) != 0) {
afb_context_refresh(&xreq->context);
}
if ((sessionflags & AFB_SESSION_CLOSE) != 0) {
afb_context_change_loa(&xreq->context, 0);
afb_context_close(&xreq->context);
}
afb_context_refresh(&xreq->context);
}
if ((sessionflags & AFB_SESSION_CLOSE) != 0) {
afb_context_change_loa(&xreq->context, 0);
afb_context_close(&xreq->context);
}
-}
-
-int xreq_session_check_apply(struct afb_xreq *xreq, int sessionflags)
-{
- int rc = xreq_session_check(xreq, sessionflags);
- if (!rc)
- xreq_session_apply(xreq, sessionflags);
- return
rc
;
+ return
0
;
}
}
-void afb_xreq_call
(struct afb_xreq *xreq, void (*method)(struct afb_req req)
)
+void afb_xreq_call
_verb_v1(struct afb_xreq *xreq, const struct afb_verb_desc_v1 *verb
)
{
{
- method(to_req(xreq));
+ if (!verb)
+ afb_xreq_fail_unknown_verb(xreq);
+ else
+ if (!xreq_session_check_apply(xreq, verb->session))
+ verb->callback(to_req(xreq));
}
}
-void afb_xreq_c
heck_apply_call(struct afb_xreq *xreq, int sessionflags, void (*method)(struct afb_req req)
)
+void afb_xreq_c
all_verb_v2(struct afb_xreq *xreq, const struct afb_verb_v2 *verb
)
{
{
- if (!xreq_session_check_apply(xreq, sessionflags))
- method(to_req(xreq));
+ if (!verb)
+ afb_xreq_fail_unknown_verb(xreq);
+ else
+ if (!xreq_session_check_apply(xreq, verb->session))
+ verb->callback(to_req(xreq));
}
void afb_xreq_init(struct afb_xreq *xreq, const struct afb_xreq_query_itf *queryitf)
}
void afb_xreq_init(struct afb_xreq *xreq, const struct afb_xreq_query_itf *queryitf)