Commit 29547d98 authored by Laura Dominguez's avatar Laura Dominguez
Browse files

SBI with PQC HTTPS Developed (Not re-keyed for the moment)

parent d8a6ba7c
Loading
Loading
Loading
Loading
+32 −0
Changes for deploy/tfs.sh: 32 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ export TFS_IMAGE_TAG=${TFS_IMAGE_TAG:-"dev"}

# If not already set, set the name of the Kubernetes namespace to deploy TFS to.
export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs"}
export CCIPS_CERTS_DIR=${CCIPS_CERTS_DIR:-"/home/ubuntu/PQC_certs_TFS"}

# If not already set, set additional manifest files to be applied after the deployment
export TFS_EXTRA_MANIFESTS=${TFS_EXTRA_MANIFESTS:-""}
@@ -130,6 +131,37 @@ bash scripts/dockerhub_k8s_secret.sh "$TFS_K8S_NAMESPACE"
sleep 2
printf "\n"

if [[ " ${TFS_COMPONENTS} " == *" ccips "* ]]; then
    for CERT_FILE in CA.crt tfs-agent1.crt tfs-agent1.key tfs-agent2.crt tfs-agent2.key; do
        if [[ ! -r "${CCIPS_CERTS_DIR}/${CERT_FILE}" ]]; then
            echo "Required CCIPS certificate file is missing or unreadable: ${CCIPS_CERTS_DIR}/${CERT_FILE}"
            exit 1
        fi
    done

    CCIPS_CERT_ARGS=(
        "--from-file=CA.crt=${CCIPS_CERTS_DIR}/CA.crt"
        "--from-file=tfs-agent1.crt=${CCIPS_CERTS_DIR}/tfs-agent1.crt"
        "--from-file=tfs-agent1.key=${CCIPS_CERTS_DIR}/tfs-agent1.key"
        "--from-file=tfs-agent2.crt=${CCIPS_CERTS_DIR}/tfs-agent2.crt"
        "--from-file=tfs-agent2.key=${CCIPS_CERTS_DIR}/tfs-agent2.key"
    )
    for CERT_PREFIX in agent1 agent2; do
        if [[ -r "${CCIPS_CERTS_DIR}/${CERT_PREFIX}.crt" && -r "${CCIPS_CERTS_DIR}/${CERT_PREFIX}.key" ]]; then
            CCIPS_CERT_ARGS+=(
                "--from-file=${CERT_PREFIX}.crt=${CCIPS_CERTS_DIR}/${CERT_PREFIX}.crt"
                "--from-file=${CERT_PREFIX}.key=${CCIPS_CERTS_DIR}/${CERT_PREFIX}.key"
            )
        elif [[ -e "${CCIPS_CERTS_DIR}/${CERT_PREFIX}.crt" || -e "${CCIPS_CERTS_DIR}/${CERT_PREFIX}.key" ]]; then
            echo "Both ${CERT_PREFIX}.crt and ${CERT_PREFIX}.key must be readable"
            exit 1
        fi
    done

    kubectl create secret generic ccips-pqc-certs --namespace "${TFS_K8S_NAMESPACE}" \
        "${CCIPS_CERT_ARGS[@]}" --dry-run=client -o yaml | kubectl apply -f -
fi

echo ">>> Create Secret with CockroachDB data..."
CRDB_SQL_PORT=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')
kubectl create secret generic crdb-data --namespace ${TFS_K8S_NAMESPACE} --type='Opaque' \
+11 −0
Changes for manifests/ccipsservice.yaml: 11 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -36,11 +36,17 @@ spec:
          env:
            - name: LOG_LEVEL
              value: "INFO"
            - name: CCIPS_CERTS_DIR
              value: "/etc/ccips/certs"
          envFrom:
            - secretRef:
                name: crdb-data
            - secretRef:
                name: nats-data
          volumeMounts:
            - name: pqc-certs
              mountPath: /etc/ccips/certs
              readOnly: true
          readinessProbe:
            exec:
              command: ["/bin/grpc_health_probe", "-addr=:10071"]
@@ -54,6 +60,11 @@ spec:
            limits:
              cpu: 500m
              memory: 512Mi
      volumes:
        - name: pqc-certs
          secret:
            secretName: ccips-pqc-certs
            defaultMode: 0400
