bugfixes

honeypot/__init__.py

@@ -44,15 +44,16 @@ class RootResource:
         moin_user_id = self._get_user_id(moin_session_dir)
         moin_user_file = os.path.join(moin_data_dir, 'user', moin_user_id)
         with open(moin_user_file, 'r') as fh:
-           if 'email=' in line:
-               email = line.split('=', 1)[1]
-           if 'name=' in line:
-               name = line.split('=', 1)[1]
-        return email, name
+           for line in fh:
+               if line.startswith('email='):
+                   email = line.split('=', 1)[1]
+               if line.startswith('name='):
+                   name = line.split('=', 1)[1]
+        return name, email 
 
     def _get_wiki_data_dir(self):
         wiki_name = self._get_wiki_name()
-        wiki_config = os.path.join(cls.moin_config_dir, wiki_name + '.py')
+        wiki_config = os.path.join(self.moin_config_dir, wiki_name + '.py')
         encoding = utils.guess_encoding(wiki_config)
         with open(wiki_config, 'r', encoding=encoding) as fh:
             data_dir = utils.extract_data_dir(fh)
@@ -72,8 +73,8 @@ class RootResource:
     def _get_session_path(self, session_dir):
         for key, value in self.request.cookies.items():
             if key.lower().startswith('moin'):
-                session_path = os.path.join(sesssion_dir, value)
-                if os.path.is_file(session_path):
+                session_path = os.path.join(session_dir, value)
+                if os.path.isfile(session_path):
                     return session_path
         return None
 
@@ -104,9 +105,9 @@ def the_view(context, request):
     else:
         body.append('   (no cookies)')
 
-    email, name = context.get_moin_user()
+    name, email = context.get_moin_user()
     if email or name:
-        body.extend(['', 'MoinMoin user: %s, %s' % (email, name) ])
+        body.extend(['', 'MoinMoin user: %s (%s)' % (name, email) ])
 
     return Response(body='\n'.join(body), content_type='text/plain')
 

venv-honeypot/bin/activate

@@ -0,0 +1,76 @@
+# This file must be used with "source bin/activate" *from bash*
+# you cannot run it directly
+
+deactivate () {
+    # reset old environment variables
+    if [ -n "$_OLD_VIRTUAL_PATH" ] ; then
+        PATH="$_OLD_VIRTUAL_PATH"
+        export PATH
+        unset _OLD_VIRTUAL_PATH
+    fi
+    if [ -n "$_OLD_VIRTUAL_PYTHONHOME" ] ; then
+        PYTHONHOME="$_OLD_VIRTUAL_PYTHONHOME"
+        export PYTHONHOME
+        unset _OLD_VIRTUAL_PYTHONHOME
+    fi
+
+    # This should detect bash and zsh, which have a hash command that must
+    # be called to get it to forget past commands.  Without forgetting
+    # past commands the $PATH changes we made may not be respected
+    if [ -n "$BASH" -o -n "$ZSH_VERSION" ] ; then
+        hash -r
+    fi
+
+    if [ -n "$_OLD_VIRTUAL_PS1" ] ; then
+        PS1="$_OLD_VIRTUAL_PS1"
+        export PS1
+        unset _OLD_VIRTUAL_PS1
+    fi
+
+    unset VIRTUAL_ENV
+    if [ ! "$1" = "nondestructive" ] ; then
+    # Self destruct!
+        unset -f deactivate
+    fi
+}
+
+# unset irrelavent variables
+deactivate nondestructive
+
+VIRTUAL_ENV="/usr/local/webapps/honeypot/venv-honeypot"
+export VIRTUAL_ENV
+
+_OLD_VIRTUAL_PATH="$PATH"
+PATH="$VIRTUAL_ENV/bin:$PATH"
+export PATH
+
+# unset PYTHONHOME if set
+# this will fail if PYTHONHOME is set to the empty string (which is bad anyway)
+# could use `if (set -u; : $PYTHONHOME) ;` in bash
+if [ -n "$PYTHONHOME" ] ; then
+    _OLD_VIRTUAL_PYTHONHOME="$PYTHONHOME"
+    unset PYTHONHOME
+fi
+
+if [ -z "$VIRTUAL_ENV_DISABLE_PROMPT" ] ; then
+    _OLD_VIRTUAL_PS1="$PS1"
+    if [ "x(venv-honeypot) " != x ] ; then
+	PS1="(venv-honeypot) $PS1"
+    else
+    if [ "`basename \"$VIRTUAL_ENV\"`" = "__" ] ; then
+        # special case for Aspen magic directories
+        # see http://www.zetadev.com/software/aspen/
+        PS1="[`basename \`dirname \"$VIRTUAL_ENV\"\``] $PS1"
+    else
+        PS1="(`basename \"$VIRTUAL_ENV\"`)$PS1"
+    fi
+    fi
+    export PS1
+fi
+
+# This should detect bash and zsh, which have a hash command that must
+# be called to get it to forget past commands.  Without forgetting
+# past commands the $PATH changes we made may not be respected
+if [ -n "$BASH" -o -n "$ZSH_VERSION" ] ; then
+    hash -r
+fi

