|
 |
f0b236 |
From c9fce72e17b7afa389205d946e5ca7bef997be60 Mon Sep 17 00:00:00 2001
|
|
|
f0b236 |
From: Rob Crittenden <rcritten@redhat.com>
|
|
|
f0b236 |
Date: Wed, 29 Apr 2020 13:26:14 -0400
|
|
|
f0b236 |
Subject: [PATCH] Ensure that files read in have a trailing new-line
|
|
|
f0b236 |
|
|
|
f0b236 |
In SCEP when retrieving the CA chain the certificates passed in
|
|
|
f0b236 |
on the command-line (RA agent and CA cert) area printed along with
|
|
|
f0b236 |
the contents of what was retrieved remotely.
|
|
|
f0b236 |
|
|
|
f0b236 |
If one of the filesystem certificates lacks a newline then the
|
|
|
f0b236 |
output will be jumbled like:
|
|
|
f0b236 |
|
|
|
f0b236 |
-----END CERTIFICATE----------BEGIN CERTIFICATE-----\n
|
|
|
f0b236 |
|
|
|
f0b236 |
https://bugzilla.redhat.com/show_bug.cgi?id=1814976
|
|
|
f0b236 |
---
|
|
|
f0b236 |
src/submit-u.c | 11 +++++++
|
|
|
f0b236 |
tests/039-fromfile/expected.out | 4 +++
|
|
|
f0b236 |
tests/039-fromfile/run.sh | 55 +++++++++++++++++++++++++++++++++
|
|
|
f0b236 |
tests/Makefile.am | 10 ++++--
|
|
|
f0b236 |
tests/tools/Makefile.am | 6 +++-
|
|
|
f0b236 |
tests/tools/fromfile.c | 52 +++++++++++++++++++++++++++++++
|
|
|
f0b236 |
6 files changed, 134 insertions(+), 4 deletions(-)
|
|
|
f0b236 |
create mode 100644 tests/039-fromfile/expected.out
|
|
|
f0b236 |
create mode 100755 tests/039-fromfile/run.sh
|
|
|
f0b236 |
create mode 100644 tests/tools/fromfile.c
|
|
|
f0b236 |
|
|
|
f0b236 |
diff --git a/src/submit-u.c b/src/submit-u.c
|
|
|
f0b236 |
index b0b45ba..dca23a7 100644
|
|
|
f0b236 |
--- a/src/submit-u.c
|
|
|
f0b236 |
+++ b/src/submit-u.c
|
|
|
f0b236 |
@@ -100,6 +100,17 @@ cm_submit_u_from_file(const char *filename)
|
|
|
f0b236 |
}
|
|
|
f0b236 |
if (csr == NULL) {
|
|
|
f0b236 |
csr = strdup("");
|
|
|
f0b236 |
+ } else {
|
|
|
f0b236 |
+ int length = strlen(csr);
|
|
|
f0b236 |
+ if (csr[length-1] != '\n') {
|
|
|
f0b236 |
+ length += 1;
|
|
|
f0b236 |
+ csr = realloc(csr, length + 1);
|
|
|
f0b236 |
+ if (csr == NULL) {
|
|
|
f0b236 |
+ return NULL;
|
|
|
f0b236 |
+ }
|
|
|
f0b236 |
+ csr[length - 1] = '\n';
|
|
|
f0b236 |
+ csr[length] = '\0';
|
|
|
f0b236 |
+ }
|
|
|
f0b236 |
}
|
|
|
f0b236 |
return csr;
|
|
|
f0b236 |
}
|
|
|
f0b236 |
diff --git a/tests/039-fromfile/expected.out b/tests/039-fromfile/expected.out
|
|
|
f0b236 |
new file mode 100644
|
|
|
f0b236 |
index 0000000..9191a57
|
|
|
f0b236 |
--- /dev/null
|
|
|
f0b236 |
+++ b/tests/039-fromfile/expected.out
|
|
|
f0b236 |
@@ -0,0 +1,4 @@
|
|
|
f0b236 |
+[trailing_nl]
|
|
|
f0b236 |
+Ok
|
|
|
f0b236 |
+[no_trailing_nl]
|
|
|
f0b236 |
+Ok
|
|
|
f0b236 |
diff --git a/tests/039-fromfile/run.sh b/tests/039-fromfile/run.sh
|
|
|
f0b236 |
new file mode 100755
|
|
|
f0b236 |
index 0000000..8bae773
|
|
|
f0b236 |
--- /dev/null
|
|
|
f0b236 |
+++ b/tests/039-fromfile/run.sh
|
|
|
f0b236 |
@@ -0,0 +1,55 @@
|
|
|
f0b236 |
+#!/bin/bash -e
|
|
|
f0b236 |
+
|
|
|
f0b236 |
+cd $tmpdir
|
|
|
f0b236 |
+
|
|
|
f0b236 |
+cat > $tmpdir/trailing_nl <<- EOF
|
|
|
f0b236 |
+-----BEGIN CERTIFICATE-----
|
|
|
f0b236 |
+MIIDjjCCAnagAwIBAgIRAO1VmyXYM0f7pbXVdEGtRPMwDQYJKoZIhvcNAQELBQAw
|
|
|
f0b236 |
+UDEgMB4GA1UEAwwXTG9jYWwgU2lnbmluZyBBdXRob3JpdHkxLDAqBgNVBAMMI2Vk
|
|
|
f0b236 |
+NTU5YjI1LWQ4MzM0N2ZiLWE1YjVkNTc0LTQxYWQ0NGYzMB4XDTE1MDQyODE3MDk0
|
|
|
f0b236 |
+OFoXDTE2MDQyODE3MDk0OFowUDEgMB4GA1UEAwwXTG9jYWwgU2lnbmluZyBBdXRo
|
|
|
f0b236 |
+b3JpdHkxLDAqBgNVBAMMI2VkNTU5YjI1LWQ4MzM0N2ZiLWE1YjVkNTc0LTQxYWQ0
|
|
|
f0b236 |
+NGYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5c/LhlyBs0UUiDSy
|
|
|
f0b236 |
+nrC+Q0WJkWZeQ/kqwniru+GlXgb3g+7VvyAfdZ45NiBdo/6xXyCLphK0g8oZLyi8
|
|
|
f0b236 |
+OwQQoUyVMn9gsGXbjlwSzjXKx3wdUM+lFpenx8iQS9aCfVQJ4tzFgM1pQBQ2AiHs
|
|
|
f0b236 |
+jvU18xSFSZApjT5UIK35kyH22D8LhCGGYLaU3xFEfHvd0AOuXwm5Nsiu/HTsSV4N
|
|
|
f0b236 |
+peUdFEmFzQwUEUdV2jKOPcXnOArV82vfpdp1nSCX3kruEb9G93VsmQ+9ebKXQRQE
|
|
|
f0b236 |
+Ltd65e/EYtXvihuTtElLYuyYZlYJdbTZeLXB4YLvElgNkS9JK7RKHlCm0KYQmcmd
|
|
|
f0b236 |
+GZSh8QIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQEBMB0GA1UdDgQWBBRLxeFy3+RS
|
|
|
f0b236 |
+FloygyjlXa6YEv8ltzAfBgNVHSMEGDAWgBRLxeFy3+RSFloygyjlXa6YEv8ltzAO
|
|
|
f0b236 |
+BgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQADggEBAH9A9ePIqZGF4VEo5D4j
|
|
|
f0b236 |
+MuOJ1J4uTRxHoEGXCDRcuCn3RvT0civWEPpRNo1YVgAWFODpt/HSi3lCVtTb7FwJ
|
|
|
f0b236 |
+hfHkxCpAuHmv3sfT8jcCwTTAXL1BLpCO6d0zz0RrFMNK+vGyZu/7LXhaYVu590Q5
|
|
|
f0b236 |
+1DMybHmln7i+Tw/eYb4Avk1FWGOEpNdf3ZjUazcDlkO4EwA6BnZUC8gFvz0OI73D
|
|
|
f0b236 |
+AJsGq/UsJvMH30ga1rZ/9LiHEMSEys5amk98yMRvi/R1qI02kjANdZ0ID/7cJSw2
|
|
|
f0b236 |
+rVCCs61jgYppWv3JHVKYmm6+cVPAUcuRdsUzDpAQDdvGAaZJENE6suulRVEaBEdS
|
|
|
f0b236 |
+8gM=
|
|
|
f0b236 |
+-----END CERTIFICATE-----
|
|
|
f0b236 |
+EOF
|
|
|
f0b236 |
+cat > $tmpdir/no_trailing_nl <<- EOF
|
|
|
f0b236 |
+-----BEGIN CERTIFICATE-----
|
|
|
f0b236 |
+MIIDjjCCAnagAwIBAgIRAO1VmyXYM0f7pbXVdEGtRPMwDQYJKoZIhvcNAQELBQAw
|
|
|
f0b236 |
+UDEgMB4GA1UEAwwXTG9jYWwgU2lnbmluZyBBdXRob3JpdHkxLDAqBgNVBAMMI2Vk
|
|
|
f0b236 |
+NTU5YjI1LWQ4MzM0N2ZiLWE1YjVkNTc0LTQxYWQ0NGYzMB4XDTE1MDQyODE3MDk0
|
|
|
f0b236 |
+OFoXDTE2MDQyODE3MDk0OFowUDEgMB4GA1UEAwwXTG9jYWwgU2lnbmluZyBBdXRo
|
|
|
f0b236 |
+b3JpdHkxLDAqBgNVBAMMI2VkNTU5YjI1LWQ4MzM0N2ZiLWE1YjVkNTc0LTQxYWQ0
|
|
|
f0b236 |
+NGYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5c/LhlyBs0UUiDSy
|
|
|
f0b236 |
+nrC+Q0WJkWZeQ/kqwniru+GlXgb3g+7VvyAfdZ45NiBdo/6xXyCLphK0g8oZLyi8
|
|
|
f0b236 |
+OwQQoUyVMn9gsGXbjlwSzjXKx3wdUM+lFpenx8iQS9aCfVQJ4tzFgM1pQBQ2AiHs
|
|
|
f0b236 |
+jvU18xSFSZApjT5UIK35kyH22D8LhCGGYLaU3xFEfHvd0AOuXwm5Nsiu/HTsSV4N
|
|
|
f0b236 |
+peUdFEmFzQwUEUdV2jKOPcXnOArV82vfpdp1nSCX3kruEb9G93VsmQ+9ebKXQRQE
|
|
|
f0b236 |
+Ltd65e/EYtXvihuTtElLYuyYZlYJdbTZeLXB4YLvElgNkS9JK7RKHlCm0KYQmcmd
|
|
|
f0b236 |
+GZSh8QIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQEBMB0GA1UdDgQWBBRLxeFy3+RS
|
|
|
f0b236 |
+FloygyjlXa6YEv8ltzAfBgNVHSMEGDAWgBRLxeFy3+RSFloygyjlXa6YEv8ltzAO
|
|
|
f0b236 |
+BgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQADggEBAH9A9ePIqZGF4VEo5D4j
|
|
|
f0b236 |
+MuOJ1J4uTRxHoEGXCDRcuCn3RvT0civWEPpRNo1YVgAWFODpt/HSi3lCVtTb7FwJ
|
|
|
f0b236 |
+hfHkxCpAuHmv3sfT8jcCwTTAXL1BLpCO6d0zz0RrFMNK+vGyZu/7LXhaYVu590Q5
|
|
|
f0b236 |
+1DMybHmln7i+Tw/eYb4Avk1FWGOEpNdf3ZjUazcDlkO4EwA6BnZUC8gFvz0OI73D
|
|
|
f0b236 |
+AJsGq/UsJvMH30ga1rZ/9LiHEMSEys5amk98yMRvi/R1qI02kjANdZ0ID/7cJSw2
|
|
|
f0b236 |
+rVCCs61jgYppWv3JHVKYmm6+cVPAUcuRdsUzDpAQDdvGAaZJENE6suulRVEaBEdS
|
|
|
f0b236 |
+8gM=
|
|
|
f0b236 |
+EOF
|
|
|
f0b236 |
+echo -n "-----END CERTIFICATE-----" >> $tmpdir/no_trailing_nl
|
|
|
f0b236 |
+
|
|
|
f0b236 |
+$toolsdir/fromfile trailing_nl
|
|
|
f0b236 |
+$toolsdir/fromfile no_trailing_nl
|
|
|
f0b236 |
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
|
|
f0b236 |
index fe368dc..1552c48 100644
|
|
|
f0b236 |
--- a/tests/Makefile.am
|
|
|
f0b236 |
+++ b/tests/Makefile.am
|
|
|
f0b236 |
@@ -127,7 +127,9 @@ CLEANFILES = \
|
|
|
f0b236 |
037-rekey2/actual.out \
|
|
|
f0b236 |
037-rekey2/actual.err \
|
|
|
f0b236 |
038-ms-v2-template/actual.out \
|
|
|
f0b236 |
- 038-ms-v2-template/actual.err
|
|
|
f0b236 |
+ 038-ms-v2-template/actual.err \
|
|
|
f0b236 |
+ 039-fromfile/actual.out \
|
|
|
f0b236 |
+ 039-fromfile/actual.err
|
|
|
f0b236 |
EXTRA_DIST = \
|
|
|
f0b236 |
run-tests.sh functions certmonger.conf tools/cachain.sh \
|
|
|
f0b236 |
001-keyiread/run.sh \
|
|
|
f0b236 |
@@ -349,7 +351,8 @@ EXTRA_DIST = \
|
|
|
f0b236 |
037-rekey2/run.sh \
|
|
|
f0b236 |
038-ms-v2-template/expected.out \
|
|
|
f0b236 |
038-ms-v2-template/extract-extdata.py \
|
|
|
f0b236 |
- 038-ms-v2-template/run.sh
|
|
|
f0b236 |
+ 038-ms-v2-template/run.sh \
|
|
|
f0b236 |
+ 039-fromfile/run.sh
|
|
|
f0b236 |
|
|
|
f0b236 |
subdirs = \
|
|
|
f0b236 |
001-keyiread \
|
|
|
f0b236 |
@@ -392,7 +395,8 @@ subdirs = \
|
|
|
f0b236 |
035-json \
|
|
|
f0b236 |
036-getcert \
|
|
|
f0b236 |
037-rekey2 \
|
|
|
f0b236 |
- 038-ms-v2-template
|
|
|
f0b236 |
+ 038-ms-v2-template \
|
|
|
f0b236 |
+ 039-fromfile
|
|
|
f0b236 |
|
|
|
f0b236 |
if HAVE_DBM_NSSDB
|
|
|
f0b236 |
subdirs += \
|
|
|
f0b236 |
diff --git a/tests/tools/Makefile.am b/tests/tools/Makefile.am
|
|
|
f0b236 |
index 39fa954..e0d2f08 100644
|
|
|
f0b236 |
--- a/tests/tools/Makefile.am
|
|
|
f0b236 |
+++ b/tests/tools/Makefile.am
|
|
|
f0b236 |
@@ -16,7 +16,7 @@ endif
|
|
|
f0b236 |
noinst_PROGRAMS = keyiread keygen csrgen submit certread certsave oid2name \
|
|
|
f0b236 |
name2oid iterate prefs dates listnicks pem2base base2pem \
|
|
|
f0b236 |
dparse payload checksig base64 cadata citerate casave hooks \
|
|
|
f0b236 |
- libexecdir canon srv addcinfo ls json json-utf8 printenv
|
|
|
f0b236 |
+ libexecdir canon srv addcinfo ls json json-utf8 printenv fromfile
|
|
|
f0b236 |
noinst_LIBRARIES = libtools.a
|
|
|
f0b236 |
if HAVE_OPENSSL
|
|
|
f0b236 |
noinst_PROGRAMS += pk7parse pk7env scepgen pk7verify pk7decrypt
|
|
|
f0b236 |
@@ -38,3 +38,7 @@ citerate_LDADD = $(top_srcdir)/src/store-gen.c $(LDADD)
|
|
|
f0b236 |
|
|
|
f0b236 |
srv_SOURCES = srv.c
|
|
|
f0b236 |
srv_LDADD = $(top_srcdir)/src/srvloc.c $(LDADD)
|
|
|
f0b236 |
+
|
|
|
f0b236 |
+fromfile_CFLAGS = $(AM_CFLAGS) $(CURL_CFLAGS)
|
|
|
f0b236 |
+fromfile_SOURCES = fromfile.c
|
|
|
f0b236 |
+fromfile_LDADD = $(LDADD) $(UUID_LIBS) $(CURL_LIBS)
|
|
|
f0b236 |
diff --git a/tests/tools/fromfile.c b/tests/tools/fromfile.c
|
|
|
f0b236 |
new file mode 100644
|
|
|
f0b236 |
index 0000000..bb70507
|
|
|
f0b236 |
--- /dev/null
|
|
|
f0b236 |
+++ b/tests/tools/fromfile.c
|
|
|
f0b236 |
@@ -0,0 +1,52 @@
|
|
|
f0b236 |
+/*
|
|
|
f0b236 |
+ * Copyright (C) 2020 Red Hat, Inc.
|
|
|
f0b236 |
+ *
|
|
|
f0b236 |
+ * This program is free software: you can redistribute it and/or modify
|
|
|
f0b236 |
+ * it under the terms of the GNU General Public License as published by
|
|
|
f0b236 |
+ * the Free Software Foundation, either version 3 of the License, or
|
|
|
f0b236 |
+ * (at your option) any later version.
|
|
|
f0b236 |
+ *
|
|
|
f0b236 |
+ * This program is distributed in the hope that it will be useful,
|
|
|
f0b236 |
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
f0b236 |
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
f0b236 |
+ * GNU General Public License for more details.
|
|
|
f0b236 |
+ *
|
|
|
f0b236 |
+ * You should have received a copy of the GNU General Public License
|
|
|
f0b236 |
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
f0b236 |
+ */
|
|
|
f0b236 |
+
|
|
|
f0b236 |
+#include "../../src/config.h"
|
|
|
f0b236 |
+
|
|
|
f0b236 |
+#include <sys/types.h>
|
|
|
f0b236 |
+#include <errno.h>
|
|
|
f0b236 |
+#include <stdlib.h>
|
|
|
f0b236 |
+#include <stdio.h>
|
|
|
f0b236 |
+
|
|
|
f0b236 |
+#include <krb5.h>
|
|
|
f0b236 |
+
|
|
|
f0b236 |
+#include "../../src/submit-u.h"
|
|
|
f0b236 |
+#include "../../src/submit-u.c"
|
|
|
f0b236 |
+
|
|
|
f0b236 |
+int
|
|
|
f0b236 |
+main(int argc, char **argv)
|
|
|
f0b236 |
+{
|
|
|
f0b236 |
+ int i, result = 0;
|
|
|
f0b236 |
+ char *cert;
|
|
|
f0b236 |
+
|
|
|
f0b236 |
+ for (i = 1; i < argc; i++) {
|
|
|
f0b236 |
+ printf("[%s]\n", argv[i]);
|
|
|
f0b236 |
+ cert = cm_submit_u_from_file(argv[i]);
|
|
|
f0b236 |
+ if (cert == NULL) {
|
|
|
f0b236 |
+ printf("OOM error\n");
|
|
|
f0b236 |
+ result = 1;
|
|
|
f0b236 |
+ }
|
|
|
f0b236 |
+ else if (cert[strlen(cert) - 1] != '\n') {
|
|
|
f0b236 |
+ printf("Missing trailing newline\n");
|
|
|
f0b236 |
+ result = 1;
|
|
|
f0b236 |
+ } else {
|
|
|
f0b236 |
+ printf("Ok\n");
|
|
|
f0b236 |
+ }
|
|
|
f0b236 |
+ free(cert);
|
|
|
f0b236 |
+ }
|
|
|
f0b236 |
+ return result;
|
|
|
f0b236 |
+}
|
|
|
f0b236 |
--
|
|
|
f0b236 |
2.18.4
|
|
|
f0b236 |
|