Fixed neokit and auth problems

Author: technige

example.py

@@ -18,8 +18,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from neo4j.v1.session import GraphDatabase
-from neo4j.v1.auth import basic_auth
+from neo4j.v1.session import GraphDatabase, basic_auth
+
 
 driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "neo4j"))
 session = driver.session()

examples/test_examples.py

@@ -30,7 +30,7 @@ class FreshDatabaseTestCase(ServerTestCase):
 
     def setUp(self):
         ServerTestCase.setUp(self)
-        session = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "neo4j")).session()
+        session = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "password")).session()
         session.run("MATCH (n) DETACH DELETE n")
         session.close()
 
@@ -39,7 +39,7 @@ class MinimalWorkingExampleTestCase(FreshDatabaseTestCase):
 
     def test_minimal_working_example(self):
         # tag::minimal-example[]
-        driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "neo4j"))
+        driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "password"))
         session = driver.session()
 
         session.run("CREATE (neo:Person {name:'Neo', age:23})")
@@ -56,7 +56,7 @@ class ExamplesTestCase(FreshDatabaseTestCase):
 
     def test_construct_driver(self):
         # tag::construct-driver[]
-        driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "neo4j"))
+        driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "password"))
         # end::construct-driver[]
         return driver
 
@@ -85,23 +85,23 @@ def test_tls_signed(self):
         # end::tls-signed[]
 
     def test_statement(self):
-        driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "neo4j"))
+        driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "password"))
         session = driver.session()
         # tag::statement[]
         session.run("CREATE (person:Person {name: {name}})", {"name": "Neo"}).close()
         # end::statement[]
         session.close()
 
     def test_statement_without_parameters(self):
-        driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "neo4j"))
+        driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "password"))
         session = driver.session()
         # tag::statement-without-parameters[]
         session.run("CREATE (person:Person {name: 'Neo'})").close()
         # end::statement-without-parameters[]
         session.close()
 
     def test_result_cursor(self):
-        driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "neo4j"))
+        driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "password"))
         session = driver.session()
         # tag::result-cursor[]
         search_term = "hammer"
@@ -114,7 +114,7 @@ def test_result_cursor(self):
         session.close()
 
     def test_cursor_nesting(self):
-        driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "neo4j"))
+        driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "password"))
         session = driver.session()
         # tag::retain-result-query[]
         result = session.run("MATCH (person:Person) WHERE person.dept = {dept} "
@@ -127,7 +127,7 @@ def test_cursor_nesting(self):
         session.close()
 
     def test_result_retention(self):
-        driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "neo4j"))
+        driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "password"))
         session = driver.session()
         # tag::retain-result-process[]
         result = session.run("MATCH (person:Person) WHERE person.dept = {dept} "
@@ -142,7 +142,7 @@ def test_result_retention(self):
         session.close()
 
     def test_transaction_commit(self):
-        driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "neo4j"))
+        driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "password"))
         session = driver.session()
         # tag::transaction-commit[]
         tx = session.begin_transaction()
@@ -156,7 +156,7 @@ def test_transaction_commit(self):
         session.close()
 
     def test_transaction_rollback(self):
-        driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "neo4j"))
+        driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "password"))
         session = driver.session()
         # tag::transaction-rollback[]
         tx = session.begin_transaction()
@@ -170,7 +170,7 @@ def test_transaction_rollback(self):
         session.close()
 
     def test_result_summary_query_profile(self):
-        driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "neo4j"))
+        driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "password"))
         session = driver.session()
         # tag::result-summary-query-profile[]
         result = session.run("PROFILE MATCH (p:Person {name: {name}}) "
@@ -183,7 +183,7 @@ def test_result_summary_query_profile(self):
         session.close()
 
     def test_result_summary_notifications(self):
-        driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "neo4j"))
+        driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "password"))
         session = driver.session()
         # tag::result-summary-notifications[]
         result = session.run("EXPLAIN MATCH (a), (b) RETURN a,b")

neo4j/v1/__init__.py