venv-honeypot/bin/activate.csh

@@ -0,0 +1,37 @@
+# This file must be used with "source bin/activate.csh" *from csh*.
+# You cannot run it directly.
+# Created by Davide Di Blasi <davidedb@gmail.com>.
+# Ported to Python 3.3 venv by Andrew Svetlov <andrew.svetlov@gmail.com>
+
+alias deactivate 'test $?_OLD_VIRTUAL_PATH != 0 && setenv PATH "$_OLD_VIRTUAL_PATH" && unset _OLD_VIRTUAL_PATH; rehash; test $?_OLD_VIRTUAL_PROMPT != 0 && set prompt="$_OLD_VIRTUAL_PROMPT" && unset _OLD_VIRTUAL_PROMPT; unsetenv VIRTUAL_ENV; test "\!:*" != "nondestructive" && unalias deactivate'
+
+# Unset irrelavent variables.
+deactivate nondestructive
+
+setenv VIRTUAL_ENV "/usr/local/webapps/honeypot/venv-honeypot"
+
+set _OLD_VIRTUAL_PATH="$PATH"
+setenv PATH "$VIRTUAL_ENV/bin:$PATH"
+
+
+set _OLD_VIRTUAL_PROMPT="$prompt"
+
+if (! "$?VIRTUAL_ENV_DISABLE_PROMPT") then
+    if ("venv-honeypot" != "") then
+        set env_name = "venv-honeypot"
+    else
+        if (`basename "VIRTUAL_ENV"` == "__") then
+            # special case for Aspen magic directories
+            # see http://www.zetadev.com/software/aspen/
+            set env_name = `basename \`dirname "$VIRTUAL_ENV"\``
+        else
+            set env_name = `basename "$VIRTUAL_ENV"`
+        endif
+    endif
+    set prompt = "[$env_name] $prompt"
+    unset env_name
+endif
+
+alias pydoc python -m pydoc
+
+rehash

venv-honeypot/bin/activate.fish

