Repository navigation
Commit ddf8c50
feat: OpenShell SSH payload delivery, runner MCP hardening, and ConfigMap reconciler removal (openshift-online#246)
* feat(rbac): add GitOps resource gating with RBAC_ENABLED and auto-create projects
Introduce RBAC_ENABLED env var (default true) that restricts project, agent,
provider, and policy CRUD to service accounts (configmap-syncer), rejecting
user-initiated mutations with 403. This decouples GitOps resource gating from
gateway mode so it works independently.
Key changes:
- New rbac.RequireGitOpsManaged() gate on all resource mutation handlers
- Static token HTTP middleware (AMBIENT_API_TOKEN) to tag service callers
- Control plane auto-creates ACP projects for gateway tenant namespaces
- Kind setup script defers project creation to control plane, polls for readiness
- platformInfo endpoint exposes rbac_enabled flag
- Gateway mode defaults to true in Makefile
- Updated gateway-rbac-policy spec to document independent activation conditions
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix: rename test token constant to avoid false-positive secret detection
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix(rbac): bypass GitOps gate in RBAC integration tests
The RBAC owner-binding and auto-provisioning tests create projects as
regular users, but the GitOps gate rejects non-service-caller mutations
when RBAC is enabled (the default). These tests verify service-layer
RBAC behavior, not the GitOps gate, so they disable it via a new
OverrideForTesting helper.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix(rbac): use pointer override to bypass init-time sync.Once latch
The previous OverrideForTesting reset the sync.Once, but platformInfo's
init() calls IsRBACEnabled() at import time before any test runs,
latching the value permanently. Switch to a pointer-based override that
IsRBACEnabled() checks before the sync.Once cache.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix(rbac): address Amber review — add tests, fix search injection
1. Add unit tests for gitops_gate.go covering IsRBACEnabled defaults,
OverrideForTesting, and RequireGitOpsManaged paths (service caller,
user caller, disabled).
2. Add integration test verifying the RBAC_ENABLED=true path end-to-end:
user requests get 403, service account requests succeed. Registers a
pre-auth middleware for the test service token so the full middleware
chain (staticTokenHTTPMiddleware → IsServiceCaller →
RequireGitOpsManaged) is exercised.
3. Fix search query injection in ensureProject — replace string
concatenation with list-all and filter in Go, removing the injection
surface entirely.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix(rbac): use valid JWT for service account integration test
The previous approach registered a pre-auth middleware with a static
token, but the upstream JWT handler wraps outside pre-auth middlewares
in the chain, so non-JWT tokens get rejected with 401 before pre-auth
ever runs. Switch to creating a real JWT whose username matches the
configured service account — this tests the actual OIDC-based service
caller detection path in the RBAC middleware.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix(rbac): bypass GitOps gate in agent and project plugin integration tests
These tests exercise CRUD via HTTP endpoints as regular users, but the
GitOps gate defaults RBAC to enabled, rejecting non-service-account
mutations with 403. Add OverrideForTesting(false) to each affected test.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix(ci): provide dummy Vertex credentials in local-dev test
The test-local-dev-simulation job now creates a dummy vertex.json and
passes VERTEX_CRED to make kind-up. The Makefile explicitly forwards
VERTEX_CRED to the kind-setup-vertex sub-make in both gateway and
non-gateway paths.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix(ci): disable gateway in local-dev test simulation
CI doesn't have the gateway infrastructure, so explicitly set
OPENSHELL_USE_GATEWAY=false to avoid failures.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix(ci): pass Vertex AI env vars to setup-vertex-kind.sh in local-dev test
The non-gateway path in kind-setup-vertex calls setup-vertex-kind.sh,
which reads GOOGLE_APPLICATION_CREDENTIALS, ANTHROPIC_VERTEX_PROJECT_ID,
and CLOUD_ML_REGION from the environment. CI only set VERTEX_CRED (used
by the gateway path), so the script failed with [MISSING] for all three.
Set dummy values in the CI workflow env and pass the Make variables
through explicitly in the Makefile recipe.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix(security): reduce glog verbosity to prevent Bearer token logging
The rh-trex-ai framework's JSONLogFormatter dumps full HTTP request
headers (including Authorization: Bearer) when glog.V(10) is active.
Lower Kind overlay verbosity from -v=10 to -v=5 to prevent credential
leakage in pod logs.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* feat(openshell): add SSH session and TCP forwarding proto definitions
Add CreateSshSession, ForwardTcp, and TcpForwardInit message types to
the OpenShell proto to support SSH-over-gRPC payload delivery into
sandboxes with read-only root filesystems.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* feat(openshell): implement SSH-over-gRPC payload upload
Add ssh_upload.go with GatewayClient.UploadPayloads() that writes files
into running sandboxes via SSH-over-gRPC, bypassing the read-only root
filesystem restriction. Update gateway interface and add golang.org/x/crypto
dependency for SSH client support.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* feat(control-plane): add namespace labeling and payload delivery in gateway mode
Wire NamespaceProvisioner into initGatewayProvisioning to apply managed
labels to gateway namespaces for ConfigMapSyncer discovery. Add payload
delivery via SSH upload in execAfterReady. Update runner path from
/sandbox/runner to /runner and switch inbox messages to ListByAgent API.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* feat(runner): restructure paths from /sandbox/runner to /runner and update sandbox config
Move runner files to /runner to avoid conflicts with the sandbox
read-only root filesystem. Add atlassian-mcp to the image, update
sandbox policy with include_workdir and refined filesystem rules, and
add example-jira-agent.yaml for Jira MCP agent declarations.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* docs(specs): update platform specs for SSH payload delivery, namespace labels, and path changes
Update gateway-provisioning spec with managed namespace labels and
SSH-over-gRPC payload delivery requirements. Update sandbox provisioning
spec for /runner path and gateway-init namespace labeling. Update
agent-sandbox-config spec with generic credential type and SSH delivery
mechanism. Update runner spec with /runner path.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* Tweak sandbox config
* fix(security): validate SSH payload paths and pin atlassian-mcp version
Address PR review findings: add path validation to prevent shell injection
via crafted sandbox_path values, replace strings.LastIndex with filepath.Dir
to prevent panic on paths without '/', add SSH trust model documentation
matching OpenShell upstream patterns, pin atlassian-mcp==0.21.1 for
reproducible builds, and add unit tests for payload path validation.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* feat: remove RBAC GitOps gating and ConfigMapSyncer, add payloads to acpctl apply
Remove RequireGitOpsManaged guards from all API handlers, delete
gitops_gate.go, ConfigMapSyncer (replaced by acpctl apply -k), and
ensureProject/namespace labeling (no longer needed without ConfigMapSyncer).
Add payloads support to acpctl apply for the Agent kind so declarative
YAML can specify files to upload into the sandbox via SSH-over-gRPC.
Convert the JIRA agent example from ConfigMap format to a native ACP
kustomize overlay with payloads.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* refactor(examples): move jira agent to base, jira infra to tenant-a
Move jira-task-summarizer agent into base/agents/ so all tenants
inherit it. Move jira provider and credential into tenant-a overlay.
Remove the standalone jira-demo overlay.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix(cli): always rebuild acpctl during kind-up to prevent stale binaries
Add build-cli as a prerequisite of the kind-up target so acpctl is
always compiled from current source. Remove the now-redundant
conditional build logic in the OPENSHELL_USE_GATEWAY block.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix(cli): install acpctl to ~/.local/bin during build-cli
Ensures the PATH-resolved binary stays in sync with the built source,
preventing stale binary issues.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix(examples): add VERTEX_CRED default and credential setup comments
Default VERTEX_CRED to GOOGLE_APPLICATION_CREDENTIALS so kind-up
auto-detects the user's ADC without requiring an explicit path.
Add prerequisite comments to provider examples showing how to create
the backing K8s secrets (carried over from PR 246 ConfigMap examples).
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix(runner): pin atlassian-mcp to 1.0.0 in openshell image
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix(runner): add .dockerignore to exclude .venv and build artifacts from openshell image
The COPY . /runner/ambient-runner step was pulling in the local .venv
(92MB), __pycache__, and .egg-info directories into the build context
and image layer unnecessarily.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix(control-plane): delete sandbox when session completes in gateway mode
Previously, completed sessions in gateway mode never had their sandboxes
cleaned up (FIXME openshift-online#223). The exec stream left sessions in Running phase
indefinitely, and the reconciler skipped deprovision for Completed in
gateway mode. Both sides now work: execAfterReady marks the session
PhaseCompleted, and the reconciler handles Completed uniformly across
pod and gateway modes.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* docs(skills): add podman ctr image loading guidance to kind skills
kind load docker-image is unreliable on podman-based clusters and may
load stale image IDs. Updated dev-cluster and kind skills with the
direct ctr import method (podman save/cp/exec) as the recommended
approach.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix(runner): remove stray WORKDIR and add /runner to sandbox policy
Remove the intermediate `WORKDIR /runner` from Dockerfile.openshell that
caused `openshell sandbox connect` to land in /sandbox/runner instead of
/sandbox. Add /runner to the read_only filesystem policy so the runner
process can read its entrypoint and Python code under Landlock.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* feat(runner): add Atlassian network policy to sandbox default
Allow mcp-atlassian MCP server to reach Jira and Confluence REST APIs
(*.atlassian.net, *.atlassian.com, auth/api.atlassian.com) from inside
the sandbox. The MCP server is a Python script so binaries reference
the venv Python interpreters.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* feat(runner): bake Claude Code config into openshell image
Add claude.json (trust config) and claude-settings.json (permissions)
as build-time artifacts copied into the image. This replaces the
runtime bootstrapping in the wrapper script, which wrote minimal
defaults on first invocation. The settings include granular Bash
allow/deny lists and pre-approve mcp-atlassian tools.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix(runner): enable mcp-atlassian server in claude settings
Add enabledMcpjsonServers so Claude Code auto-approves the
mcp-atlassian MCP server declared in .mcp.json payloads.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* refactor(examples): rename jira-task-summarizer to jira-simple-whoami
Simplifies the example Jira agent to a basic whoami check instead of a
multi-step task summary, making it a better smoke test for Jira integration.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix(control-plane): patch sandbox ndots via CR instead of in-container sed
The sed/tee workaround in execAfterReady was unreliable against read-only
bind-mounted resolv.conf and was skipped entirely on the already-exists
sandbox path, leaving ndots:5 in place. Replace it with the CR-level
dnsConfig patch on both new and pre-existing sandbox paths.
Workaround for NVIDIA/OpenShell#2053
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* Revert "fix(control-plane): delete sandbox when session completes in gateway mode"
This reverts commit c0a81bd.
* Tweak claude settings in runner
* fix(runner): restore allowed_tools in SDK options to fix MCP permission denials
The SDK's acceptEdits permission mode only auto-approves file edit tools,
not MCP tools. Settings file permissions alone are insufficient in SDK mode —
allowed_tools must be passed explicitly in the SDK options dict. Also loads
all three setting sources (user, project, local), merges cwd-level .mcp.json
for payload-injected servers, and adds comprehensive permissions to
claude-settings.json as belt-and-suspenders.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* refactor(runner): stop expanding env vars in MCP config, preserve gateway credentials
MCP server configs now pass ${VAR} patterns through as-is instead of
eagerly expanding them. This is critical for OpenShell gateway mode where
credentials use lazy-resolution tokens (openshell:resolve:env:) that the
backend cannot repopulate. Also removes the PROJECT_MCP_SERVERS /
CUSTOM_MCP_SERVERS / disabled merge layers — config now loads from
baked-in + cwd-level .mcp.json only.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix(runner): remove credential wiper that was clearing agent environment vars
clear_runtime_credentials was designed for a shared-session multi-user
model that no longer exists — pods and gateway sandboxes are both
per-session. The wiper was actively harmful: it cleared non-secret
config like JIRA_URL set via the Agent environment field, and interfered
with OpenShell gateway lazy-resolution tokens.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* feat(runner): bake JIRA MCP into image, add skill-payload example, wire environment in acpctl apply
- Add mcp.json with mcp-atlassian config and COPY it to /sandbox/.mcp.json
in Dockerfile.openshell so JIRA MCP is available out of the box
- Simplify jira-simple-whoami agent: remove payload, add environment.JIRA_URL
- Add jira-simple-whoami-with-skill-payload example demonstrating SKILL.md
payload pattern
- Fix acpctl apply: the resource struct was missing the environment field,
so Agent environment vars were silently dropped on create and patch
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix(examples): use absolute path for SKILL.md in jira-simple-whoami agent
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* chore: fix lint and format issues in runner and Go integration tests
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix(security): address PR review feedback — SSH host key verification, MCP config trust boundary, narrow deny rules
- Verify SSH host key fingerprint from CreateSshSession response instead of
InsecureIgnoreHostKey, falling back to accept when gateway doesn't pin one
- Stop reading .mcp.json from cwd (user-controlled workspace) — merge only
from platform-controlled PAYLOAD_MCP_CONFIG_FILE (default /sandbox/.mcp.json)
- Narrow curl/chmod deny rules to target dangerous operations (upload/exfil,
chmod 777) instead of blanket-blocking legitimate agent usage
- Update tests to cover new trust boundary (test_ignores_cwd_mcp_json)
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* test(e2e): verify sandbox payload upload, env vars, MCP config, and baked-in settings
Add payload and environment variable to hello-world agent. Extend the
gateway e2e test with section 9 (sandbox configuration verification):
- 9a: payload file uploaded via SSH-over-gRPC
- 9b: agent env var passed through to sandbox (not wiped)
- 9c: MCP config ${} patterns preserved (not auto-expanded)
- 9d: claude settings.json matches source
- 9e: claude settings.local.json matches source
- 9f: sandbox policy.yaml at /etc/openshell/policy.yaml matches source
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* fix(manifests): remove duplicate -v=8 flag in api-server migration init container
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* docs(specs): update runner spec for MCP config, credentials, baked-in files, and policy changes
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* docs(specs): update provisioning spec for DNS patching, SSH payloads, and proto vendoring
Add DNS Configuration via Sandbox CRD Patch requirement (patchSandboxDNSConfig
workaround for OpenShell#2053), Payload Upload via SSH requirement
(CreateSshSession/ForwardTcp), update proto vendoring with new RPCs and
messages, add migration table entries for UploadPayloads,
ExecSandboxStreaming, patchSandboxDNSConfig, resolveEntrypoint path change,
and ssh_upload.go. Replace stale ConfigMapSyncer reference with
ApplicationReconciler.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* docs(specs): add /runner to sandbox filesystem read-only paths
The gateway runner image uses /runner as its runner directory root.
Add it to the Landlock read-only path list alongside /app.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* docs(specs): note gitAgentDeclaration missing payloads, sandbox_template, sandbox_policy
The ApplicationReconciler's git-sourced declaration struct does not yet
include payloads, sandbox_template, or sandbox_policy fields. Document
this as a known gap under Iteration 2.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
* feat(control-plane): add payloads field to gitAgentDeclaration struct
Git-sourced agent declarations can now declare payloads, which are
mapped through buildAgentPatch and buildAgentResource to the Agent
entity. The UploadPayloads SSH mechanism delivers them end-to-end at
sandbox creation time. Updated the agent-sandbox-config spec known-gap
note to reflect that only sandbox_template and sandbox_policy remain.
Co-Authored-By: Claude Opus 4.6 <[email protected]>
---------
Co-authored-by: Claude Opus 4.6 <[email protected]>1 parent 0b6a552 commit ddf8c50
70 files changed
Lines changed: 1826 additions & 2095 deletions
File tree
- .github/workflows
- components
- ambient-api-server
- plugins
- agents
- policies
- projects
- providers
- test/integration
- ambient-cli/cmd/acpctl/apply
- ambient-control-plane
- cmd/ambient-control-plane
- internal
- openshell
- grpc/openshell/v1
- reconciler
- proto/openshell/v1
- runners/ambient-runner
- ambient_runner
- bridges
- claude
- gemini_cli
- middleware
- platform
- tests
- examples
- base
- agents
- overlays
- tenant-a
- tenant-b
- skills
- build/dev-cluster
- deploy/kind
- specs
- platform
- security
- tests/e2e
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
133 | 133 | | |
134 | 134 | | |
135 | 135 | | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
136 | 140 | | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
137 | 145 | | |
138 | 146 | | |
139 | | - | |
| 147 | + | |
140 | 148 | | |
141 | 149 | | |
142 | 150 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
| 46 | + | |
46 | 47 | | |
47 | 48 | | |
48 | 49 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
120 | 120 | | |
121 | 121 | | |
122 | 122 | | |
| 123 | + | |
123 | 124 | | |
124 | 125 | | |
125 | 126 | | |
| |||
274 | 275 | | |
275 | 276 | | |
276 | 277 | | |
277 | | - | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
278 | 281 | | |
279 | 282 | | |
280 | 283 | | |
| |||
867 | 870 | | |
868 | 871 | | |
869 | 872 | | |
870 | | - | |
| 873 | + | |
871 | 874 | | |
872 | 875 | | |
873 | 876 | | |
| |||
938 | 941 | | |
939 | 942 | | |
940 | 943 | | |
941 | | - | |
942 | | - | |
943 | | - | |
944 | | - | |
945 | | - | |
946 | | - | |
947 | | - | |
948 | | - | |
949 | | - | |
950 | | - | |
951 | | - | |
952 | | - | |
953 | | - | |
| 944 | + | |
954 | 945 | | |
955 | 946 | | |
956 | 947 | | |
| |||
974 | 965 | | |
975 | 966 | | |
976 | 967 | | |
977 | | - | |
| 968 | + | |
978 | 969 | | |
979 | 970 | | |
980 | 971 | | |
| |||
1333 | 1324 | | |
1334 | 1325 | | |
1335 | 1326 | | |
| 1327 | + | |
| 1328 | + | |
| 1329 | + | |
1336 | 1330 | | |
1337 | 1331 | | |
1338 | 1332 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
76 | 76 | | |
77 | 77 | | |
78 | 78 | | |
| 79 | + | |
79 | 80 | | |
80 | 81 | | |
81 | 82 | | |
| |||
126 | 127 | | |
127 | 128 | | |
128 | 129 | | |
| 130 | + | |
129 | 131 | | |
130 | 132 | | |
131 | 133 | | |
| |||
153 | 155 | | |
154 | 156 | | |
155 | 157 | | |
| 158 | + | |
156 | 159 | | |
157 | 160 | | |
158 | 161 | | |
| |||
206 | 209 | | |
207 | 210 | | |
208 | 211 | | |
| 212 | + | |
209 | 213 | | |
210 | 214 | | |
211 | 215 | | |
| |||
309 | 313 | | |
310 | 314 | | |
311 | 315 | | |
| 316 | + | |
312 | 317 | | |
313 | 318 | | |
314 | 319 | | |
| |||
337 | 342 | | |
338 | 343 | | |
339 | 344 | | |
| 345 | + | |
340 | 346 | | |
341 | 347 | | |
342 | 348 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| 28 | + | |
28 | 29 | | |
29 | 30 | | |
30 | 31 | | |
| |||
104 | 105 | | |
105 | 106 | | |
106 | 107 | | |
| 108 | + | |
107 | 109 | | |
108 | 110 | | |
109 | 111 | | |
| |||
153 | 155 | | |
154 | 156 | | |
155 | 157 | | |
| 158 | + | |
156 | 159 | | |
157 | 160 | | |
158 | 161 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
| 36 | + | |
36 | 37 | | |
37 | 38 | | |
38 | 39 | | |
| |||
55 | 56 | | |
56 | 57 | | |
57 | 58 | | |
| 59 | + | |
58 | 60 | | |
59 | 61 | | |
60 | 62 | | |
| |||
157 | 159 | | |
158 | 160 | | |
159 | 161 | | |
| 162 | + | |
160 | 163 | | |
161 | 164 | | |
162 | 165 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
| 46 | + | |
46 | 47 | | |
47 | 48 | | |
48 | 49 | | |
| |||
72 | 73 | | |
73 | 74 | | |
74 | 75 | | |
| 76 | + | |
75 | 77 | | |
76 | 78 | | |
77 | 79 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| 27 | + | |
27 | 28 | | |
28 | 29 | | |
29 | 30 | | |
| |||
103 | 104 | | |
104 | 105 | | |
105 | 106 | | |
| 107 | + | |
106 | 108 | | |
107 | 109 | | |
108 | 110 | | |
| |||
150 | 152 | | |
151 | 153 | | |
152 | 154 | | |
| 155 | + | |
153 | 156 | | |
154 | 157 | | |
155 | 158 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
137 | 137 | | |
138 | 138 | | |
139 | 139 | | |
140 | | - | |
141 | 140 | | |
142 | 141 | | |
143 | 142 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
56 | 60 | | |
57 | 61 | | |
58 | 62 | | |
| |||
113 | 117 | | |
114 | 118 | | |
115 | 119 | | |
| 120 | + | |
| 121 | + | |
116 | 122 | | |
117 | 123 | | |
118 | 124 | | |
| |||
125 | 131 | | |
126 | 132 | | |
127 | 133 | | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
128 | 141 | | |
129 | 142 | | |
130 | 143 | | |
| |||
618 | 631 | | |
619 | 632 | | |
620 | 633 | | |
| 634 | + | |
| 635 | + | |
| 636 | + | |
| 637 | + | |
| 638 | + | |
| 639 | + | |
| 640 | + | |
| 641 | + | |
| 642 | + | |
| 643 | + | |
| 644 | + | |
| 645 | + | |
| 646 | + | |
621 | 647 | | |
622 | 648 | | |
623 | 649 | | |
| |||
667 | 693 | | |
668 | 694 | | |
669 | 695 | | |
| 696 | + | |
| 697 | + | |
| 698 | + | |
| 699 | + | |
| 700 | + | |
| 701 | + | |
670 | 702 | | |
671 | 703 | | |
672 | 704 | | |
| |||
715 | 747 | | |
716 | 748 | | |
717 | 749 | | |
| 750 | + | |
| 751 | + | |
| 752 | + | |
| 753 | + | |
| 754 | + | |
| 755 | + | |
718 | 756 | | |
719 | 757 | | |
720 | 758 | | |
| |||
967 | 1005 | | |
968 | 1006 | | |
969 | 1007 | | |
| 1008 | + | |
| 1009 | + | |
| 1010 | + | |
| 1011 | + | |
| 1012 | + | |
| 1013 | + | |
| 1014 | + | |
| 1015 | + | |
| 1016 | + | |
970 | 1017 | | |
971 | 1018 | | |
972 | 1019 | | |
| |||
0 commit comments