Skip to content

Tighten static ip regex #1751

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Tighten static ip regex #1751

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7aac2b
Tighten static ip regex
mcm001 Jan 27, 2025
a008f64
Merge branch 'main' into static-ip-regex
mcm001 Jan 27, 2025
8f27e95
Merge branch 'main' into static-ip-regex
spacey-sooty Feb 17, 2025
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
9 changes: 6 additions & 3 deletions photon-client/src/components/settings/NetworkingCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ const isValidNetworkTablesIP = (v: string | undefined): boolean => {
return isValidHostname(v);
};
const isValidIPv4 = (v: string | undefined) => {
// https://stackoverflow.com/a/17871737
const ipv4Regex = /^((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])$/;
// https://stackoverflow.com/a/17871737 - modified to only allow between 10-19
// regexr.com/8beu1
const ipv4Regex = /^((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}0?(1[0-9]|10)$/;

if (v === undefined) return false;
return ipv4Regex.test(v);
Expand Down Expand Up @@ -183,7 +184,9 @@ watchEffect(() => {
v-model="tempSettingsStruct.staticIp"
:input-cols="12 - 4"
label="Static IP"
:rules="[(v) => isValidIPv4(v) || 'Invalid IPv4 address']"
:rules="[
(v) => isValidIPv4(v) || 'Invalid IPv4 address - make sure that the last digit is between 10 and 19?'
]"
:disabled="
!tempSettingsStruct.shouldManage ||
!useSettingsStore().network.canManage ||
Expand Down
Loading