|
 |
0ceb166 |
From f35077bfc570205092eca2a9d44e50ce265622f4 Mon Sep 17 00:00:00 2001
|
|
|
0ceb166 |
From: Sumit Bose <sbose@redhat.com>
|
|
|
0ceb166 |
Date: Mon, 8 Nov 2021 17:48:50 +0100
|
|
|
0ceb166 |
Subject: [PATCH] Support larger RADIUS attributes in libkrad
|
|
|
0ceb166 |
|
|
|
0ceb166 |
In kr_attrset_decode(), explicitly treat the length byte as unsigned.
|
|
|
0ceb166 |
Otherwise attributes longer than 125 characters will be rejected with
|
|
|
0ceb166 |
EBADMSG.
|
|
|
0ceb166 |
|
|
|
0ceb166 |
Add a 253-character-long NAS-Identifier attribute to the tests to make
|
|
|
0ceb166 |
sure that attributes with the maximal number of characters are working
|
|
|
0ceb166 |
as expected.
|
|
|
0ceb166 |
|
|
|
0ceb166 |
[ghudson@mit.edu: used uint8_t cast per current practices; edited
|
|
|
0ceb166 |
commit message]
|
|
|
0ceb166 |
|
|
|
0ceb166 |
ticket: 9036 (new)
|
|
|
0ceb166 |
---
|
|
|
0ceb166 |
src/lib/krad/attrset.c | 2 +-
|
|
|
0ceb166 |
src/lib/krad/t_packet.c | 13 +++++++++++++
|
|
|
0ceb166 |
2 files changed, 14 insertions(+), 1 deletion(-)
|
|
|
0ceb166 |
|
|
|
0ceb166 |
diff --git a/src/lib/krad/attrset.c b/src/lib/krad/attrset.c
|
|
|
0ceb166 |
index 03c613716..f309f1581 100644
|
|
|
0ceb166 |
--- a/src/lib/krad/attrset.c
|
|
|
0ceb166 |
+++ b/src/lib/krad/attrset.c
|
|
|
0ceb166 |
@@ -217,7 +217,7 @@ kr_attrset_decode(krb5_context ctx, const krb5_data *in, const char *secret,
|
|
|
0ceb166 |
|
|
|
0ceb166 |
for (i = 0; i + 2 < in->length; ) {
|
|
|
0ceb166 |
type = in->data[i++];
|
|
|
0ceb166 |
- tmp = make_data(&in->data[i + 1], in->data[i] - 2);
|
|
|
0ceb166 |
+ tmp = make_data(&in->data[i + 1], (uint8_t)in->data[i] - 2);
|
|
|
0ceb166 |
i += tmp.length + 1;
|
|
|
0ceb166 |
|
|
|
0ceb166 |
retval = (in->length < i) ? EBADMSG : 0;
|
|
|
0ceb166 |
diff --git a/src/lib/krad/t_packet.c b/src/lib/krad/t_packet.c
|
|
|
0ceb166 |
index 0a92e9cc2..c22489144 100644
|
|
|
0ceb166 |
--- a/src/lib/krad/t_packet.c
|
|
|
0ceb166 |
+++ b/src/lib/krad/t_packet.c
|
|
|
0ceb166 |
@@ -57,6 +57,14 @@ make_packet(krb5_context ctx, const krb5_data *username,
|
|
|
0ceb166 |
krb5_error_code retval;
|
|
|
0ceb166 |
const krb5_data *data;
|
|
|
0ceb166 |
int i = 0;
|
|
|
0ceb166 |
+ krb5_data nas_id;
|
|
|
0ceb166 |
+
|
|
|
0ceb166 |
+ nas_id = string2data("12345678901234567890123456789012345678901234567890"
|
|
|
0ceb166 |
+ "12345678901234567890123456789012345678901234567890"
|
|
|
0ceb166 |
+ "12345678901234567890123456789012345678901234567890"
|
|
|
0ceb166 |
+ "12345678901234567890123456789012345678901234567890"
|
|
|
0ceb166 |
+ "12345678901234567890123456789012345678901234567890"
|
|
|
0ceb166 |
+ "123");
|
|
|
0ceb166 |
|
|
|
0ceb166 |
retval = krad_attrset_new(ctx, &set);
|
|
|
0ceb166 |
if (retval != 0)
|
|
|
0ceb166 |
@@ -71,6 +79,11 @@ make_packet(krb5_context ctx, const krb5_data *username,
|
|
|
0ceb166 |
if (retval != 0)
|
|
|
0ceb166 |
goto out;
|
|
|
0ceb166 |
|
|
|
0ceb166 |
+ retval = krad_attrset_add(set, krad_attr_name2num("NAS-Identifier"),
|
|
|
0ceb166 |
+ &nas_id);
|
|
|
0ceb166 |
+ if (retval != 0)
|
|
|
0ceb166 |
+ goto out;
|
|
|
0ceb166 |
+
|
|
|
0ceb166 |
retval = krad_packet_new_request(ctx, "foo",
|
|
|
0ceb166 |
krad_code_name2num("Access-Request"),
|
|
|
0ceb166 |
set, iterator, &i, &tmp);
|
|
|
0ceb166 |
--
|
|
|
0ceb166 |
2.35.1
|
|
|
0ceb166 |
|