Changeset 8354

Timestamp:

06/02/10 14:50:53 (3 years ago)

Author:

nlmills

Message:

moved security types into main pvfs2-types.h header

Location:

branches/cu-security-branch

Files:

• include/pvfs2-mgmt.h (modified) (1 diff)
• include/pvfs2-sysint.h (modified) (1 diff)
• include/pvfs2-types.h (modified) (2 diffs)
• include/pvfs2-util.h (modified) (1 diff)
• src/apps/admin/pvfs2-cp.c (modified) (1 diff)
• src/apps/admin/pvfs2-gencred.c (modified) (1 diff)
• src/apps/kernel/linux/pvfs2-client-core.c (modified) (1 diff)
• src/client/sysint/capcache.c (modified) (1 diff)
• src/client/sysint/capcache.h (modified) (1 diff)
• src/client/sysint/getparent.c (modified) (1 diff)
• src/client/sysint/mgmt-create-dirent.sm (modified) (1 diff)
• src/client/sysint/mgmt-get-config.c (modified) (1 diff)
• src/client/sysint/mgmt-get-dfile-array.sm (modified) (1 diff)
• src/client/sysint/mgmt-misc.c (modified) (1 diff)
• src/client/sysint/mgmt-remove-dirent.sm (modified) (1 diff)
• src/client/sysint/mgmt-remove-object.sm (modified) (1 diff)
• src/client/sysint/mgmt-repair-file.sm (modified) (1 diff)
• src/client/sysint/mgmt-setparam-list.sm (modified) (1 diff)
• src/client/sysint/pint-sysint-utils.c (modified) (1 diff)
• src/client/sysint/pint-sysint-utils.h (modified) (1 diff)
• src/client/sysint/remove.sm (modified) (1 diff)
• src/client/sysint/sys-create.sm (modified) (1 diff)
• src/client/sysint/sys-del-eattr.sm (modified) (1 diff)
• src/client/sysint/sys-io.sm (modified) (1 diff)
• src/client/sysint/sys-mkdir.sm (modified) (1 diff)
• src/client/sysint/sys-readdir.sm (modified) (1 diff)
• src/client/sysint/sys-readdirplus.sm (modified) (1 diff)
• src/client/sysint/sys-remove.sm (modified) (1 diff)
• src/client/sysint/sys-rename.sm (modified) (1 diff)
• src/client/sysint/sys-set-eattr.sm (modified) (1 diff)
• src/client/sysint/sys-setattr.sm (modified) (1 diff)
• src/client/sysint/sys-statfs.sm (modified) (1 diff)
• src/client/sysint/sys-symlink.sm (modified) (1 diff)
• src/client/sysint/sys-truncate.sm (modified) (1 diff)
• src/common/misc/pvfs2-util.c (modified) (1 diff)
• src/common/security/pint-security.h (modified) (1 diff)
• src/common/security/security-types.h (deleted)
• src/common/security/security-util.c (modified) (1 diff)
• src/common/security/security-util.h (modified) (1 diff)
• src/server/pvfs2-server.h (modified) (1 diff)

branches/cu-security-branch/include/pvfs2-mgmt.h

@@ -26 +26 @@
 #include "pvfs2-sysint.h"
 #include "pvfs2-types.h"
-#include "security-types.h"
 
 /* non-blocking mgmt operation handle */

branches/cu-security-branch/include/pvfs2-sysint.h

@@ -23 +23 @@
 #include "pvfs2-types.h"
 #include "pvfs2-request.h"
-#include "security-types.h"
 
 /** Options supported by get_info() and set_info(). */

branches/cu-security-branch/include/pvfs2-types.h

@@ -419 +419 @@
     int32_t    __pad1;
 } PVFS_object_ref;
-
-/** Credentials (stubbed for future authentication methods). */
-typedef struct
-{
-    PVFS_uid uid;
-    PVFS_gid gid;
-} PVFS_credentials;
-endecode_fields_2(
-    PVFS_credentials,
-    PVFS_uid, uid,
-    PVFS_gid, gid);
 
 /* max length of BMI style URI's for identifying servers */
@@ -871 +860 @@
 #define PVFS_MGMT_RESERVED 1
 