---
apiVersion: v1
kind: Service
+11 −0
Changes for manifests/nbiservice.yaml: 11 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -44,9 +44,15 @@ spec:
              value: "production"  # normal value is "production", change to "development" if developing
            - name: IETF_NETWORK_RENDERER
              value: "LIBYANG"
            - name: CCIPS_CERTS_DIR
              value: "/etc/ccips/certs"
          envFrom:
            - secretRef:
                name: kfk-kpi-data
          volumeMounts:
            - name: pqc-certs
              mountPath: /etc/ccips/certs
              readOnly: true
          readinessProbe:
            httpGet:
              path: /healthz
@@ -68,6 +74,11 @@ spec:
            limits:
              cpu: 1000m
              memory: 2048Mi
      volumes:
        - name: pqc-certs
          secret:
            secretName: ccips-pqc-certs
            defaultMode: 0400
      # Volume mounts for TE data with IS-IS, BW and latency. Uncomment if needed
      #     volumeMounts:
      #       - name: te-data
+1 −1
Changes for src/ccips/Config.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -33,5 +33,5 @@ class CcipsConfig:
    BASE_DIR = Path(__file__).resolve().parent
    SERVICE_DIR = BASE_DIR / "service"
    CERTS_DIR = SERVICE_DIR / "certs"
    CERTS_PQC_DIR = SERVICE_DIR / "certs_pqc"
    PQC_certs_DIR = SERVICE_DIR / "PQC_certs"
    TEMPLATES_DIR = SERVICE_DIR / "templates"
+95 −22
Changes for src/ccips/Dockerfile: 95 added lines, 22 removed lines.
Original line number Diff line number Diff line
@@ -14,36 +14,94 @@

FROM python:3.9-slim

