gh-47 add test on ssl

Unknow0 · Jul 6, 2024 · 5e27d17 · 5e27d17
1 parent 19bbbee
commit 5e27d17
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 21 deletions.
diff --git a/.github/workflows/bench.yaml b/.github/workflows/bench.yaml
@@ -49,7 +49,10 @@ jobs:
         components: native-image
         github-token: ${{ secrets.GITHUB_TOKEN }}
     - name: bench
-      run: java -jar benchmark.jar $GITHUB_STEP_SUMMARY 
+      run: |
+        echo '```' >> $GITHUB_STEP_SUMMARY
+        java -jar benchmark.jar $GITHUB_STEP_SUMMARY 
+        echo '```' >> $GITHUB_STEP_SUMMARY
 
   test:
     runs-on: ubuntu-latest
@@ -98,4 +101,6 @@ jobs:
         merge-multiple: true
     - name: result
       run: |
+        echo '```' >> $GITHUB_STEP_SUMMARY
         bash bench/result.sh out >> $GITHUB_STEP_SUMMARY 
+        echo '```' >> $GITHUB_STEP_SUMMARY
diff --git a/bench/run.sh b/bench/run.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 unknow_start() {
-	java -jar unknow-server-test/unknow-server-test-jar/target/server.jar > logs/unknow.log 2>&1 &
+	java -jar unknow-server-test/unknow-server-test-jar/target/server.jar --http-addr :8080 --https-addr :8443 --keystore store.jks --keystore-pass 123456 > logs/unknow.log 2>&1 &
 	pid=$!
 }
 unknow_stop() {
@@ -10,7 +10,7 @@ unknow_stop() {
 }
 native_start() {
 	chmod a+x server-native
-	./server-native > logs/native.log 2>&1 &
+	./server-native --http-addr :8080 --https-addr :8443 --keystore store.jks --keystore-pass 123456 > logs/native.log 2>&1 &
 	pid=$!
 }
 native_stop() {
@@ -39,6 +39,8 @@ cxf_stop=tomcat_stop
 mkdir -p out
 trap '[[ "$pid" ]] && kill -9 $pid' EXIT
 
+keytool -genkey -alias server -keyalg RSA -validity 365 -keystore store.jks -keypass 123456 -storetype JKS -dname "C=FR"
+
 ${1}_start
 sleep 10
 echo -e "\nWarming up"

diff --git a/bench/server.xml b/bench/server.xml
@@ -13,40 +13,25 @@
 
 	<!-- Global JNDI resources Documentation at /docs/jndi-resources-howto.html -->
 	<GlobalNamingResources>
-		<!-- Editable user database that can also be used by UserDatabaseRealm to authenticate users -->
 		<Resource name="UserDatabase" auth="Container" type="org.apache.catalina.UserDatabase" description="User database that can be updated and saved" factory="org.apache.catalina.users.MemoryUserDatabaseFactory" pathname="conf/tomcat-users.xml" />
 	</GlobalNamingResources>
 
 	<!-- A "Service" is a collection of one or more "Connectors" that share a single "Container" Note: A "Service" is not itself a "Container", so you may not define subcomponents such as "Valves" at this level. Documentation at /docs/config/service.html -->
 	<Service name="Catalina">
-
-		<!--The connectors can use a shared executor, you can define one or more named thread pools -->
-		<!-- <Executor name="tomcatThreadPool" namePrefix="catalina-exec-" maxThreads="150" minSpareThreads="4"/> -->
-
-
 		<!-- A "Connector" represents an endpoint by which requests are received and responses are returned. Documentation at : HTTP Connector: /docs/config/http.html AJP Connector: /docs/config/ajp.html Define a non-SSL/TLS HTTP/1.1 Connector on port 8080 -->
 		<Connector port="8080" protocol="HTTP/1.1" connectionTimeout="20000" redirectPort="8443" maxParameterCount="1000">
 			<UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
 		</Connector>
+		<Connector protocol="org.apache.coyote.http11.Http11NioProtocol" sslImplementationName="org.apache.tomcat.util.net.jsse.JSSEImplementation" port="8443" scheme="https" secure="true" SSLEnabled="true" keystoreFile="./store.jks" keystorePass="123456" clientAuth="false" sslProtocol="TLS">
+			<UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
+		</Connector>
 		<Engine name="Catalina" defaultHost="localhost">
-
-			<!--For clustering, please take a look at documentation at: /docs/cluster-howto.html (simple how to) /docs/config/cluster.html (reference documentation) -->
-			<!-- <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/> -->
-
-			<!-- Use the LockOutRealm to prevent attempts to guess user passwords via a brute-force attack -->
 			<Realm className="org.apache.catalina.realm.LockOutRealm">
-				<!-- This Realm uses the UserDatabase configured in the global JNDI resources under the key "UserDatabase". Any edits that are performed against this UserDatabase are immediately available for use by the Realm. -->
 				<Realm className="org.apache.catalina.realm.UserDatabaseRealm" resourceName="UserDatabase" />
 			</Realm>
 
 			<Host name="localhost" appBase="webapps" unpackWARs="true" autoDeploy="true">
-
-				<!-- SingleSignOn valve, share authentication between web applications Documentation at: /docs/config/valve.html -->
-				<!-- <Valve className="org.apache.catalina.authenticator.SingleSignOn" /> -->
-
-				<!-- Access log processes all example. Documentation at: /docs/config/valve.html Note: The pattern used is equivalent to using pattern="common" -->
 				<Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs" prefix="localhost_access_log" suffix=".txt" pattern="%h %l %u %t &quot;%r&quot; %s %b" />
-
 			</Host>
 		</Engine>
 	</Service>

diff --git a/bench/test.jmx b/bench/test.jmx
@@ -48,6 +48,7 @@
         </elementProp>
         <stringProp name="HTTPSampler.domain">${host}</stringProp>
         <stringProp name="HTTPSampler.port">${port}</stringProp>
+        <stringProp name="HTTPSampler.protocol">http</stringProp>
         <stringProp name="HTTPSampler.implementation">HttpClient4</stringProp>
         <stringProp name="HTTPSampler.connect_timeout">1000</stringProp>
         <stringProp name="HTTPSampler.response_timeout">2000</stringProp>
@@ -149,6 +150,43 @@
         </HTTPSamplerProxy>
         <hashTree/>
       </hashTree>
+      <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="ssl" enabled="true">
+        <stringProp name="ThreadGroup.num_threads">${c}</stringProp>
+        <stringProp name="ThreadGroup.ramp_time">0</stringProp>
+        <stringProp name="ThreadGroup.duration">${t}</stringProp>
+        <boolProp name="ThreadGroup.same_user_on_next_iteration">true</boolProp>
+        <boolProp name="ThreadGroup.scheduler">true</boolProp>
+        <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+        <elementProp name="ThreadGroup.main_controller" elementType="LoopController" guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" enabled="true">
+          <intProp name="LoopController.loops">-1</intProp>
+          <boolProp name="LoopController.continue_forever">false</boolProp>
+        </elementProp>
+        <boolProp name="ThreadGroup.delayedStart">false</boolProp>
+        <stringProp name="ThreadGroup.delay"></stringProp>
+      </ThreadGroup>
+      <hashTree>
+        <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="simple" enabled="true">
+          <boolProp name="HTTPSampler.postBodyRaw">false</boolProp>
+          <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
+            <collectionProp name="Arguments.arguments"/>
+          </elementProp>
+          <stringProp name="HTTPSampler.port">8443</stringProp>
+          <stringProp name="HTTPSampler.protocol">https</stringProp>
+          <stringProp name="HTTPSampler.path">/test</stringProp>
+          <stringProp name="HTTPSampler.method">GET</stringProp>
+          <boolProp name="HTTPSampler.follow_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+          <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+          <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+          <boolProp name="HTTPSampler.BROWSER_COMPATIBLE_MULTIPART">false</boolProp>
+          <boolProp name="HTTPSampler.image_parser">false</boolProp>
+          <boolProp name="HTTPSampler.concurrentDwn">false</boolProp>
+          <stringProp name="HTTPSampler.concurrentPool">6</stringProp>
+          <boolProp name="HTTPSampler.md5">false</boolProp>
+          <intProp name="HTTPSampler.ipSourceType">0</intProp>
+        </HTTPSamplerProxy>
+        <hashTree/>
+      </hashTree>
       <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="ws" enabled="true">
         <stringProp name="ThreadGroup.num_threads">${c}</stringProp>
         <stringProp name="ThreadGroup.ramp_time">0</stringProp>