+/*
+ * New types for robust security implementation.
+ */
+typedef unsigned char *PVFS_signature;
+
+typedef struct PVFS_capability PVFS_capability;
+struct PVFS_capability
+{
+    char *issuer;              /* alias of the issuing server */
+    PVFS_fs_id fsid;           /* fsid for which this capability is valid */
+    uint32_t sig_size;         /* length of the signature in bytes */
+    PVFS_signature signature;  /* digital signature */
+    PVFS_time timeout;         /* seconds after epoch to time out */
+    uint32_t op_mask;          /* allowed operations mask */
+    uint32_t num_handles;      /* number of elements in the handle array */
+    PVFS_handle *handle_array; /* handles in this capability */
+};
+endecode_fields_3a2a_struct (
+    PVFS_capability,
+    string, issuer,
+    PVFS_fs_id, fsid,
+    skip4,,
+    uint32_t, sig_size,
+    PVFS_signature, signature,
+    PVFS_time, timeout,
+    uint32_t, op_mask,
+    uint32_t, num_handles,
+    PVFS_handle, handle_array)
+
+typedef struct PVFS_credential PVFS_credential;
+struct PVFS_credential 
+{
+    PVFS_uid userid;           /* user id */
+    uint32_t num_groups;       /* length of group_array */
+    PVFS_gid *group_array;     /* groups for which the user is a member */
+    char *issuer;              /* alias of the issuing server */
+    PVFS_time timeout;         /* seconds after epoch to time out */
+    uint32_t sig_size;         /* length of the signature in bytes */
+    PVFS_signature signature;  /* digital signature */
+};
+endecode_fields_3a2a_struct (
+    PVFS_credential,
+    skip4,,
+    skip4,,
+    PVFS_uid, userid,
+    uint32_t, num_groups,
+    PVFS_gid, group_array,
+    string, issuer,
+    PVFS_time, timeout,
+    uint32_t, sig_size,
+    PVFS_signature, signature)
+
 #endif /* __PVFS2_TYPES_H */
 

branches/cu-security-branch/include/pvfs2-util.h

@@ -15 +15 @@
 #include "pvfs2.h"
 #include "pvfs2-types.h"
-#include "security-types.h"
 
 /* Define min macro with pvfs2 prefix */

branches/cu-security-branch/src/apps/admin/pvfs2-cp.c

@@ -27 +27 @@
 #include "pvfs2-internal.h"
 #include "pvfs2-hint.h"
-#include "security-types.h"
 
 /* optional parameters, filled in by parse_args() */

branches/cu-security-branch/src/apps/admin/pvfs2-gencred.c

@@ -24 +24 @@
 #define __PINT_REQPROTO_ENCODE_FUNCS_C
 #include "pvfs2-types.h"
-#include "security-types.h"
 #include "src/proto/pvfs2-req-proto.h"
 

branches/cu-security-branch/src/apps/kernel/linux/pvfs2-client-core.c

@@ -51 +51 @@
 #include "pvfs2-encode-stubs.h"
 #include "pint-event.h"
-#include "security-types.h"
 
 #ifdef USE_MMAP_RA_CACHE

branches/cu-security-branch/src/client/sysint/capcache.c

@@ -13 +13 @@
 #include "tcache.h"
 #include "capcache.h"
-#include "security-types.h"
 #include "security-util.h"
 

branches/cu-security-branch/src/client/sysint/capcache.h

@@ -11 +11 @@
 #include "pvfs2-types.h"
 #include "tcache.h"
-#include "security-types.h"
 
 

branches/cu-security-branch/src/client/sysint/getparent.c

@@ -11 +11 @@
 #include "gossip.h"
 #include "pvfs2-util.h"
