Changeset 745 for trunk/server/source4/auth/pyauth.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/auth/pyauth.c (modified) (6 diffs)

trunk/server/source4/auth/pyauth.c

@@ -2 +2 @@
    Unix SMB/CIFS implementation.
    Copyright (C) Jelmer Vernooij <[email protected]> 2007-2008
-   
+   Copyright (C) Andrew Bartlett <[email protected]> 2011
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17 +18 @@
 */
 
+
 #include "includes.h"
+
 #include "param/param.h"
 #include "pyauth.h"
+
 #include "auth/system_session_proto.h"
+
 #include "param/pyparam.h"
 #include "libcli/security/security.h"
-
-
-PyTypeObject PyAuthSession = {
+#include "auth/credentials/pycredentials.h"
+#include <tevent.h>
+#include "librpc/rpc/pyrpc_util.h"
+
+staticforward PyTypeObject PyAuthContext;
+
+/* There's no Py_ssize_t in 2.4, apparently */
+#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 5
+typedef int Py_ssize_t;
+typedef inquiry lenfunc;
+typedef intargfunc ssizeargfunc;
+#endif
+
+#ifndef Py_RETURN_NONE
+#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
+#endif
+
+static PyObject *py_auth_session_get_security_token(PyObject *self, void *closure)
+{
+        struct auth_session_info *session = py_talloc_get_type(self, struct auth_session_info);
+        PyObject *py_security_token;
+        py_security_token = py_return_ndr_struct("samba.dcerpc.security", "token",
+                                                 session->security_token, session->security_token);
+        return py_security_token;
+}
+
+static int py_auth_session_set_security_token(PyObject *self, PyObject *value, void *closure)
+{
+        struct auth_session_info *session = py_talloc_get_type(self, struct auth_session_info);
+        session->security_token = talloc_reference(session, py_talloc_get_ptr(value));
+        return 0;
+}
+
+static PyObject *py_auth_session_get_session_key(PyObject *self, void *closure)
+{
+        struct auth_session_info *session = py_talloc_get_type(self, struct auth_session_info);
+        return PyString_FromStringAndSize((char *)session->session_key.data, session->session_key.length);
+}
+
+static int py_auth_session_set_session_key(PyObject *self, PyObject *value, void *closure)
+{
+        DATA_BLOB val;
+        struct auth_session_info *session = py_talloc_get_type(self, struct auth_session_info);
+        val.data = (uint8_t *)PyString_AsString(value);
+        val.length = PyString_Size(value);
+
+        session->session_key = data_blob_talloc(session, val.data, val.length);
+        return 0;
+}
+
+static PyObject *py_auth_session_get_credentials(PyObject *self, void *closure)
+{
+        struct auth_session_info *session = py_talloc_get_type(self, struct auth_session_info);
+        PyObject *py_credentials;
+        /* This is evil, as the credentials are not IDL structures */
+        py_credentials = py_return_ndr_struct("samba.credentials", "Credentials", session->credentials, session->credentials);
+        return py_credentials;
+}
+
+static int py_auth_session_set_credentials(PyObject *self, PyObject *value, void *closure)
+{
+        struct auth_session_info *session = py_talloc_get_type(self, struct auth_session_info);
+        session->credentials = talloc_reference(session, PyCredentials_AsCliCredentials(value));
+        return 0;
+}
+
+static PyGetSetDef py_auth_session_getset[] = {
+        { discard_const_p(char, "security_token"), (getter)py_auth_session_get_security_token, (setter)py_auth_session_set_security_token, NULL },
+        { discard_const_p(char, "session_key"), (getter)py_auth_session_get_session_key, (setter)py_auth_session_set_session_key, NULL },
+        { discard_const_p(char, "credentials"), (getter)py_auth_session_get_credentials, (setter)py_auth_session_set_credentials, NULL },
+        { NULL }
+};
+
+static PyTypeObject PyAuthSession = {
         .tp_name = "AuthSession",
         .tp_basicsize = sizeof(py_talloc_Object),
-        .tp_dealloc = py_talloc_dealloc,
         .tp_flags = Py_TPFLAGS_DEFAULT,
-        .tp_repr = py_talloc_default_repr,
+        .tp_,
 };
 
@@ -43 +118 @@
         struct loadparm_context *lp_ctx = NULL;
         struct auth_session_info *session;
+
         if (!PyArg_ParseTuple(args, "|O", &py_lp_ctx))
                 return NULL;
 
-        lp_ctx = lp_from_py_object(py_lp_ctx);
-        if (lp_ctx == NULL)
-                return NULL;
-
-        session = system_session(NULL, lp_ctx);
+        mem_ctx = talloc_new(NULL);
+        if (mem_ctx == NULL) {
+                PyErr_NoMemory();
+                return NULL;
+        }
+
+        lp_ctx = lpcfg_from_py_object(mem_ctx, py_lp_ctx);
+        if (lp_ctx == NULL) {
+                talloc_free(mem_ctx);
+                return NULL;
+        }
+
+        session = system_session(lp_ctx);
+
+        talloc_free(mem_ctx);
 
         return PyAuthSession_FromSession(session);
 }
 
