Skip to content
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
5 changes: 5 additions & 0 deletions .changeset/rude-windows-return.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@scaleway/regex": minor
---

Add new regex for port security group handling
55 changes: 55 additions & 0 deletions packages/regex/src/__tests__/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import {
phone,
reverseDNS,
s3BucketName,
sgPortRange,
sixDigitsCode,
spaces,
uppercaseBasicDomain,
Expand Down Expand Up @@ -1062,4 +1063,58 @@ describe('@regex', () => {
expect(absolutePath.test(string)).toBe(expected)
})
})

describe('sgPortRange', () => {
test.each([
// Valid single ports
['1', true],
['80', true],
['443', true],
['8080', true],
['65535', true],

// Valid port ranges
['1-80', true],
['80-443', true],
['1000-2000', true],
['1-65535', true],
['8080-8090', true],

// Edge cases for valid ports
['1-1', true],
['65535-65535', true],

// Invalid: Port 0 not allowed => but regex was like that so product might accept it, keep it like that for now
['0', true],
['0-80', true],
['80-0', true],

// Invalid: Ports above 65535
['65536', false],
['70000', false],
['1-70000', false],
['65536-65537', false],

// Invalid formats
['', false],
['a', false],
['1a', false],
['a1', false],
['1,2', false],
['1:2', false],
['1 - 2', false],
['1~2', false],
['1-2-3', false],
['1-', false],
['-1', false],
['-', false],
['1--2', false],

// Edge cases
['65534-65535', true],
['65535-65535', true],
])('should match regex %s to be %s', (string, expected) => {
expect(sgPortRange.test(string)).toBe(expected)
})
})
})
4 changes: 4 additions & 0 deletions packages/regex/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,7 @@ export const dashedIpv4 =

export const pathSegment = /^[_a-zA-Z0-9]([-_.a-zA-Z0-9]*[_a-zA-Z0-9])?$/
export const absolutePath = /^\/(([\w. -]*)[^\s?]\/?)+$/

// A port range between 1 to 65535 separated by an hypen or a single number
export const sgPortRange =
/^(6553[0-5]|655[0-2][0-9]|65[0-4][0-9]{2}|6[0-4][0-9]{3}|[1-5]?[0-9]{1,4})(-(6553[0-5]|655[0-2][0-9]|65[0-4][0-9]{2}|6[0-4][0-9]{3}|[1-5]?[0-9]{1,4}))?$/
Loading