Skip to content
This repository has been archived by the owner on Sep 3, 2024. It is now read-only.

Add security group denies #134

Merged
merged 2 commits into from
Aug 26, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,13 @@
"@azure/ms-rest-azure-js": "^2.0.0",
"@azure/ms-rest-js": "^2.0.0"
},
"peerDependencies": {
"@jupiterone/integration-sdk-core": "^3.1.0"
},
"devDependencies": {
"@jupiterone/integration-sdk-core": "^3.0.1",
"@jupiterone/integration-sdk-dev-tools": "^3.0.1",
"@jupiterone/integration-sdk-testing": "^3.0.1",
"@jupiterone/integration-sdk-core": "^3.1.0",
"@jupiterone/integration-sdk-dev-tools": "^3.1.0",
"@jupiterone/integration-sdk-testing": "^3.1.0",
"@microsoft/microsoft-graph-types": "^1.10.0",
"@types/fs-extra": "^5.0.5",
"@types/jest": "^25.2.1",
Expand All @@ -83,8 +86,5 @@
"ts-jest": "^25.3.1",
"ts-node": "^8.8.2",
"typescript": "^3.8.3"
},
"peerDependencies": {
"@jupiterone/integration-sdk-core": "^3.0.0"
}
}
70 changes: 32 additions & 38 deletions src/steps/resource-manager/network/converters/securityGroups.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ interface Rule {
properties: FirewallRuleProperties;
}