@@ -21,4 +21,3 @@
 from .constants import *
 from .session import *
 from .typesystem import *
-from .auth import *

neo4j/v1/connection.py

@@ -28,7 +28,7 @@
 from os import makedirs, open as os_open, write as os_write, close as os_close, O_CREAT, O_APPEND, O_WRONLY
 from os.path import dirname, isfile
 from select import select
-from socket import create_connection, SHUT_RDWR
+from socket import create_connection, SHUT_RDWR, error as SocketError
 from ssl import HAS_SNI, SSLError
 from struct import pack as struct_pack, unpack as struct_unpack, unpack_from as struct_unpack_from
 
@@ -66,7 +66,7 @@
 }
 
 # Set up logger
-log = logging.getLogger("neo4j")
+log = logging.getLogger("neo4j.bolt")
 log_debug = log.debug
 log_info = log.info
 log_warning = log.warning
@@ -212,30 +212,29 @@ def __init__(self, sock, **config):
             user_agent = user_agent.decode("UTF-8")
         self.user_agent = user_agent
 
+        # Determine auth details
+        try:
+            self.auth_dict = vars(config["auth"])
+        except KeyError:
+            self.auth_dict = {}
+
         # Pick up the server certificate, if any
         self.der_encoded_server_certificate = config.get("der_encoded_server_certificate")
 
         def on_failure(metadata):
-            raise ProtocolError("Initialisation failed")
+            raise ProtocolError(metadata.get("message", "Inititalisation failed"))
 
-        self.auth_token = config.get("auth")
         response = Response(self)
         response.on_failure = on_failure
 
-        self.append(INIT, (self.user_agent,self._auth_token_dict(),), response=response)
+        self.append(INIT, (self.user_agent, self.auth_dict), response=response)
         self.send()
         while not response.complete:
             self.fetch()
 
     def __del__(self):
         self.close()
 
-    def _auth_token_dict(self):
-        if self.auth_token:
-            return self.auth_token._asdict()
-        else:
-            return {}
-
     def append(self, signature, fields=(), response=None):
         """ Add a message to the outgoing queue.
 
@@ -377,7 +376,13 @@ def connect(host, port=None, ssl_context=None, **config):
     # Establish a connection to the host and port specified
     port = port or DEFAULT_PORT
     if __debug__: log_info("~~ [CONNECT] %s %d", host, port)
-    s = create_connection((host, port))
+    try:
+        s = create_connection((host, port))
+    except SocketError as error:
+        if error.errno == 111:
+            raise ProtocolError("Unable to connect to %s on port %d - is the server running?" % (host, port))
+        else:
+            raise
 
     # Secure the connection if an SSL context has been provided
     if ssl_context:

neo4j/v1/session.py

@@ -46,6 +46,26 @@ class which can be used to obtain `Driver` instances that are used for
 STATEMENT_TYPE_SCHEMA_WRITE = "sw"
 
 
+def basic_auth(user, password):
+    """ Generate a basic auth token for a given user and password.
+
+    :param user: user name
+    :param password: current password
+    :return: auth token for use with :meth:`GraphDatabase.driver`
+    """
+    return AuthToken("basic", user, password)
+
+
+class AuthToken(object):
+    """ Container for auth information
+    """
+
+    def __init__(self, scheme, principal, credentials):
+        self.scheme = scheme
+        self.principal = principal
+        self.credentials = credentials
+
+
 class GraphDatabase(object):
     """ The :class:`.GraphDatabase` class provides access to all graph
     database functionality. This is primarily used to construct a driver

neokit

@@ -21,6 +21,11 @@ DRIVER_HOME=$(dirname $0)
 
 NEORUN_OPTIONS=""
 RUNNING=0
+KNOWN_HOSTS="${HOME}/.neo4j/known_hosts"
+KNOWN_HOSTS_BACKUP="${KNOWN_HOSTS}.backup"
+
+FG_BRIGHT_RED='\033[1;31m'
+FG_DEFAULT='\033[0m'
 
 # Parse options
 while getopts ":dr" OPTION
@@ -57,33 +62,45 @@ then
     VERSIONS="nightly"
 fi
 