# Install dependencies
RUN apt-get --yes --quiet --quiet update && \
    apt-get --yes --quiet --quiet install wget g++ git && \
    rm -rf /var/lib/apt/lists/*

# Set Python to show logs as they occur
# ============================================================================
# Base/runtime configuration
# ============================================================================
ENV PYTHONUNBUFFERED=0 
ENV OPENSSL_PREFIX=/usr/local 
ENV OPENSSL_CONF=/usr/local/ssl/openssl.cnf 
ENV OPENSSL_MODULES=/usr/local/lib64/ossl-modules 
ENV LD_LIBRARY_PATH=/usr/local/lib64:/usr/local/lib:/usr/lib/x86_64-linux-gnu:/usr/lib 
ENV PATH=/usr/local/bin:/usr/local/sbin:/usr/sbin:/usr/bin:/sbin:/bin

# ============================================================================
# System/build dependencies
# ============================================================================

RUN apt-get update && \
    apt-get install --yes --no-install-recommends build-essential ca-certificates cmake g++ git libssl-dev ninja-build wget zlib1g-dev && rm -rf /var/lib/apt/lists/*

# ============================================================================
# OpenSSL 3.6.0 - PQC/TLS cryptographic layer
# ============================================================================

ARG OPENSSL_VERSION=3.6.0
ARG OPENSSL_SHA256=""

RUN set -eux \
    && mkdir -p /tmp/openssl-build \
    && cd /tmp/openssl-build \
    && wget -q "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" \
    && tar -xzf "openssl-${OPENSSL_VERSION}.tar.gz" \
    && cd "openssl-${OPENSSL_VERSION}" \
    && ./Configure linux-x86_64 --prefix=/usr/local --openssldir=/usr/local/ssl --libdir=lib64 shared no-ssl2 no-ssl3 \
    && make -j"$(nproc)" \
    && make install_sw install_ssldirs \
    && rm -f /usr/lib/x86_64-linux-gnu/libssl.so \
             /usr/lib/x86_64-linux-gnu/libcrypto.so \
             /usr/lib/x86_64-linux-gnu/libssl.so.3 \
             /usr/lib/x86_64-linux-gnu/libcrypto.so.3 \
    && ln -s /usr/local/lib64/libssl.so.3 /usr/lib/x86_64-linux-gnu/libssl.so.3 \
    && ln -s /usr/local/lib64/libcrypto.so.3 /usr/lib/x86_64-linux-gnu/libcrypto.so.3 \
    && ln -s /usr/local/lib64/libssl.so.3 /usr/lib/x86_64-linux-gnu/libssl.so \
    && ln -s /usr/local/lib64/libcrypto.so.3 /usr/lib/x86_64-linux-gnu/libcrypto.so \
    && cd / \
    && rm -rf /tmp/openssl-build


# Make the runtime linker aware of the new library directory even for
# processes that do not inherit LD_LIBRARY_PATH.
RUN printf '%s\n' '/usr/local/lib64' > /etc/ld.so.conf.d/openssl-3.6.0.conf; 
RUN ldconfig; 

RUN /usr/local/bin/openssl version

# Verify that Python's _ssl extension resolves against OpenSSL 3.6.0.
RUN python3 -c 'import ssl; print(ssl.OPENSSL_VERSION); assert ssl.OPENSSL_VERSION.startswith("OpenSSL 3.6.0")'; 

# Download the gRPC health probe
RUN GRPC_HEALTH_PROBE_VERSION=v0.2.0 && \
    wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
    chmod +x /bin/grpc_health_probe
# Show the actual dynamic dependencies of Python's SSL extension.
RUN rm -rf /tmp/openssl-build

# Get generic Python packages
RUN python3 -m pip install --upgrade 'pip==25.2'
RUN python3 -m pip install --upgrade 'setuptools==79.0.0' 'wheel==0.45.1'
RUN python3 -m pip install --upgrade 'pip-tools==7.3.0'
# ============================================================================
# gRPC health probe
# ============================================================================

RUN GRPC_HEALTH_PROBE_VERSION=v0.2.0 && wget -qO /bin/grpc_health_probe "https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64" &&  chmod +x /bin/grpc_health_probe

# ============================================================================
# Python packaging toolchain - TeraFlow original flow
# ============================================================================

RUN python3 -m pip install --no-cache-dir --upgrade 'pip==25.2' && python3 -m pip install --no-cache-dir --upgrade 'setuptools==79.0.0' 'wheel==0.45.1' 'pip-tools==7.3.0'

# ============================================================================
# Common TeraFlow Python dependencies
# ============================================================================

# Get common Python packages
WORKDIR /var/teraflow
COPY common_requirements.in common_requirements.in
RUN pip-compile --quiet --output-file=common_requirements.txt common_requirements.in
RUN python3 -m pip install -r common_requirements.txt

# Add common files into working directory
# ============================================================================
# Common TeraFlow source and protobuf generation
# ============================================================================

WORKDIR /var/teraflow/common
COPY src/common/. ./
RUN rm -rf proto

# Create proto sub-folder, copy .proto files, and generate Python code
# Create proto sub-folder, copy .proto files, and generate Python code.
RUN mkdir -p /var/teraflow/common/proto
WORKDIR /var/teraflow/common/proto
RUN touch __init__.py
@@ -52,20 +110,35 @@ RUN python3 -m grpc_tools.protoc -I=. --python_out=. --grpc_python_out=. *.proto
RUN rm *.proto
RUN find . -type f -exec sed -i -E 's/^(import\ .*)_pb2/from . \1_pb2/g' {} \;

# Create component sub-folders, get specific Python packages
# ============================================================================
# CCIPS component dependencies
# ============================================================================

RUN mkdir -p /var/teraflow/ccips
WORKDIR /var/teraflow/ccips
COPY src/ccips/requirements.in requirements.in
RUN pip-compile --quiet --output-file=requirements.txt requirements.in
RUN python3 -m pip install -r requirements.txt

# Add component files into working directory
# ============================================================================
# TeraFlow component source tree
# ============================================================================

WORKDIR /var/teraflow

COPY src/context/. context/
COPY src/service/. service/
COPY src/ccips/. ccips/
COPY src/nbi/. nbi/
ENV PYTHONPATH=/var/teraflow

# Start the service
# ============================================================================
# Final OpenSSL/Python verification
# ============================================================================
RUN set -eux; \
    python3 -c 'import ssl; print("Final Python OpenSSL:", ssl.OPENSSL_VERSION); assert ssl.OPENSSL_VERSION.startswith("OpenSSL 3.6.0")' \
    && openssl version | grep -q 'OpenSSL 3.6.0'

# ============================================================================
# CCIPS service
# ============================================================================

ENTRYPOINT ["python", "-m", "ccips.service"]
 No newline at end of file
Loading