Skip to content

Commit 4627168

Browse files
Travis MickChnwanze
authored andcommitted
Add IPv6 addresses for NTP and EC2Config to default denylist
cr: https://code.amazon.com/reviews/CR-131337861
1 parent 13fbc1c commit 4627168

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ To set up your own custom configuration for the agent:
208208
* SessionWorkersLimit (int)
209209
* Default: 1000
210210
* DeniedPortForwardingRemoteIPs ([]string)
211-
* Default: ["169.254.169.254", "fd00:ec2::254", "169.254.169.253", "fd00:ec2::253"]
211+
* Default: [ "169.254.169.254", "fd00:ec2::254", "169.254.169.253", "fd00:ec2::253", "169.254.169.123", "fd00:ec2::123", "169.254.169.250", "169.254.169.251", "fd00:ec2::240"]
212212
* Agent - represents metadata for amazon-ssm-agent
213213
* Region (string)
214214
* OrchestrationRootDir (string)

agent/appconfig/constants.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,8 @@ const (
248248
DefaultRunAsUserName = "ssm-user"
249249
)
250250

251-
// Default deny list IP addresses for remote host port forwarding: IMDS ipv4, IMDS ipv6, VPC ipv4, VPC ipv6, Amazon Time Sync Service, Amazon Windows license activation
252-
var DefaultDeniedPortForwardingRemoteIPs = []string{"169.254.169.254", "fd00:ec2::254", "169.254.169.253", "fd00:ec2::253", "169.254.169.123", "169.254.169.250"}
251+
// Default deny list IP addresses for remote host port forwarding: IMDS (ipv4, ipv6); VPC (ipv4, ipv6); Amazon Time Sync (ipv4, ipv6); Amazon Windows license activation (2x ipv4, ipv6)
252+
var DefaultDeniedPortForwardingRemoteIPs = []string{"169.254.169.254", "fd00:ec2::254", "169.254.169.253", "fd00:ec2::253", "169.254.169.123", "fd00:ec2::123", "169.254.169.250", "169.254.169.251", "fd00:ec2::240"}
253253

254254
// Document versions that are supported by this Agent version.
255255
// Note that 1.1 and 2.1 are deprecated schemas and hence are not added here.

amazon-ssm-agent.json.template

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@
3232
"169.254.169.253",
3333
"fd00:ec2::253",
3434
"169.254.169.123",
35-
"169.254.169.250"
35+
"fd00:ec2::123",
36+
"169.254.169.250",
37+
"169.254.169.251",
38+
"fd00:ec2::240"
3639
]
3740
},
3841
"Agent": {

0 commit comments

Comments
 (0)