webserver: comparison src/server/httprequest.c

-:dbc01588686e
+:ce8fecc9847d
 NSAPIRequest *rq = malloc(sizeof(NSAPIRequest));
 request->rq = rq;
 rq->phase = NSAPIAuthTrans;
 // fill session structure
+sn->sys_fd = request->connection->fd;
 sn->sn.pool = pool_create();
 sn->sn.csd = stream_new_from_fd(request->connection->fd);
 sn->sn.client = NULL;
 sn->sn.next = NULL;
 sn->sn.fill = 1;
 do {
 switch(rq->phase) {
 case NSAPIAuthTrans: {
 rq->phase++;
+nsapi_context_next_stage(&rq->context);
 }
 case NSAPINameTrans: {
 printf(">>> NameTrans\n");
 r = nsapi_nametrans(sn, rq);
 if(r != REQ_PROCEED) {
 break;
 }
 rq->phase++;
+nsapi_context_next_stage(&rq->context);
 }
 case NSAPIPathCheck: {
 printf(">>> PathCheck\n");
 rq->phase++;
+nsapi_context_next_stage(&rq->context);
 }
 case NSAPIObjectType: {
-rq->phase++;
+printf(">>> ObjectType\n");
+rq->phase++;
+nsapi_context_next_stage(&rq->context);
 }
 case NSAPIService: {
 printf(">>> Service\n");
 r = nsapi_service(sn, rq);
 if(r != REQ_PROCEED) {
 break;
 }
 rq->phase++;
+nsapi_context_next_stage(&rq->context);
+}
+case NSAPIAddLog: {
+printf(">>> AddLog\n");
+rq->phase++;
+nsapi_context_next_stage(&rq->context);
 }
 case REQ_FINISH: {
 printf(">>> Finish\n");
 r = nsapi_finish_request(sn, rq);
 }
 return r;
 }
 int nsapi_finish_request(NSAPISession *sn, NSAPIRequest *rq) {
+// TODO: free memory
+close(sn->sys_fd);
 return 0;
 }
 int nsapi_nametrans(NSAPISession *sn, NSAPIRequest *rq) {
-httpd_objset *objset = rq->vs->objset;
+HTTPObjectConfig *objconf = rq->vs->objects;
 printf("nsapi_nametrans\n");
+httpd_objset *objset = objset_create(sn->sn.pool);
-int ret = -1;
+rq->rq.os = objset;
-for(int i=0;i<objset->pos;i++) {
+/* first object in objconf is the default object  TODO: make sure it is */
+objset_add_object(sn->sn.pool, objset, objconf->objects[0]);
+httpd_object *obj = objset->obj[0]; /* nametrans only in default object */
+dtable *dt = object_get_dtable(obj, NSAPINameTrans);
+/* execute directives */
+int ret = rq->context.last_req_code;
+char *name = NULL;
+char *ppath = NULL;
+for(int i=NCX_DI(rq);i<dt->ndir;i++) {
+directive *d = dt->dirs[i];
+printf("execute [%s]\n", d->func->name);
+ret = d->func->func(d->param, (Session*)sn, (Request*)rq);
+/* check for name or ppath */
+name = pblock_findkeyval(pb_key_name, rq->rq.vars);
+ppath = pblock_findkeyval(pb_key_ppath, rq->rq.vars);
+/* add additional objects to the objset */
+if(add_objects(objconf, objset, sn, rq, name, ppath) == REQ_ABORTED) {
+fprintf(stderr, "add_objects failed\n");
+return REQ_ABORTED;
+}
+if(ret != REQ_NOACTION) {
+/*
+* if a saf is still processing, we need to save the context, to
+* process this object at a later time
+*/
+if(ret == REQ_PROCESSING) {
+/* save nsapi context */
+/* add +1 to start next round with next function */
+rq->context.dtable_index = i + 1;
+}
+return ret;
+}
+}
+/* if no function has set the ppath var, translate it to docroot */
+if(ret == REQ_NOACTION && ppath == NULL) {
+sstr_t docroot = rq->vs->document_root;
+if(docroot.length < 1) {
+printf("docroot too short\n");
+return REQ_ABORTED; /* docroot too short */
+}
+/* if there is a trailing '/', remove it */
+if(docroot.ptr[docroot.length - 1] == '/') {
+docroot.length--;
+}
+sstr_t uri = sstr(pblock_findkeyval(pb_key_uri, rq->rq.reqpb));
+sstr_t translated;
+translated.length = docroot.length + uri.length;
+translated.ptr = alloca(translated.length + 1);
+translated = sstrncat(2, translated, docroot, uri);
+pblock_kvinsert(
+pb_key_ppath,
+translated.ptr,
+translated.length,
+rq->rq.vars);
+}
+return REQ_PROCEED;
+}
+int nsapi_service(NSAPISession *sn, NSAPIRequest *rq) {
+printf("nsapi_service\n");
+httpd_objset *objset = rq->rq.os;
+if(NCX_OI(rq) == -1) {
+NCX_OI(rq) = objset->pos - 1;
+}
+int ret = rq->context.last_req_code;
+for(int i=NCX_OI(rq);i>=0;i--) {
 httpd_object *obj = objset->obj[i];
-dtable *dt = object_get_dtable(obj, NSAPINameTrans);
+dtable *dt = object_get_dtable(obj, NSAPIService);
-printf("object[%s] dt: %d\n", obj->name, dt);
 // execute directives
 for(int j=0;j<dt->ndir;j++) {
 directive *d = dt->dirs[j];
-printf("execute [%s]\n", d->func->name);
 ret = d->func->func(d->param, (Session*)sn, (Request*)rq);
-if(ret == REQ_PROCEED || ret == REQ_PROCESSING) {
+if(ret != REQ_NOACTION) {
-break;
+if(ret == REQ_PROCESSING) {
-}
+/* save nsapi context */
-}
+rq->context.objset_index = i;
-// TODO: stultus
+/* add +1 to start next round with next function */
-if(ret == REQ_PROCEED || ret == REQ_PROCESSING) {
+rq->context.dtable_index = j + 1;
-break;
+}
-}
-}
+return ret;
+}
-// todo: check object, path, ...
+}
-char *ppath = pblock_findkeyval(pb_key_ppath, rq->rq.vars);
+}
-printf("ppath: [%s]\n", ppath);
 return ret;
 }
-int nsapi_service(NSAPISession *sn, NSAPIRequest *rq) {
+/*
-httpd_objset *objset = rq->vs->objset;
+* adds objects with specific name or path to the httpd_objset
+*/
-int ret = -1;
+int add_objects(
-for(int i=0;i<objset->pos;i++) {
+HTTPObjectConfig *objs,
-httpd_object *obj = objset->obj[i];
+httpd_objset *os,
-dtable *dt = object_get_dtable(obj, NSAPIService);
+NSAPISession *sn,
+NSAPIRequest *rq,
-// execute directives
+char *name,
-for(int j=0;j<dt->ndir;j++) {
+char *path)
-directive *d = dt->dirs[j];
+{
+/* first, add all objects with a matching path */
-ret = d->func->func(d->param, (Session*)sn, (Request*)rq);
-if(ret == REQ_PROCEED || ret == REQ_PROCESSING) {
-break;
+/* add object with object with matching name */
-}
-}
+return REQ_PROCEED;
-// TODO: stultus
+}
-if(ret == REQ_PROCEED || ret == REQ_PROCESSING) {
-break;
-}
-}
-return ret;
-}

Mercurial > hg > webserver / file comparison

comparison: src/server/httprequest.c

src/server/httprequest.c