+function check_exit_status {
+    EXIT_STATUS=$1
+    if [ ${EXIT_STATUS} -ne 0 ]
+    then
+        echo ""
+        echo -e "${FG_BRIGHT_RED}Tests failed with status ${EXIT_STATUS}${FG_DEFAULT}"
+        exit ${EXIT_STATUS}
+    fi
+}
+
 # Run tests
-echo "Running tests with $(python --version)"
+echo "Using $(python --version)"
 pip install --upgrade -r ${DRIVER_HOME}/test_requirements.txt
 echo ""
-python -c 'from test.util import *; change_password("neo4j", "neo4j", "tmp")'
-python -c 'from test.util import *; change_password("neo4j", "tmp", "neo4j")'
+
 TEST_RUNNER="coverage run -m ${UNITTEST} discover -vfs ${TEST}"
 EXAMPLES_RUNNER="coverage run -m ${UNITTEST} discover -vfs examples"
 BEHAVE_RUNNER="behave --tags=-db --tags=-in_dev test/tck"
+
 if [ ${RUNNING} -eq 1 ]
 then
     ${TEST_RUNNER}
-    EXIT_STATUS=$?
+    check_exit_status $?
 else
+    #echo "Updating password"
+    #mv ${KNOWN_HOSTS} ${KNOWN_HOSTS_BACKUP}
+    #neokit/neorun ${NEORUN_OPTIONS} "python -m test.auth password" ${VERSIONS}
+    #EXIT_STATUS=$?
+    #mv ${KNOWN_HOSTS_BACKUP} ${KNOWN_HOSTS}
+    #check_exit_status ${EXIT_STATUS}
+    export NEO4J_PASSWORD="password"
+
+    echo "Running unit tests"
     neokit/neorun ${NEORUN_OPTIONS} "${TEST_RUNNER}" ${VERSIONS}
-    EXIT_STATUS=$?
-    if [ ${EXIT_STATUS} -ne 0 ]
-    then
-        exit ${EXIT_STATUS}
-    fi
+    check_exit_status $?
 
+    echo "Testing example code"
     neokit/neorun ${NEORUN_OPTIONS} "${EXAMPLES_RUNNER}" ${VERSIONS}
-    EXIT_STATUS=$?
-    if [ ${EXIT_STATUS} -ne 0 ]
-    then
-        exit ${EXIT_STATUS}
-    fi
+    check_exit_status $?
 
     coverage report --show-missing
     python -c 'from test.tck.configure_feature_files import *; set_up()'
@@ -93,9 +110,3 @@ else
     echo "Feature files removed"
 
 fi
-
-# Exit correctly
-if [ ${EXIT_STATUS} -ne 0 ]
-then
-    exit ${EXIT_STATUS}
-fi

runtests.sh

@@ -18,10 +18,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from collections import namedtuple
 
-AuthToken = namedtuple("AuthToken", ("scheme", "principal", "credentials"))
+from sys import argv
 
+from neo4j.v1 import GraphDatabase, basic_auth
+from neo4j.util import Watcher
 
-def basic_auth(user, password):
-    return AuthToken("basic", user, password)
+
+def update_password(user, password, new_password):
+    """ Test utility for setting the initial password.
+
+    :param user: user name
+    :param password: current password
+    :param new_password: new password
+    """
+
+    token = basic_auth(user, password)
+    setattr(token, "new-credentials", new_password)  # TODO: hopefully switch hyphen to underscore on server
+    GraphDatabase.driver("bolt://localhost", auth=token).session().close()
+
+
+if __name__ == "__main__":
+    Watcher("neo4j.bolt").watch()
+    update_password("neo4j", "neo4j", argv[1])

neo4j/v1/auth.py renamed to test/auth.py

@@ -22,7 +22,7 @@
 from neo4j.v1.compat import string
 
 
-driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "neo4j"), security=SECURITY_NONE)
+driver = GraphDatabase.driver("bolt://localhost", auth=basic_auth("neo4j", "password"), security=SECURITY_NONE)
 
 def send_string(text):
     session = driver.session()