Port from ip to ipaddr.js NPM module #1455
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
`ip` is a node.js module, and was never meant for running in a browser.
It magically happened to work until version 1.1.8 despite it doing
things like `require('buffer')` (i.e. not an ESM).
In version 2.0.1 this broke completely as it tries to `require('os')`.
Replace this with https://www.npmjs.com/package/ipaddr.js which has a
comparable API and size (the actually bundled library is 12 KB for both
modules).
Closes cockpit-project#1451
cockpituous
reviewed
Feb 22, 2024
Comment on lines
+76
to
+77
| } catch (_ex) { | ||
| return null; |
There was a problem hiding this comment.
These 2 added lines are not executed by any test. Details
| if (/^[0-9]+$/.test(prefixOrNetmask)) { | ||
| try { | ||
| return ipaddr.IPv4.subnetMaskFromPrefixLength(parseInt(prefixOrNetmask)).toString(); | ||
| } catch (_ex) { |
There was a problem hiding this comment.
This added line is not executed by any test. Details
| if (!ip.isV4Format(network) || !validateNetmask(netmask) || !ip.isV4Format(ipaddr)) | ||
| export function isIpv4InNetwork(network, netmask, address) { | ||
| if (!validateIpv4(network) || !validateIpv4(address)) | ||
| return false; |
There was a problem hiding this comment.
This added line is not executed by any test. Details
| try { | ||
| ipaddr.IPv6.subnetMaskFromPrefixLength(prefix); | ||
| return true; | ||
| } catch (_ex) {} |
There was a problem hiding this comment.
This added line is not executed by any test. Details
| ip = ip.substring(0, prefix); | ||
| export function isIpv6InNetwork(network, prefix, address) { | ||
| if (!validateIpv6(network) || !validateIpv6Prefix(prefix) || !validateIpv6(address)) | ||
| return false; |
There was a problem hiding this comment.
This added line is not executed by any test. Details
jelly
approved these changes
Feb 22, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ipis a node.js module, and was never meant for running in a browser. It magically happened to work until version 1.1.8 despite it doing things likerequire('buffer')(i.e. not an ESM).In version 2.0.1 this broke completely as it tries to
require('os'). Replace this with https://www.npmjs.com/package/ipaddr.js which has a comparable API and size (the actually bundled library is 12 KB for both modules).Closes #1451