-
-static PyObject *py_system_session_anon(PyObject *module, PyObject *args)
-{
-        PyObject *py_lp_ctx = Py_None;
-        struct loadparm_context *lp_ctx;
-        struct auth_session_info *session;
-        if (!PyArg_ParseTuple(args, "|O", &py_lp_ctx))
-                return NULL;
-
-        lp_ctx = lp_from_py_object(py_lp_ctx);
-        if (lp_ctx == NULL)
-                return NULL;
-
-        session = system_session_anon(NULL, lp_ctx);
-
-        return PyAuthSession_FromSession(session);
-}
 
 static PyObject *py_admin_session(PyObject *module, PyObject *args)
@@ -80 +149 @@
         struct auth_session_info *session;
         struct dom_sid *domain_sid = NULL;
+
+
         if (!PyArg_ParseTuple(args, "OO", &py_lp_ctx, &py_sid))
                 return NULL;
 
-        lp_ctx = lp_from_py_object(py_lp_ctx);
-        if (lp_ctx == NULL)
-                return NULL;
-
-        domain_sid = dom_sid_parse_talloc(NULL, PyString_AsString(py_sid));
+        mem_ctx = talloc_new(NULL);
+        if (mem_ctx == NULL) {
+                PyErr_NoMemory();
+                return NULL;
+        }
+
+        lp_ctx = lpcfg_from_py_object(mem_ctx, py_lp_ctx);
+        if (lp_ctx == NULL) {
+                talloc_free(mem_ctx);
+                return NULL;
+        }
+
+        domain_sid = dom_sid_parse_talloc(mem_ctx, PyString_AsString(py_sid));
+        if (domain_sid == NULL) {
+                PyErr_Format(PyExc_RuntimeError, "Unable to parse sid %s", 
+                                         PyString_AsString(py_sid));
+                talloc_free(mem_ctx);
+                return NULL;
+        }
         session = admin_session(NULL, lp_ctx, domain_sid);
+
 
         return PyAuthSession_FromSession(session);
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 static PyMethodDef py_auth_methods[] = {
         { "system_session", (PyCFunction)py_system_session, METH_VARARGS, NULL },
-        { "system_session_anonymous", (PyCFunction)py_system_session_anon, METH_VARARGS, NULL },
         { "admin_session", (PyCFunction)py_admin_session, METH_VARARGS, NULL },
+
         { NULL },
 };
@@ -104 +377 @@
         PyObject *m;
 
+
+
+
+
         if (PyType_Ready(&PyAuthSession) < 0)
                 return;
 
-        m = Py_InitModule3("auth", py_auth_methods, "Authentication and authorization support.");
+        PyAuthContext.tp_base = PyTalloc_GetObjectType();
+        if (PyAuthContext.tp_base == NULL)
+                return;
+
+        if (PyType_Ready(&PyAuthContext) < 0)
+                return;
+
+        m = Py_InitModule3("auth", py_auth_methods,
+                                           "Authentication and authorization support.");
         if (m == NULL)
                 return;
@@ -113 +398 @@
         Py_INCREF(&PyAuthSession);
         PyModule_AddObject(m, "AuthSession", (PyObject *)&PyAuthSession);
-}
+        Py_INCREF(&PyAuthContext);
+        PyModule_AddObject(m, "AuthContext", (PyObject *)&PyAuthContext);
+
+#define ADD_FLAG(val)  PyModule_AddObject(m, #val, PyInt_FromLong(val))
+        ADD_FLAG(AUTH_SESSION_INFO_DEFAULT_GROUPS);
+        ADD_FLAG(AUTH_SESSION_INFO_AUTHENTICATED);
+        ADD_FLAG(AUTH_SESSION_INFO_SIMPLE_PRIVILEGES);
+
+}