@@ -0,0 +1,74 @@
+# This file must be used with ". bin/activate.fish" *from fish* (http://fishshell.org)
+# you cannot run it directly
+
+function deactivate  -d "Exit virtualenv and return to normal shell environment"
+    # reset old environment variables
+    if test -n "$_OLD_VIRTUAL_PATH"
+        set -gx PATH $_OLD_VIRTUAL_PATH
+        set -e _OLD_VIRTUAL_PATH
+    end
+    if test -n "$_OLD_VIRTUAL_PYTHONHOME"
+        set -gx PYTHONHOME $_OLD_VIRTUAL_PYTHONHOME
+        set -e _OLD_VIRTUAL_PYTHONHOME
+    end
+
+    if test -n "$_OLD_FISH_PROMPT_OVERRIDE"
+        functions -e fish_prompt
+        set -e _OLD_FISH_PROMPT_OVERRIDE
+        . ( begin
+                printf "function fish_prompt\n\t#"
+                functions _old_fish_prompt
+            end | psub )
+        functions -e _old_fish_prompt
+    end
+
+    set -e VIRTUAL_ENV
+    if test "$argv[1]" != "nondestructive"
+        # Self destruct!
+        functions -e deactivate
+    end
+end
+
+# unset irrelavent variables
+deactivate nondestructive
+
+set -gx VIRTUAL_ENV "/usr/local/webapps/honeypot/venv-honeypot"
+
+set -gx _OLD_VIRTUAL_PATH $PATH
+set -gx PATH "$VIRTUAL_ENV/bin" $PATH
+
+# unset PYTHONHOME if set
+if set -q PYTHONHOME
+    set -gx _OLD_VIRTUAL_PYTHONHOME $PYTHONHOME
+    set -e PYTHONHOME
+end
+
+if test -z "$VIRTUAL_ENV_DISABLE_PROMPT"
+    # fish uses a function instead of an env var to generate the prompt.
+
+    # save the current fish_prompt function as the function _old_fish_prompt
+    . ( begin
+            printf "function _old_fish_prompt\n\t#"
+            functions fish_prompt
+        end | psub )
+
+    # with the original prompt function renamed, we can override with our own.
+    function fish_prompt
+        # Prompt override?
+        if test -n "$(venv-honeypot) "
+            printf "%s%s%s" "$(venv-honeypot) " (set_color normal) (_old_fish_prompt)
+            return
+        end
+        # ...Otherwise, prepend env
+        set -l _checkbase (basename "$VIRTUAL_ENV")
+        if test $_checkbase = "__"
+            # special case for Aspen magic directories
+            # see http://www.zetadev.com/software/aspen/
+            printf "%s[%s]%s %s" (set_color -b blue white) (basename (dirname "$VIRTUAL_ENV")) (set_color normal) (_old_fish_prompt)
+        else
+            printf "%s(%s)%s%s" (set_color -b blue white) (basename "$VIRTUAL_ENV") (set_color normal) (_old_fish_prompt)
+        end
+    end
+
+    set -gx _OLD_FISH_PROMPT_OVERRIDE "$VIRTUAL_ENV"
+end

venv-honeypot/bin/chardetect

@@ -0,0 +1,11 @@
+#!/usr/local/webapps/honeypot/venv-honeypot/bin/python3
+
+# -*- coding: utf-8 -*-
+import re
+import sys
+
+from chardet.cli.chardetect import main
+
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
+    sys.exit(main())

venv-honeypot/bin/easy_install

@@ -0,0 +1,11 @@
+#!/usr/local/webapps/honeypot/venv-honeypot/bin/python3
+
+# -*- coding: utf-8 -*-
+import re
+import sys
+
+from setuptools.command.easy_install import main
+
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
+    sys.exit(main())

venv-honeypot/bin/easy_install-3.5

@@ -0,0 +1,11 @@
+#!/usr/local/webapps/honeypot/venv-honeypot/bin/python3
+
+# -*- coding: utf-8 -*-
+import re
+import sys
+
+from setuptools.command.easy_install import main
+
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
+    sys.exit(main())

venv-honeypot/bin/hupper

@@ -0,0 +1,11 @@
+#!/usr/local/webapps/honeypot/venv-honeypot/bin/python3
+
+# -*- coding: utf-8 -*-
+import re
+import sys
+
+from hupper.cli import main
+
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
+    sys.exit(main())

venv-honeypot/bin/pcreate

@@ -0,0 +1,11 @@
+#!/usr/local/webapps/honeypot/venv-honeypot/bin/python3
+
+# -*- coding: utf-8 -*-
+import re
+import sys
+
+from pyramid.scripts.pcreate import main
+
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
+    sys.exit(main())

venv-honeypot/bin/pdistreport

