Skip to content

Commit 02ce47c

Browse files
committedMar 17, 2025
Fix token enrollment failure in TPS test
The TPS test has been updated to configure the new TPS param added recently which is required for token enrollment: dogtagpki/pki@847ddbc
1 parent d2317c8 commit 02ce47c

File tree

1 file changed

+28
-15
lines changed

1 file changed

+28
-15
lines changed
 

‎.github/workflows/pki-tps-test.yml

+28-15
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,23 @@ jobs:
7171
-D pki_ds_url=ldap://ds.example.com:3389 \
7272
-v
7373
74+
- name: Update PKI server configuration
75+
run: |
76+
docker exec pki dnf install -y xmlstarlet
77+
78+
# disable access log buffer to avoid logging delay
79+
docker exec pki xmlstarlet edit --inplace \
80+
-u "//Valve[@className='org.apache.catalina.valves.AccessLogValve']/@buffered" \
81+
-v "false" \
82+
-i "//Valve[@className='org.apache.catalina.valves.AccessLogValve' and not(@buffered)]" \
83+
-t attr \
84+
-n "buffered" \
85+
-v "false" \
86+
/etc/pki/pki-tomcat/server.xml
87+
88+
# restart PKI server
89+
docker exec pki pki-server restart --wait
90+
7491
- name: Install TKS
7592
run: |
7693
docker exec pki pkispawn \
@@ -103,7 +120,7 @@ jobs:
103120
104121
docker exec pki pki -n caadmin tps-user-show tpsadmin
105122
106-
- name: Set up TPS authentication
123+
- name: Update TPS configuration
107124
run: |
108125
# import sample TPS users
109126
docker exec pki ldapadd \
@@ -122,6 +139,11 @@ jobs:
122139
auths.instance.ldap1.ldap.basedn \
123140
ou=people,dc=example,dc=com
124141
142+
# allow token enrollment
143+
# https://github.com/dogtagpki/pki/commit/847ddbc9e146603d11e917609411fde03e301778
144+
docker exec pki pki-server tps-config-set \
145+
channel.scp01.no.le.byte true
146+
125147
# restart TPS subsystem
126148
docker exec pki pki-server tps-redeploy --wait
127149
@@ -191,6 +213,11 @@ jobs:
191213
run: |
192214
docker exec pki journalctl -x --no-pager -u pki-tomcatd@pki-tomcat.service
193215
216+
- name: Check PKI server access log
217+
if: always()
218+
run: |
219+
docker exec pki find /var/log/pki/pki-tomcat -name "localhost_access_log.*" -exec cat {} \;
220+
194221
- name: Check CA debug log
195222
if: always()
196223
run: |
@@ -205,17 +232,3 @@ jobs:
205232
if: always()
206233
run: |
207234
docker exec pki find /var/lib/pki/pki-tomcat/logs/tps -name "debug.*" -exec cat {} \;
208-
209-
- name: Gather artifacts
210-
if: always()
211-
run: |
212-
tests/bin/ds-artifacts-save.sh ds
213-
tests/bin/pki-artifacts-save.sh pki
214-
continue-on-error: true
215-
216-
- name: Upload artifacts
217-
if: always()
218-
uses: actions/upload-artifact@v4
219-
with:
220-
name: pki-tps-test
221-
path: /tmp/artifacts

0 commit comments

Comments
 (0)