Skip to content

Removing index server validation #57

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

Merged
yeisonvargasf merged 1 commit into from
Aug 9, 2022
Merged

Removing index server validation #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Removing index server validation
  • Loading branch information
@yeisonvargasf
yeisonvargasf committed Aug 4, 2022
commit d87364f9db9ab916451b1b036cfeb039e726e614
12 changes: 7 additions & 5 deletions dparse/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from configparser import ConfigParser, NoOptionError


from .regex import URL_REGEX, HASH_REGEX
from .regex import HASH_REGEX

from .dependencies import DependencyFile, Dependency
from packaging.requirements import Requirement as PackagingRequirement, InvalidRequirement
Expand Down Expand Up @@ -176,10 +176,11 @@ def parse_index_server(cls, line):
:param line:
:return:
"""
matches = URL_REGEX.findall(line)
if matches:
url = matches[0]
return url if url.endswith("/") else url + "/"
groups = re.split(pattern="[=\s]+", string=line.strip(), maxsplit=100)

if len(groups) >= 2:
return groups[1] if groups[1].endswith("/") else groups[1] + "/"

return None

@classmethod
Expand Down Expand Up @@ -346,6 +347,7 @@ def parse(self):
except (toml.TomlDecodeError, IndexError) as e:
pass


class PipfileLockParser(Parser):

def parse(self):
Expand Down
37 changes: 1 addition & 36 deletions dparse/regex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,4 @@
# -*- coding: utf-8 -*-
from __future__ import absolute_import, print_function, unicode_literals

import re
# see https://gist.github.com/dperini/729294
URL_REGEX = re.compile(
# protocol identifier
"(?:(?:https?|ftp)://)"
# user:pass authentication
"(?:\S+(?::\S*)?@)?"
"(?:"
# IP address exclusion
# private & local networks
"(?!(?:10|127)(?:\.\d{1,3}){3})"
"(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})"
"(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})"
# IP address dotted notation octets
# excludes loopback network 0.0.0.0
# excludes reserved space >= 224.0.0.0
# excludes network & broadcast addresses
# (first & last IP address of each class)
"(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])"
"(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}"
"(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))"
"|"
# host name
"(?:(?:[a-z\u00a1-\uffff0-9]-?)*[a-z\u00a1-\uffff0-9]+)"
# domain name
"(?:\.(?:[a-z\u00a1-\uffff0-9]-?)*[a-z\u00a1-\uffff0-9]+)*"
# TLD identifier
"(?:\.(?:[a-z\u00a1-\uffff]{2,}))"
")"
# port number
"(?::\d{2,5})?"
# resource path
"(?:/\S*)?",
re.UNICODE)

HASH_REGEX = r"--hash[=| ][\w]+:[\w]+"
HASH_REGEX = r"--hash[=| ]\w+:\w+"