diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2023-03-16 19:06:04 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2023-03-31 01:48:30 +0000 |
| commit | 2d2f68236e6d34d96dc6bdceb13ff54bedde46fb (patch) | |
| tree | 2e6da923b1dedfec7662744ee4801d530a8f98eb /python | |
| parent | c6981f60549c497d401c4c4173dc362f083791d7 (diff) | |
| download | samba-2d2f68236e6d34d96dc6bdceb13ff54bedde46fb.tar.gz samba-2d2f68236e6d34d96dc6bdceb13ff54bedde46fb.tar.bz2 samba-2d2f68236e6d34d96dc6bdceb13ff54bedde46fb.zip | |
librpc/ndr: Use libndr compression for claims
This ensures our python layer and C layer (in the KDC, when implementated)
use the same compression logic and so allows us to test the production
compression via the IDL-generated interfaces.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/tests/krb5/raw_testcase.py | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/python/samba/tests/krb5/raw_testcase.py b/python/samba/tests/krb5/raw_testcase.py index 1d117c7e21e..8e856478803 100644 --- a/python/samba/tests/krb5/raw_testcase.py +++ b/python/samba/tests/krb5/raw_testcase.py @@ -3669,21 +3669,14 @@ class RawKerberosTest(TestCaseInTempDir): f'got empty CLAIMS_SET_METADATA_NDR ' f'inner structure {empty_msg}') - claims_data = bytes(client_claims.claims_set) - self.assertIsNotNone(claims_data, + self.assertIsNotNone(client_claims.claims_set, f'got empty CLAIMS_SET_METADATA ' f'structure {empty_msg}') - self.assertGreater(len(claims_data), 0, - f'got empty encoded claims data ' - f'{empty_msg}') - self.assertEqual(len(claims_data), - client_claims.claims_set_size, - f'encoded {claims_type} data size mismatch') uncompressed_size = client_claims.uncompressed_claims_set_size compression_format = client_claims.compression_format - if uncompressed_size < 384: + if uncompressed_size < claims.CLAIM_MINIMUM_BYTES_TO_COMPRESS: self.assertEqual(claims.CLAIMS_COMPRESSION_FORMAT_NONE, compression_format, f'{claims_type} unexpectedly ' @@ -3696,12 +3689,7 @@ class RawKerberosTest(TestCaseInTempDir): f'{claims_type} unexpectedly not compressed ' f'({uncompressed_size} bytes uncompressed)') - claims_data = huffman_decompress(claims_data, - uncompressed_size) - - claims_set = ndr_unpack(claims.CLAIMS_SET_NDR, - claims_data) - claims_set = claims_set.claims.claims + claims_set = client_claims.claims_set.claims.claims self.assertIsNotNone(claims_set, f'got empty CLAIMS_SET_NDR inner ' f'structure {empty_msg}') |