experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Test: restconf CN variable, strip curl newline

Browse source 
Fixed a few compile warnings
This commit is contained in:
Olof hagsand 2022-05-11 09:20:40 +02:00
parent c27ecf0923
commit 7065d6f760
5 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/restconf/clixon_http_data.c
View file

@ -333,8 +333,8 @@ api_http_data_file(clicon_handle h,
fsize = ftell(f); fsize = ftell(f);
/* Extra sanity check, had some problems with wrong file types */ /* Extra sanity check, had some problems with wrong file types */
if (fsz != fsize){ if (fsz != fsize){
clicon_debug(1, "%s Error file %s size mismatch sz:%zu vs %zu", clicon_debug(1, "%s Error file %s size mismatch sz:%zu vs %li",
__FUNCTION__, filename, fsz, fsize); __FUNCTION__, filename, (size_t)fsz, fsize);
if (api_http_data_err(h, req, 500) < 0) /* Internal error? */ if (api_http_data_err(h, req, 500) < 0) /* Internal error? */
goto done; goto done;
goto ok; goto ok;

2
lib/src/clixon_netconf_lib.c
View file

@ -2085,7 +2085,7 @@ netconf_input_chunked_framing(char ch,
{ {
int retval = 0; int retval = 0;
clicon_debug(1, "%s ch:%c(%d) state:%d size:%lu", __FUNCTION__, ch, ch, *state, *size); clicon_debug(1, "%s ch:%c(%d) state:%d size:%zu", __FUNCTION__, ch, ch, *state, *size);
switch (*state){ switch (*state){
case 0: case 0:
if (ch == '\n'){ if (ch == '\n'){

5
test/lib.sh
View file

@ -105,6 +105,9 @@ else
netcat= netcat=
fi fi
# SSL serv cert common name XXX should use DNS resolve
: ${SSLCN:="localhost"}
# Options passed to curl calls # Options passed to curl calls
# -s : silent # -s : silent
# -S : show error # -S : show error
@ -1104,7 +1107,7 @@ prompt = no
distinguished_name = dn distinguished_name = dn
req_extensions = ext req_extensions = ext
[dn] [dn]
CN = www.clicon.org # localhost CN = ${SSLCN} # localhost
emailAddress = olof@hagsand.se emailAddress = olof@hagsand.se
O = Clixon O = Clixon
L = Stockholm L = Stockholm

3
test/test_perf_restconf.sh
View file

@ -151,7 +151,8 @@ cat $fdataxml >> $ftest
echo -n "</data>" >> $ftest echo -n "</data>" >> $ftest
# -i (ignore case) dont always work properly # -i (ignore case) dont always work properly
sed '/<data>/!d' $foutput > $foutput2 sed '/<data>/!d' $foutput > $foutput2
mv $foutput2 $foutput # Strip potential newlines, curl seems to leave trailing newlines on some platforms/versions
tr -d "\n\r" < $foutput2 > $foutput
ret=$(diff -i $ftest $foutput) ret=$(diff -i $ftest $foutput)
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then

2
test/test_restconf_nmap.sh
View file

@ -153,7 +153,7 @@ new "nmap ssl-cert-intaddr"
expectpart "$(nmap --script ssl-cert-intaddr -p 443 127.0.0.1)" 0 "443/tcp open https" expectpart "$(nmap --script ssl-cert-intaddr -p 443 127.0.0.1)" 0 "443/tcp open https"
new "nmap ssl-cert" new "nmap ssl-cert"
expectpart "$(nmap --script ssl-cert -p 443 127.0.0.1)" 0 "443/tcp open https" "| ssl-cert: Subject: commonName=www.clicon.org/organizationName=Clixon/countryName=SE" expectpart "$(nmap --script ssl-cert -p 443 127.0.0.1)" 0 "443/tcp open https" "| ssl-cert: Subject: commonName=${SSLCN}/organizationName=Clixon/countryName=SE"
new "nmap ssl-date" new "nmap ssl-date"
expectpart "$(nmap --script ssl-date -p 443 127.0.0.1)" 0 "443/tcp open https" expectpart "$(nmap --script ssl-date -p 443 127.0.0.1)" 0 "443/tcp open https"