Skip to content

Agent Mesh

simplify e2e

Antonio Ojea46c22d8e90e5
diff --git a/Makefile b/Makefile
index e4f1f995..58dea290 100644
--- a/Makefile
+++ b/Makefile
@@ -60,6 +60,9 @@ docker-build-hub:
docker-build-node:
docker build -t sam-node:local -f Dockerfile.sam-node .
-docker-build: docker-build-hub docker-build-node
+docker-build-mock-oidc:
+ docker build -t sam-mock-oidc:local -f tests/e2e/docker/Dockerfile.mock-oidc .
-.PHONY: docker-build-hub docker-build-node docker-build
+docker-build: docker-build-hub docker-build-node docker-build-mock-oidc
+
+.PHONY: docker-build-hub docker-build-node docker-build-mock-oidc docker-build
diff --git a/tests/e2e/docker/Dockerfile.mock-oidc b/tests/e2e/docker/Dockerfile.mock-oidc
new file mode 100644
index 00000000..8b27ce81
--- /dev/null
+++ b/tests/e2e/docker/Dockerfile.mock-oidc
@@ -0,0 +1,8 @@
+FROM python:3.12-slim
+
+RUN pip install pyjwt cryptography
+
+COPY tests/e2e/docker/mock_oidc.py /usr/local/bin/mock_oidc.py
+
+CMD ["python3", "/usr/local/bin/mock_oidc.py"]
+
diff --git a/tests/e2e/docker/mock_oidc.py b/tests/e2e/docker/mock_oidc.py
new file mode 100644
index 00000000..add3cfda
--- /dev/null
+++ b/tests/e2e/docker/mock_oidc.py
@@ -0,0 +1,108 @@
+import json
+import time
+import jwt
+from http.server import BaseHTTPRequestHandler, HTTPServer
+
+# The following RSA private key and JWKS were generated for testing purposes.
+# They are used by the mock OIDC server to sign JWTs.
+# To generate a new key pair:
+# openssl genpkey -algorithm RSA -out private.pem -pkeyopt rsa_keygen_bits:2048
+# openssl rsa -pubout -in private.pem -out public.pem
+# Parameters: RSA 2048 bits, Algorithm: RS256, kid: test-key-id
+PRIVATE_KEY = """-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDGtPD85uaT342Y
+yqGAiWQ6OV2BxvpXQRMzsb7VpdLa146xf5/1b9lIR4dFvhvGUqnyzFLV0EdIzTqo
+xyKGHbQY68DIUjH3iwt6rzU0Vkw/3g/R/TBEmGwdqNDLCBItsLOnF4HfsxAWtjaU
+R96S4oXaCUcXOD/3yHs0ha4tu8YgwGwMHa/CQRgcTX5FshR6uHow5G7NiOVYUcAP
+c1HXmwmf0FeSY9r0QudmIjkJSeIH1I/BufpEqbcjrSyjYd4eldbhjlCvuIR93Sva
+8jZBzdCW+xxyU+8dz2tEgRjm9G7CpoCpAwhcEQQW7XRUb8DP9+bid9VfT+3C1Te6
+u8eowndXAgMBAAECggEAGF6ZjZKt5aXNolb7jp2K/r8JUkC6dBgFiFn8uwwOu4sj
+M26hCgNRJRWsp+eEVYLO1/mqERHtpCaTUp61g7hB3aqQJqE6Ao95dW7megg5ar3L
+t+ey0z7UR6DsFnJjdFoO9meiJHK7/uUS9YWI7P++BbsMjnL2GWfrgEoCzhYQ2vQ2
+8t9lGmJfaEeicTcPs4/Jtz9nX+KQ1CqKb5uHP6IyVQjV/nIjWh1WZJV5wsmLM1ZF
+YT7NPEhXkgH5JjwzEI3QR9ZMs4FUgbduImmS280YCMNMUNVsSBbbV/1hh7Sxlp6B
+bRaK12sPPRwW0sHw3odZKjGzKIFlu9I5TieNJ5w2AQKBgQDy3cxDXxj+bcSYuWDp
+p4EVNTwg+IY9eT0x1x+tWXaOjGTscD4GrdUYhspWuoUn5NxZ0ub0apiTMQfoM9a0
+Qr3CKngkL5JTi6OwdnEaTPNvQiSJdgXXzYdCXeucK5soeHCZTPAb3bV27LtpxyMI
+QSx9rnKcSyoRSavLWP0hr8QNVwKBgQDRc84q3I5tZX/whoUmeTj6aNJoIa1KAACM
+0Fnr9ecjLS50kXIiTSCiNE8pcBcsSxYgo+PG5W9oQaZcdd7r2nJOqaizpjnHbF+9
+S/Ts9vj+dJlCUcjjROghzYrI5mdb8Dq2Ngd93IcBt5H+W6bm8wWUgLy0IJmJDKHE
+Z7SS22imAQKBgAETHi5GI3QsxCvw1g7yoM2ZOLTkpKNs/+pSi19XAAFNebzaGkwp
+RMIhBpAvrxsoFhmHp2H5fsdX9jL+17pgeTp8uZ9fXoRkH8tOGt4E7SbW4haBoTD9
+RdXzWHGOd9dMASOMhZt59a2bCpFDQlJtB2de+D7czkjZTJtPv38AqhttAoGAE8X2
+Aa/etk8tu9xHN7GcAm/g5TnArUrAwops4szNLFH4n8KXXsufOBDuJEBTv7e6+Avg
+1gcU9Ge2N+ZczDFMN0bnCUa5D62YgDtqfPB34zXIvi0QZPw9WeuYnYy610AfmtIQ
+9P3btPrKipPGdukcbr+UkQC+3eRWZT9RGcgi4gECgYApA3J0jlD+JFtYKFOuJWxS
+aFEhYPe2dVW78bJoMMhxPtD9hWw/zWVUdyhdXMHoP8/igwNiUqXaYacPbxTFu5ft
+w/+UummqB6KpqPFnpbqP826Udr4SEHH0iwvs4MDqSlXcOC5CXbIoMLB/zMjE+u/J
+IqNKTt9jbR4zISCpyOCsQw==
+-----END PRIVATE KEY-----"""
+
+JWKS = {
+ "keys": [
+ {
+ "kty": "RSA",
+ "alg": "RS256",
+ "use": "sig",
+ "kid": "test-key-id",
+ "n": "xrTw_Obmk9-NmMqhgIlkOjldgcb6V0ETM7G-1aXS2teOsX-f9W_ZSEeHRb4bxlKp8sxS1dBHSM06qMcihh20GOvAyFIx94sLeq81NFZMP94P0f0wRJhsHajQywgSLbCzpxeB37MQFrY2lEfekuKF2glHFzg_98h7NIWuLbvGIMBsDB2vwkEYHE1-RbIUerh6MORuzYjlWFHAD3NR15sJn9BXkmPa9ELnZiI5CUniB9SPwbn6RKm3I60so2HeHpXW4Y5Qr7iEfd0r2vI2Qc3QlvscclPvHc9rRIEY5vRuwqaAqQMIXBEEFu10VG_Az_fm4nfVX0_twtU3urvHqMJ3Vw",
+ "e": "AQAB"
+ }
+ ]
+}
+
+class Handler(BaseHTTPRequestHandler):
+ def do_GET(self):
+ if self.path == '/.well-known/openid-configuration':
+ body = {
+ 'issuer': 'http://mock-oidc:18080',
+ 'authorization_endpoint': 'http://mock-oidc:18080/auth',
+ 'token_endpoint': 'http://mock-oidc:18080/token',
+ 'jwks_uri': 'http://mock-oidc:18080/keys'
+ }
+ data = json.dumps(body).encode('utf-8')
+ self.send_response(200)
+ self.send_header('Content-Type', 'application/json')
+ self.send_header('Content-Length', str(len(data)))
+ self.end_headers()
+ self.wfile.write(data)
+ return
+ if self.path == '/keys':
+ data = json.dumps(JWKS).encode('utf-8')
+ self.send_response(200)
+ self.send_header('Content-Type', 'application/json')
+ self.send_header('Content-Length', str(len(data)))
+ self.end_headers()
+ self.wfile.write(data)
+ return
+ self.send_response(200)
+ self.end_headers()
+ self.wfile.write(b'ok')
+
+ def do_POST(self):
+ if self.path == '/token':
+ payload = {
+ 'iss': 'http://mock-oidc:18080',
+ 'aud': 'sam-e2e',
+ 'sub': 'test-user',
+ 'exp': int(time.time()) + 3600,
+ 'roles': ['admin', 'user']
+ }
+ token = jwt.encode(payload, PRIVATE_KEY, algorithm='RS256', headers={'kid': 'test-key-id'})
+ body = {
+ 'access_token': token,
+ 'token_type': 'Bearer',
+ 'expires_in': 3600
+ }
+ data = json.dumps(body).encode('utf-8')
+ self.send_response(200)
+ self.send_header('Content-Type', 'application/json')
+ self.send_header('Content-Length', str(len(data)))
+ self.end_headers()
+ self.wfile.write(data)
+ return
+ self.send_response(404)
+ self.end_headers()
+
+print("Mock OIDC server ready", flush=True)
+HTTPServer(('0.0.0.0', 18080), Handler).serve_forever()
diff --git a/tests/e2e/lib/container_mesh.bash b/tests/e2e/lib/container_mesh.bash
index 89de575b..29ad4326 100644
--- a/tests/e2e/lib/container_mesh.bash
+++ b/tests/e2e/lib/container_mesh.bash
@@ -62,6 +62,10 @@ if [[ -z "${MESH_HELPERS_LOADED:-}" ]]; then
MESH_SOCKET_DIR="/tmp/${MESH_PREFIX}-sockets"
mkdir -p "${MESH_SOCKET_DIR}"
+
+ if ! docker image inspect sam-mock-oidc:local >/dev/null 2>&1; then
+ docker build -t sam-mock-oidc:local -f tests/e2e/docker/Dockerfile.mock-oidc . >/dev/null
+ fi
}
mesh_cleanup_env() {
@@ -162,126 +166,11 @@ sys.exit(1)
mesh_start_mock_oidc() {
local name="${MESH_PREFIX}-oidc"
- local cmd
- read -r -d '' cmd <<'EOF' || true
-python3 - <<'PY'
-import json
-import time
-import jwt
-from http.server import BaseHTTPRequestHandler, HTTPServer
-
-# The following RSA private key and JWKS were generated for testing purposes.
-# They are used by the mock OIDC server to sign JWTs.
-# To generate a new key pair:
-# openssl genpkey -algorithm RSA -out private.pem -pkeyopt rsa_keygen_bits:2048
-# openssl rsa -pubout -in private.pem -out public.pem
-# Parameters: RSA 2048 bits, Algorithm: RS256, kid: test-key-id
-PRIVATE_KEY = """-----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDGtPD85uaT342Y
-yqGAiWQ6OV2BxvpXQRMzsb7VpdLa146xf5/1b9lIR4dFvhvGUqnyzFLV0EdIzTqo
-xyKGHbQY68DIUjH3iwt6rzU0Vkw/3g/R/TBEmGwdqNDLCBItsLOnF4HfsxAWtjaU
-R96S4oXaCUcXOD/3yHs0ha4tu8YgwGwMHa/CQRgcTX5FshR6uHow5G7NiOVYUcAP
-c1HXmwmf0FeSY9r0QudmIjkJSeIH1I/BufpEqbcjrSyjYd4eldbhjlCvuIR93Sva
-8jZBzdCW+xxyU+8dz2tEgRjm9G7CpoCpAwhcEQQW7XRUb8DP9+bid9VfT+3C1Te6
-u8eowndXAgMBAAECggEAGF6ZjZKt5aXNolb7jp2K/r8JUkC6dBgFiFn8uwwOu4sj
-M26hCgNRJRWsp+eEVYLO1/mqERHtpCaTUp61g7hB3aqQJqE6Ao95dW7megg5ar3L
-t+ey0z7UR6DsFnJjdFoO9meiJHK7/uUS9YWI7P++BbsMjnL2GWfrgEoCzhYQ2vQ2
-8t9lGmJfaEeicTcPs4/Jtz9nX+KQ1CqKb5uHP6IyVQjV/nIjWh1WZJV5wsmLM1ZF
-YT7NPEhXkgH5JjwzEI3QR9ZMs4FUgbduImmS280YCMNMUNVsSBbbV/1hh7Sxlp6B
-bRaK12sPPRwW0sHw3odZKjGzKIFlu9I5TieNJ5w2AQKBgQDy3cxDXxj+bcSYuWDp
-p4EVNTwg+IY9eT0x1x+tWXaOjGTscD4GrdUYhspWuoUn5NxZ0ub0apiTMQfoM9a0
-Qr3CKngkL5JTi6OwdnEaTPNvQiSJdgXXzYdCXeucK5soeHCZTPAb3bV27LtpxyMI
-QSx9rnKcSyoRSavLWP0hr8QNVwKBgQDRc84q3I5tZX/whoUmeTj6aNJoIa1KAACM
-0Fnr9ecjLS50kXIiTSCiNE8pcBcsSxYgo+PG5W9oQaZcdd7r2nJOqaizpjnHbF+9
-S/Ts9vj+dJlCUcjjROghzYrI5mdb8Dq2Ngd93IcBt5H+W6bm8wWUgLy0IJmJDKHE
-Z7SS22imAQKBgAETHi5GI3QsxCvw1g7yoM2ZOLTkpKNs/+pSi19XAAFNebzaGkwp
-RMIhBpAvrxsoFhmHp2H5fsdX9jL+17pgeTp8uZ9fXoRkH8tOGt4E7SbW4haBoTD9
-RdXzWHGOd9dMASOMhZt59a2bCpFDQlJtB2de+D7czkjZTJtPv38AqhttAoGAE8X2
-Aa/etk8tu9xHN7GcAm/g5TnArUrAwops4szNLFH4n8KXXsufOBDuJEBTv7e6+Avg
-1gcU9Ge2N+ZczDFMN0bnCUa5D62YgDtqfPB34zXIvi0QZPw9WeuYnYy610AfmtIQ
-9P3btPrKipPGdukcbr+UkQC+3eRWZT9RGcgi4gECgYApA3J0jlD+JFtYKFOuJWxS
-aFEhYPe2dVW78bJoMMhxPtD9hWw/zWVUdyhdXMHoP8/igwNiUqXaYacPbxTFu5ft
-w/+UummqB6KpqPFnpbqP826Udr4SEHH0iwvs4MDqSlXcOC5CXbIoMLB/zMjE+u/J
-IqNKTt9jbR4zISCpyOCsQw==
------END PRIVATE KEY-----"""
-
-JWKS = {
- "keys": [
- {
- "kty": "RSA",
- "alg": "RS256",
- "use": "sig",
- "kid": "test-key-id",
- "n": "xrTw_Obmk9-NmMqhgIlkOjldgcb6V0ETM7G-1aXS2teOsX-f9W_ZSEeHRb4bxlKp8sxS1dBHSM06qMcihh20GOvAyFIx94sLeq81NFZMP94P0f0wRJhsHajQywgSLbCzpxeB37MQFrY2lEfekuKF2glHFzg_98h7NIWuLbvGIMBsDB2vwkEYHE1-RbIUerh6MORuzYjlWFHAD3NR15sJn9BXkmPa9ELnZiI5CUniB9SPwbn6RKm3I60so2HeHpXW4Y5Qr7iEfd0r2vI2Qc3QlvscclPvHc9rRIEY5vRuwqaAqQMIXBEEFu10VG_Az_fm4nfVX0_twtU3urvHqMJ3Vw",
- "e": "AQAB"
- }
- ]
-}
-
-class Handler(BaseHTTPRequestHandler):
- def do_GET(self):
- if self.path == '/.well-known/openid-configuration':
- body = {
- 'issuer': 'http://mock-oidc:18080',
- 'authorization_endpoint': 'http://mock-oidc:18080/auth',
- 'token_endpoint': 'http://mock-oidc:18080/token',
- 'jwks_uri': 'http://mock-oidc:18080/keys'
- }
- data = json.dumps(body).encode('utf-8')
- self.send_response(200)
- self.send_header('Content-Type', 'application/json')
- self.send_header('Content-Length', str(len(data)))
- self.end_headers()
- self.wfile.write(data)
- return
- if self.path == '/keys':
- data = json.dumps(JWKS).encode('utf-8')
- self.send_response(200)
- self.send_header('Content-Type', 'application/json')
- self.send_header('Content-Length', str(len(data)))
- self.end_headers()
- self.wfile.write(data)
- return
- self.send_response(200)
- self.end_headers()
- self.wfile.write(b'ok')
-
- def do_POST(self):
- if self.path == '/token':
- payload = {
- 'iss': 'http://mock-oidc:18080',
- 'aud': 'sam-e2e',
- 'sub': 'test-user',
- 'exp': int(time.time()) + 3600,
- 'roles': ['admin', 'user']
- }
- token = jwt.encode(payload, PRIVATE_KEY, algorithm='RS256', headers={'kid': 'test-key-id'})
- body = {
- 'access_token': token,
- 'token_type': 'Bearer',
- 'expires_in': 3600
- }
- data = json.dumps(body).encode('utf-8')
- self.send_response(200)
- self.send_header('Content-Type', 'application/json')
- self.send_header('Content-Length', str(len(data)))
- self.end_headers()
- self.wfile.write(data)
- return
- self.send_response(404)
- self.end_headers()
-
-print("Mock OIDC server ready", flush=True)
-HTTPServer(('0.0.0.0', 18080), Handler).serve_forever()
-PY
-EOF
-
docker run -d \
--name "${name}" \
--network "${MESH_NETWORK}" \
--network-alias mock-oidc \
- python:3.12 \
- sh -lc "pip install pyjwt cryptography && ${cmd}" >/dev/null
+ sam-mock-oidc:local >/dev/null
MESH_CONTAINERS+=("${name}")
mesh_wait_for_log "${name}" "Mock OIDC server ready" 30