function securityGroupRuleRelationshipClass(
rule: Rule,
): RelationshipClass | undefined {
return rule.access === 'Allow' ? RelationshipClass.ALLOWS : undefined; // TODO implement DENIES and return
function securityGroupRuleRelationshipClass(rule: Rule): RelationshipClass {
return rule.access === 'Allow'
? RelationshipClass.ALLOWS
: RelationshipClass.DENIES;
}

function securityGroupRuleRelationshipDirection(
Expand All @@ -108,7 +108,7 @@ export function createSecurityGroupRuleSubnetRelationship(
sg: NetworkSecurityGroup,
rule: Rule,
subnet: Subnet,
): Relationship | undefined {
): Relationship {
const direction = securityGroupRuleRelationshipDirection(rule);
const directionalProperties =
direction === RelationshipDirection.FORWARD
Expand All @@ -124,48 +124,42 @@ export function createSecurityGroupRuleSubnetRelationship(
toType: SECURITY_GROUP_ENTITY_TYPE,
toKey: sg.id as string,
};
const _class = securityGroupRuleRelationshipClass(rule);
if (_class !== undefined) {
return createDirectRelationship({
_class,
...directionalProperties,
properties: {
...rule.properties,
_type: SECURITY_GROUP_RULE_RELATIONSHIP_TYPE,
_key: `${securityGroupRuleRelationshipKeyPrefix(rule)}:${subnet.id}`,
},
});
}
return createDirectRelationship({
_class: securityGroupRuleRelationshipClass(rule),
...directionalProperties,
properties: {
...rule.properties,
_type: SECURITY_GROUP_RULE_RELATIONSHIP_TYPE,
_key: `${securityGroupRuleRelationshipKeyPrefix(rule)}:${subnet.id}`,
},
});
}

export function createSecurityGroupRuleMappedRelationship(
sg: NetworkSecurityGroup,
rule: Rule,
target: RuleTargetEntity,
): Relationship | undefined {
): Relationship {
const targetFilterKeys = target.internet ? [['_key']] : [Object.keys(target)];
const targetEntity = target.internet ? INTERNET : (target as Entity);

const _class = securityGroupRuleRelationshipClass(rule);
if (_class !== undefined) {
return createMappedRelationship({
_class,
_mapping: {
relationshipDirection: securityGroupRuleRelationshipDirection(rule),
sourceEntityKey: sg.id as string,
targetFilterKeys,
targetEntity,
skipTargetCreation: !!target._key,
},
properties: {
...rule.properties,
_type: SECURITY_GROUP_RULE_RELATIONSHIP_TYPE,
_key: `${securityGroupRuleRelationshipKeyPrefix(rule)}:${
target.internet ? 'internet' : Object.values(target).join(':')
}`,
},
});
}
return createMappedRelationship({
_class: securityGroupRuleRelationshipClass(rule),
_mapping: {
relationshipDirection: securityGroupRuleRelationshipDirection(rule),
sourceEntityKey: sg.id as string,
targetFilterKeys,
targetEntity,
skipTargetCreation: !!target._key,
},
properties: {
...rule.properties,
_type: SECURITY_GROUP_RULE_RELATIONSHIP_TYPE,
_key: `${securityGroupRuleRelationshipKeyPrefix(rule)}:${
target.internet ? 'internet' : Object.values(target).join(':')
}`,
},
});
}

export function processSecurityGroupRules(sg: NetworkSecurityGroup): Rule[] {
Expand Down
94 changes: 94 additions & 0 deletions src/steps/resource-manager/network/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,53 @@ test('network steps', async () => {
toPort: 65535,
type: 'Microsoft.Network/networkSecurityGroups/defaultSecurityRules',
},
{
_class: 'DENIES',
_key:
'azure_security_group_rule:/subscriptions/dccea45f-7035-4a17-8731-1fd46aaa74a0/resourceGroups/j1dev/providers/Microsoft.Network/networkSecurityGroups/j1dev/defaultSecurityRules/DenyAllInBound:*:internet',
_mapping: {
relationshipDirection: RelationshipDirection.REVERSE,
skipTargetCreation: false,
sourceEntityKey:
'/subscriptions/dccea45f-7035-4a17-8731-1fd46aaa74a0/resourceGroups/j1dev/providers/Microsoft.Network/networkSecurityGroups/j1dev',
targetEntity: {
CIDR: '0.0.0.0/0',
CIDRv6: '::/0',
_class: ['Internet', 'Network'],
_key: 'global:internet',
_type: 'internet',
displayName: 'Internet',
public: true,
},
targetFilterKeys: [['_key']],
},
_type: 'azure_security_group_rule',
access: 'Deny',
description: 'Deny all inbound traffic',
destinationAddressPrefix: '*',
destinationPortRange: '*',
direction: 'Inbound',
displayName: 'DENIES',
egress: false,
etag: expect.any(String),
fromPort: 0,
id:
'/subscriptions/dccea45f-7035-4a17-8731-1fd46aaa74a0/resourceGroups/j1dev/providers/Microsoft.Network/networkSecurityGroups/j1dev/defaultSecurityRules/DenyAllInBound',
inbound: true,
ingress: true,
ipProtocol: '*',
name: 'DenyAllInBound',
outbound: false,
portRange: '*',
priority: 65500,
protocol: '*',
provisioningState: 'Succeeded',
ruleNumber: 65500,
sourceAddressPrefix: '*',
sourcePortRange: '*',
toPort: 65535,
type: 'Microsoft.Network/networkSecurityGroups/defaultSecurityRules',
},
{
_class: 'ALLOWS',
_key:
Expand Down Expand Up @@ -596,6 +643,53 @@ test('network steps', async () => {
toPort: 65535,
type: 'Microsoft.Network/networkSecurityGroups/defaultSecurityRules',
},
{
_class: 'DENIES',
_key:
'azure_security_group_rule:/subscriptions/dccea45f-7035-4a17-8731-1fd46aaa74a0/resourceGroups/j1dev/providers/Microsoft.Network/networkSecurityGroups/j1dev/defaultSecurityRules/DenyAllOutBound:*:internet',
_mapping: {
relationshipDirection: RelationshipDirection.FORWARD,
skipTargetCreation: false,
sourceEntityKey:
'/subscriptions/dccea45f-7035-4a17-8731-1fd46aaa74a0/resourceGroups/j1dev/providers/Microsoft.Network/networkSecurityGroups/j1dev',
targetEntity: {
CIDR: '0.0.0.0/0',
CIDRv6: '::/0',
_class: ['Internet', 'Network'],
_key: 'global:internet',
_type: 'internet',
displayName: 'Internet',
public: true,
},
targetFilterKeys: [['_key']],
},
_type: 'azure_security_group_rule',
access: 'Deny',
description: 'Deny all outbound traffic',
destinationAddressPrefix: '*',
destinationPortRange: '*',
direction: 'Outbound',
displayName: 'DENIES',
egress: true,
etag: expect.any(String),
fromPort: 0,
id:
'/subscriptions/dccea45f-7035-4a17-8731-1fd46aaa74a0/resourceGroups/j1dev/providers/Microsoft.Network/networkSecurityGroups/j1dev/defaultSecurityRules/DenyAllOutBound',
inbound: false,
ingress: false,
ipProtocol: '*',
name: 'DenyAllOutBound',
outbound: true,
portRange: '*',
priority: 65500,
protocol: '*',
provisioningState: 'Succeeded',
ruleNumber: 65500,
sourceAddressPrefix: '*',
sourcePortRange: '*',
toPort: 65535,
type: 'Microsoft.Network/networkSecurityGroups/defaultSecurityRules',
},
{
_class: 'ALLOWS',
_key:
Expand Down
31 changes: 16 additions & 15 deletions src/steps/resource-manager/network/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -300,14 +300,9 @@ export async function buildSecurityGroupRuleRelationships(
const subnets = await findSubnetsForCIDR(target.CIDR as string);
if (subnets?.length) {
for (const subnet of subnets) {
const relationship = createSecurityGroupRuleSubnetRelationship(
sg,
rule,
subnet,
await jobState.addRelationship(
createSecurityGroupRuleSubnetRelationship(sg, rule, subnet),
);
if (relationship !== undefined) {
await jobState.addRelationship(relationship);
}
}
} else {
logger.warn(
Expand All @@ -316,14 +311,9 @@ export async function buildSecurityGroupRuleRelationships(
);
}
} else {
const relationship = createSecurityGroupRuleMappedRelationship(
sg,
rule,
target,
await jobState.addRelationship(
createSecurityGroupRuleMappedRelationship(sg, rule, target),
);
if (relationship !== undefined) {
await jobState.addRelationship(relationship);
}
}
}
}
Expand Down Expand Up @@ -442,7 +432,6 @@ export const networkSteps: Step<
name: 'Network Security Group Rules',
entities: [],
relationships: [
// can go either way?
{
_type: SECURITY_GROUP_RULE_RELATIONSHIP_TYPE,
sourceType: SECURITY_GROUP_ENTITY_TYPE,
Expand All @@ -455,6 +444,18 @@ export const networkSteps: Step<
_class: RelationshipClass.ALLOWS,
targetType: SECURITY_GROUP_ENTITY_TYPE,
},
{
_type: SECURITY_GROUP_RULE_RELATIONSHIP_TYPE,
sourceType: SECURITY_GROUP_ENTITY_TYPE,
_class: RelationshipClass.DENIES,
targetType: SUBNET_ENTITY_TYPE,
},
{
_type: SECURITY_GROUP_RULE_RELATIONSHIP_TYPE,
sourceType: SUBNET_ENTITY_TYPE,
_class: RelationshipClass.DENIES,
targetType: SECURITY_GROUP_ENTITY_TYPE,
},
],
dependsOn: [
STEP_AD_ACCOUNT,
Expand Down
62 changes: 31 additions & 31 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -871,42 +871,42 @@
dependencies:
ajv "^6.12.0"

"@jupiterone/data-model@^0.8.1":
version "0.8.1"
resolved "https://registry.yarnpkg.com/@jupiterone/data-model/-/data-model-0.8.1.tgz#d940c525e9427536369bf40b3d4b201353bfab55"
integrity sha512-pQnY+LNapZHKcn8pV1qBYuI4mu+9bObVeUnSsaFxH78kE2pX1Qw/Lxl63/I5+EiZY0BLYDMT3u17p8V03Nk7Kg==
"@jupiterone/data-model@^0.9.0":
version "0.9.0"
resolved "https://registry.yarnpkg.com/@jupiterone/data-model/-/data-model-0.9.0.tgz#aa5890343a8172435c1036ef2fad1579e3fe1c2f"
integrity sha512-xi15/3Zme/unTRZQWsBSZYFzZMFc6SM7Nt8VD+0ILppSozChISBRr3FpRcUt9dB5is/QmtWjzjcbavABb6U2/A==
dependencies:
ajv "^6.12.0"

"@jupiterone/integration-sdk-cli@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@jupiterone/integration-sdk-cli/-/integration-sdk-cli-3.0.1.tgz#76bdb9cd9a80e14827a80c97e7f279d1efe2ee93"
integrity sha512-p7djTqlQ/uAtvmgtFP6mUQ9fng/Do78sOXUYF3JOfIRtl3OJobOaW0BgVCZnFG0TujGcpWj8CZUpJxjZJZ+u5g==
"@jupiterone/integration-sdk-cli@^3.1.0":
version "3.1.0"
resolved "https://registry.yarnpkg.com/@jupiterone/integration-sdk-cli/-/integration-sdk-cli-3.1.0.tgz#1daa1283a22e0a854cda47df0ff713241056e813"
integrity sha512-HmX1b+pshOhH7VLiAD6P/ugrlITk+VsjMPtSJ+VkB7Y9wEQNKNDxxRzBLGPtepSfKKPwO+4fYy/hTMvfeg2EJQ==
dependencies:
"@jupiterone/integration-sdk-runtime" "^3.0.1"
"@jupiterone/integration-sdk-runtime" "^3.1.0"
commander "^5.0.0"
globby "^11.0.0"
lodash "^4.17.19"
markdown-table "^2.0.0"
upath "^1.2.0"
vis "^4.21.0-EOL"

"@jupiterone/integration-sdk-core@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@jupiterone/integration-sdk-core/-/integration-sdk-core-3.0.1.tgz#d628a73be6303a5b138c766eaebd7da7e348efa5"
integrity sha512-9sYYIwfXv4tkwBlaa8N4JImHD7AzlQFb7XWJEtvINFwsdmdk7GePrMKzK1tKiR/oPc9MuftINwInojMf9Exg4g==
"@jupiterone/integration-sdk-core@^3.1.0":
version "3.1.0"
resolved "https://registry.yarnpkg.com/@jupiterone/integration-sdk-core/-/integration-sdk-core-3.1.0.tgz#04b2de1323ab7a33574e5f1f626f90fc6d4ce9f6"
integrity sha512-T3F6H5VRzJRLAkyTi1dZNFMMI00uNkn2N3HSWZVjVGjwHu6NV2WYkjcbbW17EJ4neiuFd4iT6nq6HSTbfRwXkA==
dependencies:
"@jupiterone/data-model" "^0.8.1"
"@jupiterone/data-model" "^0.9.0"
lodash "^4.17.15"
uuid "^7.0.3"

"@jupiterone/integration-sdk-dev-tools@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@jupiterone/integration-sdk-dev-tools/-/integration-sdk-dev-tools-3.0.1.tgz#f5be2ed5313844f6bcc92e9161563a33b1c475d9"
integrity sha512-3LzDF1LVtYrpa3eB+qOSQ4KMxOMyHJBZbk6ibFniVdsjmyL8shpuMTj266OUSDgchkovAMeLP5b8BpC3lVQNYQ==
"@jupiterone/integration-sdk-dev-tools@^3.1.0":
version "3.1.0"
resolved "https://registry.yarnpkg.com/@jupiterone/integration-sdk-dev-tools/-/integration-sdk-dev-tools-3.1.0.tgz#6c6ca143221213e0474849bbd946a0e4de463125"
integrity sha512-mAZDsN3wIGwz5JmqrMgn0vQHVaxxioz2OChr3O58yXK93esj4Akoga6ZPhH7iLhXXJLztEn8oLfBwc5hdxVCPw==
dependencies:
"@jupiterone/integration-sdk-cli" "^3.0.1"
"@jupiterone/integration-sdk-testing" "^3.0.1"
"@jupiterone/integration-sdk-cli" "^3.1.0"
"@jupiterone/integration-sdk-testing" "^3.1.0"
"@types/jest" "^25.2.3"
"@types/node" "^14.0.5"
"@typescript-eslint/eslint-plugin" "^3.8.0"
Expand All @@ -922,12 +922,12 @@
ts-node "^8.10.2"
typescript "^3.9.3"

"@jupiterone/integration-sdk-runtime@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@jupiterone/integration-sdk-runtime/-/integration-sdk-runtime-3.0.1.tgz#05cc147954aacd2aff42cd48b4d8533fbb2e2e7f"
integrity sha512-Q55WLqOLH1LEUZUPStW2PZfzngIRs+aqSgm+i9uwqPYVleCKbavpUOxXDr6e609nCuyDNVusLOq2pBf3Mmn1Pw==
"@jupiterone/integration-sdk-runtime@^3.1.0":
version "3.1.0"
resolved "https://registry.yarnpkg.com/@jupiterone/integration-sdk-runtime/-/integration-sdk-runtime-3.1.0.tgz#8fc6ef234cb47af82102fc00afd138350af4073b"
integrity sha512-nfcJDhYjcX7Nwilg74oMH+QRQ9pd60EvWa7xMiw7cYXys+/bDHImQ8ZA4p1OClFiH+wcI+2elX1Mgbxz8SO83A==
dependencies:
"@jupiterone/integration-sdk-core" "^3.0.1"
"@jupiterone/integration-sdk-core" "^3.1.0"
"@lifeomic/alpha" "^1.1.3"
async-sema "^3.1.0"
axios "^0.19.2"
Expand All @@ -945,13 +945,13 @@
rimraf "^3.0.2"
uuid "^7.0.3"

"@jupiterone/integration-sdk-testing@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@jupiterone/integration-sdk-testing/-/integration-sdk-testing-3.0.1.tgz#5954a51aa40208f2edd22e6ac45ccd04586a0f0a"
integrity sha512-tQMQmVKZwFqrep1HjR8FvA1RR+wFMhy69dQeJAM8cdp1k1+jn34pmqztDw07GbEtW5tPWCvx0B6Rgq41juKnug==
"@jupiterone/integration-sdk-testing@^3.1.0":
version "3.1.0"
resolved "https://registry.yarnpkg.com/@jupiterone/integration-sdk-testing/-/integration-sdk-testing-3.1.0.tgz#89444d330989645525211562a32f7eb2c6a9a909"
integrity sha512-zgUTCLSdrEBCViv9hWxoXMIDhjiU960UIGayRBqGBcp4I3pE/cGHVir/Jn2XknKzTcN2r9gsqzgw6f32PBl5AQ==
dependencies:
"@jupiterone/integration-sdk-core" "^3.0.1"
"@jupiterone/integration-sdk-runtime" "^3.0.1"
"@jupiterone/integration-sdk-core" "^3.1.0"
"@jupiterone/integration-sdk-runtime" "^3.1.0"
"@pollyjs/adapter-node-http" "^4.0.4"
"@pollyjs/core" "^4.0.4"
"@pollyjs/persister-fs" "^4.0.4"
Expand Down