-#include "security-types.h"
 
 int PVFS_sys_getparent(

branches/cu-security-branch/src/client/sysint/mgmt-create-dirent.sm

@@ -24 +24 @@
 #include "PINT-reqproto-encode.h"
 #include "pvfs2-internal.h"
-#include "security-types.h"
 
 extern job_context_id pint_client_sm_context;

branches/cu-security-branch/src/client/sysint/mgmt-get-config.c

@@ -17 +17 @@
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
-#include "security-types.h"
 
 extern job_context_id pint_client_sm_context;

branches/cu-security-branch/src/client/sysint/mgmt-get-dfile-array.sm

@@ -25 +25 @@
 #include "PINT-reqproto-encode.h"
 #include "pint-util.h"
-#include "security-types.h"
 
 extern job_context_id pint_client_sm_context;

branches/cu-security-branch/src/client/sysint/mgmt-misc.c

@@ -23 +23 @@
 #include "server-config.h"
 #include "client-state-machine.h"
-#include "security-types.h"
 
 /** Maps a given opaque server address back to a string address.  Also

branches/cu-security-branch/src/client/sysint/mgmt-remove-dirent.sm

@@ -25 +25 @@
 #include "PINT-reqproto-encode.h"
 #include "pvfs2-internal.h"
-#include "security-types.h"
 
 extern job_context_id pint_client_sm_context;

branches/cu-security-branch/src/client/sysint/mgmt-remove-object.sm

@@ -25 +25 @@
 #include "PINT-reqproto-encode.h"
 #include "pvfs2-internal.h"
-#include "security-types.h"
 
 extern job_context_id pint_client_sm_context;

branches/cu-security-branch/src/client/sysint/mgmt-repair-file.sm

@@ -28 +28 @@
 #include "pvfs2-internal.h"
 #include "sys-create.h"
-#include "security-types.h"
 
 extern job_context_id pint_client_sm_context;

branches/cu-security-branch/src/client/sysint/mgmt-setparam-list.sm

@@ -25 +25 @@
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
-#include "security-types.h"
 
 extern job_context_id pint_client_sm_context;

branches/cu-security-branch/src/client/sysint/pint-sysint-utils.c

@@ -24 +24 @@
 #include "client-state-machine.h"
 #include "gen-locks.h"
-#include "security-types.h"
 
 

branches/cu-security-branch/src/client/sysint/pint-sysint-utils.h

@@ -25 +25 @@
 #include "pint-cached-config.h"
 #include "pvfs2-sysint.h"
-#include "security-types.h"
 
 #include "trove.h"

branches/cu-security-branch/src/client/sysint/remove.sm

@@ -17 +17 @@
 #include "pint-util.h"
 #include "pvfs2-internal.h"
-#include "security-types.h"
 
 extern job_context_id pint_client_sm_context;

branches/cu-security-branch/src/client/sysint/sys-create.sm

@@ -28 +28 @@
 #include "pvfs2-internal.h"
 #include "pvfs2-dist-varstrip.h"
-#include "security-types.h"
 
 extern job_context_id pint_client_sm_context;

branches/cu-security-branch/src/client/sysint/sys-del-eattr.sm

@@ -17 +17 @@
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
-#include "security-types.h"
 
 extern job_context_id pint_client_sm_context;

branches/cu-security-branch/src/client/sysint/sys-io.sm

@@ -24 +24 @@
 #include "pint-util.h"
 #include "pvfs2-internal.h"
-#include "security-types.h"
 
 #define IO_MAX_SEGMENT_NUM 50 

branches/cu-security-branch/src/client/sysint/sys-mkdir.sm

@@ -27 +27 @@
 #include "ncache.h"
 #include "pvfs2-internal.h"
-#include "security-types.h"
 
 extern job_context_id pint_client_sm_context;

branches/cu-security-branch/src/client/sysint/sys-readdir.sm

@@ -23 +23 @@
 #include "pint-util.h"
 #include "pvfs2-internal.h"
-#include "security-types.h"
 
 extern job_context_id pint_client_sm_context;

branches/cu-security-branch/src/client/sysint/sys-readdirplus.sm

@@ -29 +29 @@
 #include "pint-util.h"
 #include "pvfs2-internal.h"
-#include "security-types.h"
 
 enum {

branches/cu-security-branch/src/client/sysint/sys-remove.sm

@@ -24 +24 @@
 #include "ncache.h"
 #include "pvfs2-internal.h"
-#include "security-types.h"
 
 /*

branches/cu-security-branch/src/client/sysint/sys-rename.sm

@@ -28 +28 @@
 #include "pvfs2-internal.h"
 #include "ncache.h"
-#include "security-types.h"
 
 extern job_context_id pint_client_sm_context;

branches/cu-security-branch/src/client/sysint/sys-set-eattr.sm

@@ -17 +17 @@
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
-#include "security-types.h"
 
 extern job_context_id pint_client_sm_context;

branches/cu-security-branch/src/client/sysint/sys-setattr.sm

@@ -24 +24 @@
 #include "pint-util.h"
 #include "pvfs2-internal.h"
-#include "security-types.h"
 
 extern job_context_id pint_client_sm_context;

branches/cu-security-branch/src/client/sysint/sys-statfs.sm

@@ -25 +25 @@
 #include "pint-cached-config.h"
 #include "PINT-reqproto-encode.h"
-#include "security-types.h"
 
 extern job_context_id pint_client_sm_context;

branches/cu-security-branch/src/client/sysint/sys-symlink.sm

@@ -24 +24 @@
 #include "ncache.h"
 #include "pvfs2-internal.h"
-#include "security-types.h"
 
 extern job_context_id pint_client_sm_context;

branches/cu-security-branch/src/client/sysint/sys-truncate.sm

@@ -25 +25 @@
 #include "acache.h"
 #include "pvfs2-internal.h"
-#include "security-types.h"
 
 #define TRUNCATE_UNSTUFF 100

branches/cu-security-branch/src/common/misc/pvfs2-util.c

@@ -37 +37 @@
 #include "pvfs2-internal.h"
 #include "pint-util.h"
-#include "security-types.h"
 #include "security-util.h"
 

branches/cu-security-branch/src/common/security/pint-security.h

@@ -10 +10 @@
 
 #include "pvfs2-types.h"
-#include "security-types.h"
 
 

branches/cu-security-branch/src/common/security/security-util.c

@@ -10 +10 @@
 
 #include "pvfs2-config.h"
-#include "security-types.h"
+#include "pvfs2-types.h"
 #include "security-util.h"
 

branches/cu-security-branch/src/common/security/security-util.h

@@ -9 +9 @@
 
 
-#include "security-types.h"
 
 

branches/cu-security-branch/src/server/pvfs2-server.h

@@ -33 +33 @@
 #include "state-machine.h"
 #include "pint-event.h"
-#include "security-types.h"
 
 extern job_context_id server_job_context;