fnexe.com/pypiserver
1
0
Fork 0
forked from github.com/pypiserver
Code Pull Requests Activity

Added authentication by pam and fixed some pep8 complaints

Browse Source
This commit is contained in:
Craig Davis 2016-06-16 08:14:56 -05:00 committed by Craig Davis
parent f15a51f894
commit 9a5ff53c6d
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pypiserver/core.py
View File

@ -91,6 +91,10 @@ def auth_by_htpasswd_file(htPsswdFile, username, password):
return htPsswdFile.check_password(username, password)
def auth_by_pam(username, password):
import pam
return pam.authenticate(username, password)
mimetypes.add_type("application/octet-stream", ".egg")
mimetypes.add_type("application/octet-stream", ".whl")
@ -140,7 +144,7 @@ wheel_file_re = re.compile(
re.VERBOSE)
_pkgname_re = re.compile(r'-\d+[a-z_.!+]', re.I)
_pkgname_parts_re = re.compile(
r"[\.\-](?=cp\d|py\d|macosx|linux|sunos|solaris|irix|aix|cygwin|win)",
r"[\.\-](?=cp\d|py\d|macosx|linux|sunos|solaris|irix|aix|cygwin|win)",
re.I)
@ -214,7 +218,7 @@ class PkgFile(object):
def __repr__(self):
return "%s(%s)" % (
self.__class__.__name__,
", ".join(["%s=%r" % (k, getattr(self, k))
", ".join(["%s=%r" % (k, getattr(self, k))
for k in sorted(self.__slots__)]))
def fname_and_hash(self, hash_algo):
@ -246,6 +250,15 @@ def _listdir(root):
fn=fn, root=root,
relfn=fn[len(root) + 1:])
try:
from .cache import listdir_cache
def listdir(root):
return listdir_cache.get(root, _listdir)
except ImportError:
listdir = _listdir
def find_packages(pkgs, prefix=""):
prefix = normalize_pkgname(prefix)
for x in pkgs:
@ -271,7 +284,7 @@ def exists(root, filename):
def store(root, filename, save_method):
assert "/" not in filename
dest_fn = os.path.join(root, filename)
save_method(dest_fn, overwrite=True) # Overwite check earlier.
save_method(dest_fn, overwrite=True) # Overwite check earlier.
def _digest_file(fpath, hash_algo):