@@ -0,0 +1,11 @@
+#!/usr/local/webapps/honeypot/venv-honeypot/bin/python3
+
+# -*- coding: utf-8 -*-
+import re
+import sys
+
+from pyramid.scripts.pdistreport import main
+
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
+    sys.exit(main())

venv-honeypot/bin/pip

@@ -0,0 +1,11 @@
+#!/usr/local/webapps/honeypot/venv-honeypot/bin/python3
+
+# -*- coding: utf-8 -*-
+import re
+import sys
+
+from pip._internal import main
+
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
+    sys.exit(main())

venv-honeypot/bin/pip3

@@ -0,0 +1,11 @@
+#!/usr/local/webapps/honeypot/venv-honeypot/bin/python3
+
+# -*- coding: utf-8 -*-
+import re
+import sys
+
+from pip._internal import main
+
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
+    sys.exit(main())

venv-honeypot/bin/pip3.5

@@ -0,0 +1,11 @@
+#!/usr/local/webapps/honeypot/venv-honeypot/bin/python3
+
+# -*- coding: utf-8 -*-
+import re
+import sys
+
+from pip._internal import main
+
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
+    sys.exit(main())

venv-honeypot/bin/prequest

@@ -0,0 +1,11 @@
+#!/usr/local/webapps/honeypot/venv-honeypot/bin/python3
+
+# -*- coding: utf-8 -*-
+import re
+import sys
+
+from pyramid.scripts.prequest import main
+
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
+    sys.exit(main())

venv-honeypot/bin/proutes

@@ -0,0 +1,11 @@
+#!/usr/local/webapps/honeypot/venv-honeypot/bin/python3
+
+# -*- coding: utf-8 -*-
+import re
+import sys
+
+from pyramid.scripts.proutes import main
+
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
+    sys.exit(main())

venv-honeypot/bin/pserve

@@ -0,0 +1,11 @@
+#!/usr/local/webapps/honeypot/venv-honeypot/bin/python3
+
+# -*- coding: utf-8 -*-
+import re
+import sys
+
+from pyramid.scripts.pserve import main
+
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
+    sys.exit(main())

venv-honeypot/bin/pshell

@@ -0,0 +1,11 @@
+#!/usr/local/webapps/honeypot/venv-honeypot/bin/python3
+
+# -*- coding: utf-8 -*-
+import re
+import sys
+
+from pyramid.scripts.pshell import main
+
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
+    sys.exit(main())

venv-honeypot/bin/ptweens

@@ -0,0 +1,11 @@
+#!/usr/local/webapps/honeypot/venv-honeypot/bin/python3
+
+# -*- coding: utf-8 -*-
+import re
+import sys
+
+from pyramid.scripts.ptweens import main
+
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
+    sys.exit(main())

venv-honeypot/bin/pviews

@@ -0,0 +1,11 @@
+#!/usr/local/webapps/honeypot/venv-honeypot/bin/python3
+
+# -*- coding: utf-8 -*-
+import re
+import sys
+
+from pyramid.scripts.pviews import main
+
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
+    sys.exit(main())

venv-honeypot/bin/python

@@ -0,0 +1 @@
+python3

venv-honeypot/bin/python3

@@ -0,0 +1 @@
+/usr/bin/python3

venv-honeypot/bin/waitress-serve

@@ -0,0 +1,11 @@
+#!/usr/local/webapps/honeypot/venv-honeypot/bin/python3
+
+# -*- coding: utf-8 -*-
+import re
+import sys
+
+from waitress.runner import run
+
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
+    sys.exit(run())

venv-honeypot/lib64

@@ -0,0 +1 @@
+lib

venv-honeypot/pip-selfcheck.json

@@ -0,0 +1 @@
+{"last_check":"2018-05-29T14:04:39Z","pypi_version":"10.0.1"}

venv-honeypot/pyvenv.cfg

@@ -0,0 +1,3 @@
+home = /usr/bin
+include-system-site-packages = false
+version = 3.5.2