mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-22 17:51:53 +00:00
Code Releases Activity

Flock: converted also container socket parser but now it looks like failing

Browse Source
This commit is contained in:
Maria Matejka 2024-10-03 23:13:07 +02:00
parent dc29cefb44
commit b2e6530488
1 changed files with 28 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

181
flock/container.c
View File

@ -940,114 +940,36 @@ hypervisor_container_shutdown(sock *s, const char *name)
birdloop_leave(hcf.loop); birdloop_leave(hcf.loop);
} }
struct cbor_parser_context { struct ccs_parser_context {
linpool *lp; struct cbor_parser_context *ctx;
PACKED enum {
CPE_TYPE = 0,
CPE_READ_INT,
CPE_COMPLETE_INT,
CPE_READ_BYTE,
} partial_state, partial_next;
byte type;
u64 value;
u64 partial_countdown;
u64 bytes_consumed; u64 bytes_consumed;
byte *target_buf;
uint target_len;
u64 major_state; u64 major_state;
const char *error;
#define LOCAL_STACK_MAX_DEPTH 3
u64 stack_countdown[LOCAL_STACK_MAX_DEPTH];
uint stack_pos;
}; };
#define CBOR_PARSER_ERROR bug #define CBOR_PARSER_ERROR bug
#define CBOR_PARSER_READ_INT(next) do { \ static struct ccs_parser_context ccx_, *ccx = &ccx_;
ctx->partial_state = CPE_READ_INT; \
ctx->partial_countdown = (1 << (ctx->value - 24)); \
ctx->value = 0; \
ctx->partial_next = next; \
} while (0)
static struct cbor_parser_context ctx_, *ctx = &ctx_;
static void static void
hcf_parse(byte *buf, int size) hcf_parse(byte *buf, int size)
{ {
ASSERT_DIE(size > 0); ASSERT_DIE(size > 0);
struct cbor_parser_context *ctx = ccx->ctx;
for (int pos = 0; pos < size; pos++) for (int pos = 0; pos < size; pos++)
{ {
const byte bp = buf[pos]; switch (cbor_parse_byte(ctx, buf[pos]))
bool value_is_special = 0;
bool exit_stack = false;
switch (ctx->partial_state)
{ {
case CPE_TYPE: case CPR_ERROR:
/* Split the byte to type and value */ bug("CBOR parser failure: %s", ctx->error);
ctx->type = bp >> 5;
ctx->value = bp & 0x1f;
if (ctx->type == 7) case CPR_MORE:
{ continue;
if (ctx->value < 20)
CBOR_PARSER_ERROR("Unknown simple value %u", ctx->value);
else if (ctx->value < 24)
; /* false, true, null, undefined */
else if (ctx->value < 28)
{
/* Need more data */
CBOR_PARSER_READ_INT(CPE_COMPLETE_INT);
break;
}
else if (ctx->value == 31)
; /* break-stop */
else
CBOR_PARSER_ERROR("Unknown simple value %u", ctx->value);
}
else
{
if (ctx->value < 24)
; /* Immediate value, fall through */
else if (ctx->value < 28)
{
/* Need more data */
CBOR_PARSER_READ_INT(CPE_COMPLETE_INT);
break;
}
else if ((ctx->value == 31) && (ctx->type >= 2) && (ctx->type <= 5))
/* Indefinite length, fall through */
value_is_special = 1;
else
CBOR_PARSER_ERROR("Garbled additional value %u for type %u", ctx->value, ctx->type);
}
/* fall through */
case CPE_READ_INT:
if (ctx->partial_state == CPE_READ_INT)
{
/* Reading a network order integer */
ctx->value <<= 8;
ctx->value |= bp;
if (--ctx->partial_countdown)
break;
}
/* fall through */
case CPE_COMPLETE_INT:
/* TODO: exception for 7-31 end of long thing */
case CPR_MAJOR:
/* Check type acceptance */ /* Check type acceptance */
switch (ctx->major_state) switch (ccx->major_state)
{ {
case 0: /* toplevel */ case 0: /* toplevel */
if (ctx->type != 5) if (ctx->type != 5)
@ -1055,7 +977,7 @@ hcf_parse(byte *buf, int size)
ccf = (struct container_config) {}; ccf = (struct container_config) {};
ctx->major_state = 1; ccx->major_state = 1;
break; break;
case 1: /* inside toplevel mapping */ case 1: /* inside toplevel mapping */
@ -1065,14 +987,14 @@ hcf_parse(byte *buf, int size)
if (ctx->value >= 3) if (ctx->value >= 3)
CBOR_PARSER_ERROR("Mapping key too high, got %lu", ctx->value); CBOR_PARSER_ERROR("Mapping key too high, got %lu", ctx->value);
ctx->major_state = ctx->value + 2; ccx->major_state = ctx->value + 2;
break; break;
case 2: /* machine hostname */ case 2: /* machine hostname */
if (ctx->type != 3) if (ctx->type != 3)
CBOR_PARSER_ERROR("Expected string, got %u", ctx->type); CBOR_PARSER_ERROR("Expected string, got %u", ctx->type);
if (value_is_special) if (ctx->tflags & CPT_VARLEN)
CBOR_PARSER_ERROR("Variable length string not supported yet"); CBOR_PARSER_ERROR("Variable length string not supported yet");
if (ccf.hostname) if (ccf.hostname)
@ -1087,7 +1009,7 @@ hcf_parse(byte *buf, int size)
if (ctx->type != 3) if (ctx->type != 3)
CBOR_PARSER_ERROR("Expected string, got %u", ctx->type); CBOR_PARSER_ERROR("Expected string, got %u", ctx->type);
if (value_is_special) if (ctx->tflags & CPT_VARLEN)
CBOR_PARSER_ERROR("Variable length string not supported yet"); CBOR_PARSER_ERROR("Variable length string not supported yet");
if (ccf.workdir) if (ccf.workdir)
@ -1102,7 +1024,7 @@ hcf_parse(byte *buf, int size)
if (ctx->type != 3) if (ctx->type != 3)
CBOR_PARSER_ERROR("Expected string, got %u", ctx->type); CBOR_PARSER_ERROR("Expected string, got %u", ctx->type);
if (value_is_special) if (ctx->tflags & CPT_VARLEN)
CBOR_PARSER_ERROR("Variable length string not supported yet"); CBOR_PARSER_ERROR("Variable length string not supported yet");
if (ccf.basedir) if (ccf.basedir)
@ -1116,79 +1038,38 @@ hcf_parse(byte *buf, int size)
default: default:
bug("invalid parser state"); bug("invalid parser state");
} }
/* Some types are completely parsed, some not yet */
switch (ctx->type)
{
case 0:
case 1:
case 7:
exit_stack = !--ctx->stack_countdown[ctx->stack_pos];
ctx->partial_state = CPE_TYPE;
break;
case 2:
case 3:
ctx->partial_state = CPE_READ_BYTE;
ctx->partial_countdown = ctx->value;
ctx->target_buf = ctx->target_buf ?: lp_allocu(
ctx->lp, ctx->target_len = (ctx->target_len ?: ctx->value));
break;
case 4:
case 5:
if (++ctx->stack_pos >= LOCAL_STACK_MAX_DEPTH)
CBOR_PARSER_ERROR("Stack too deep");
/* set array/map size;
* once for arrays, twice for maps;
* ~0 for indefinite */
ctx->stack_countdown[ctx->stack_pos] = value_is_special ? ~0ULL :
(ctx->value * (ctx->type - 3));
ctx->partial_state = CPE_TYPE;
break;
}
break; break;
case CPE_READ_BYTE: case CPR_STR_END:
*ctx->target_buf = bp; /* Bytes read completely! */
ctx->target_buf++; switch (ccx->major_state)
if (--ctx->target_len)
break;
/* Read completely! */
switch (ctx->major_state)
{ {
case 2: case 2:
case 3: case 3:
case 4: case 4:
ctx->major_state = 1; ccx->major_state = 1;
break; break;
default: default:
bug("Unexpected state to end a (byte)string in"); bug("Unexpected state to end a (byte)string in");
/* Code to run at the end of a (byte)string */ /* Code to run at the end of a (byte)string */
} }
break;
ctx->target_buf = NULL;
ctx->partial_state = CPE_TYPE;
exit_stack = !--ctx->stack_countdown[ctx->stack_pos];
} }
/* End of array or map */ /* End of array or map */
while (exit_stack) while (cbor_parse_block_end(ctx))
{ {
switch (ctx->major_state) switch (ccx->major_state)
{ {
/* Code to run at the end of the mapping */ /* Code to run at the end of the mapping */
case 0: /* toplevel item ended */ case 0: /* toplevel item ended */
/* Reinit the parser */ /* Reinit the parser */
ctx->type = 0xff; ctx->type = 0xff;
ctx->major_state = 0; ccx->major_state = 0;
ctx->stack_countdown[0] = 1; ctx->stack_countdown[0] = 1;
ctx->bytes_consumed = 0; ccx->bytes_consumed = 0;
if (size > pos + 1) if (size > pos + 1)
hcf_parse(buf + pos + 1, size - pos - 1); hcf_parse(buf + pos + 1, size - pos - 1);
@ -1206,20 +1087,16 @@ hcf_parse(byte *buf, int size)
container_start(); container_start();
ctx->major_state = 0; ccx->major_state = 0;
break; break;
default: default:
bug("Unexpected state to end a mapping in"); bug("Unexpected state to end a mapping in");
} }
/* Check exit from the next item */
ASSERT_DIE(ctx->stack_pos);
exit_stack = !--ctx->stack_countdown[--ctx->stack_pos];
} }
} }
ctx->bytes_consumed += size; ccx->bytes_consumed += size;
} }
void void
@ -1269,9 +1146,7 @@ hypervisor_container_fork(void)
this_thread_id |= 0xf000; this_thread_id |= 0xf000;
/* initialize the forker */ /* initialize the forker */
ctx->lp = lp_new(&root_pool); ccx->ctx = cbor_parser_new(&root_pool, 2);
ctx->type = 0xff;
ctx->stack_countdown[0] = 1;
while (true) while (true)
{ {