Changeset 831da18


Ignore:
Timestamp:
Sep 12, 2013 10:01:44 PM (6 years ago)
Author:
Mei <mei@…>
Branches:
abac0-leak, abac0-mei, master
Children:
f43e42c
Parents:
92d6cca
Message:

1) getting ready to for 0.1.6

Files:
1 deleted
27 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    r4f79997 r831da18  
    1 AC_INIT([ABAC], [0.1.5], [faber@ISI.EDU])
     1AC_INIT([ABAC], [0.1.6], [faber@ISI.EDU])
    22AC_CONFIG_SRCDIR([libabac/abac_role.c])
    33AM_INIT_AUTOMAKE([foreign subdir-objects])
     
    1515
    1616# for python
     17AX_PYTHON_DEVEL([], [AC_MSG_ERROR([python-devel is required])] )
    1718AM_PATH_PYTHON
    1819
  • doc/API

    r4f79997 r831da18  
    4848     load a directory full of certificates:
    4949
    50         first: ${path}/*_ID.{der,pem} as identity certificates
    51                implicitly looking for ${path}/*_private.{der,pem} as
     50        first: ${path}/NAME_ID.{der,pem} as identity certificates
     51               implicitly looking for ${path}/NAME_private.{der,pem} as
    5252               the private key file
    53         last: ${path}/*_attr.xml as attribute certificates
     53        last: ${path}/NAME_attr.xml as attribute certificates
    5454      (C:abac_context_load_directory)
    5555
  • doc/ChangeLog

    r1bf0f03 r831da18  
    1 = 0.1.X =
    21
     2= 0.1.6 =
     3
     4    2013-09-XX
     5        * Harden with porting to Cento5/Cento6
     6          (Note, to work around a known Cento6 problem with
     7           xmlsec1-1.2.16-2.el6.x86_64.rpm,
     8           https://bugzilla.redhat.com/show_bug.cgi?id=662306,
     9           either compile libabac with -DXMLSEC_NO_SIZE_T or
     10           use the rpm for Cento6)
     11        * Added a scaling_tests/haystack example
     12        * Fixed several bugs related to building on Mac OS X
     13          (thanks to, Victor J. Orlikowski)
    314        * Updated regression tests with longer-lasting credential
    415          examples
  • doc/creddy.1

    r2e87ebb r831da18  
    1 .TH creddy 1 "July 2013" "ABAC 0.1.5"
     1.TH creddy 1 "July 2013" "ABAC 0.1.6"
    22
    33.SH NAME
  • doc/dependencies

    r1bf0f03 r831da18  
    1010    RPC::XML
    1111
    12 Python modules
     12Python modules 
    1313    m2crypto
    1414
  • libabac/abac.hh

    r4f79997 r831da18  
    6464f  void load_directory(char *)
    6565     load a directory full of certificates:
    66 f       first: ${path}/*_ID.{der,pem} as identity certificates
    67                implicitly looking for ${path}/*_private.{der,pem} as
     66f       first: ${path}/NAME_ID.{der,pem} as identity certificates
     67               implicitly looking for ${path}/NAME_private.{der,pem} as
    6868               the private key file
    69         last: ${path}/*_attr.xml as attribute certificates
     69        last: ${path}/NAME_attr.xml as attribute certificates
    7070      (C:abac_context_load_directory)
    7171***/
  • libabac/abac_attribute.c

    r3c30b59 r831da18  
    397397    if(chunk.len==0) return alist;
    398398
    399     char **rt0s=get_rt0_from_xml((void *) id_certs, xml, km);
     399    char **rt0s=get_rt0_from_xml(id_certs, xml, km);
    400400    char *rt0=NULL;
    401401    if(rt0s==NULL) return alist;
  • libabac/abac_verifier.c

    r4f79997 r831da18  
    184184 * this is called from parse_privilege(..)
    185185 */
    186 int abac_verifier_load_id_chars(void *id_certs,char *naked_pem,
     186int abac_verifier_load_id_chars(abac_list_t *id_certs,char *naked_pem,
    187187        abac_keyid_map_t *km) {
    188188    /* if id_certs is NULL, don't even try to load it */
     
    194194    abac_chunk_t chunk = { pem, len };
    195195    free(new_naked_pem);
    196     return abac_verifier_load_id_chunk((abac_list_t *)id_certs,chunk, km);
     196    return abac_verifier_load_id_chunk(id_certs,chunk, km);
    197197}
    198198/**
  • libabac/abac_xml.c

    rafcafea r831da18  
    3030#include "abac.h"
    3131#include "abac_util.h"
    32 
    33 extern int abac_verifier_load_id_chars(void *, char*, abac_keyid_map_t *);
    34 extern void* abac_get_sha_from_nake_pem(char *npem, char **sha1);
     32#include "abac_list.h"
     33
     34extern int abac_verifier_load_id_chars(abac_list_t*, char*, abac_keyid_map_t *);
     35extern void abac_get_sha_from_nake_pem(char *npem, char **sha1);
    3536extern void abac_split(char *string, char *delim, char **ret, int *num);
    3637static int debug=0;
     
    590591 * return value is an array of strings, zero-terminated (like argv) that holds
    591592 * the RT0 strings.  It is NULL on failure. */
    592 static xmlChar **parse_privilege(xmlDocPtr doc, void *ctxt_id_certs,
     593static xmlChar **parse_privilege(xmlDocPtr doc, abac_list_t* ctxt_id_certs,
    593594        abac_keyid_map_t *km) {
    594595    xmlNodePtr root = NULL;     /* XML root node */
     
    955956 * which the new certificate is added.
    956957 */
    957 xmlChar **parse_abac(xmlDocPtr doc, void *ctxt_id_certs, abac_keyid_map_t *km) {
     958xmlChar **parse_abac(xmlDocPtr doc, abac_list_t*ctxt_id_certs, abac_keyid_map_t *km) {
    958959    xmlNodePtr root = NULL;     /* XML root node */
    959960    xmlNodePtr node = NULL;     /* XML credential node */
     
    10351036 * (as they do in GENI credentials) add them to that list, which adds them to
    10361037 * the ABAC context. */
    1037 char **read_credential(void *ctxt_id_certs, char *infile,
     1038char **read_credential(abac_list_t *ctxt_id_certs, char *infile,
    10381039        char **in_xml, abac_keyid_map_t *km) {
    10391040    xmlChar **xml = (xmlChar **) in_xml;    /* Cast */
     
    15811582
    15821583/* parse xml structure and extract the attribute rules */
    1583 char **get_rt0_from_xml(void *ctxt_id_certs,char *xml, abac_keyid_map_t *km) {
     1584char **get_rt0_from_xml(abac_list_t *ctxt_id_certs,char *xml, abac_keyid_map_t *km) {
    15841585    xmlDocPtr doc=xmlParseMemory(xml,strlen(xml));
    15851586    xmlNodePtr node = NULL;                 /* XML scratch node */
  • libabac/abac_xml.h

    rd2b198c r831da18  
    1010extern int init_xmlsec();
    1111extern int deinit_xmlsec();
    12 extern char **read_credential(void *id_certs, char *infile, char **xml,
     12extern char **read_credential(abac_list_t *id_certs, char *infile, char **xml,
    1313        abac_keyid_map_t *);
    1414
    15 extern char **get_rt0_from_xml(void *id_certs,char *xml,
     15extern char **get_rt0_from_xml(abac_list_t *id_certs,char *xml,
    1616        abac_keyid_map_t *);
    1717extern char *get_keyid_from_xml(char *xml);
  • tests/Makefile.am

    ra1631e7 r831da18  
    1010# will force the testing to be run with install directory
    1111#
     12# special note: for Cento5 machines that is tightly coupled with
     13# python 2.4, need to sed out the invocation python to python2.6
     14# (the required version) with
     15# find . -type f -print | xargs sed -i 's/env python$/env python2.6/'
    1216
    1317include abac.mk
     
    3438          export MY_INCLUDES_VAL="$(ABAC_BUILD_INCLUDES_VAL)"; \
    3539          cd $$i; \
    36           make -s runcheck | tee -a $$here/result; \
     40          make -i -s runcheck | tee -a $$here/result; \
    3741          cd $$here; \
    3842        done
     
    4751          here=`pwd`; \
    4852          cd $$i; \
    49           make -s runcheck | tee -a $$here/result; \
     53          make -i -s runcheck | tee -a $$here/result; \
    5054          cd $$here; \
    5155        done
  • tests/attr_tests/Makefile.am

    r2d56f83 r831da18  
    33#
    44
    5 include  ${TESTDIR}/abac.mk
     5include  ../abac.mk
    66
    77EXPECTED_OKAY=3
  • tests/creddy_prover_tests/Makefile.am

    r2d56f83 r831da18  
    33#
    44
    5 include  ${TESTDIR}/abac.mk
     5include  ../abac.mk
    66
    77EXPECTED_OKAY=14
  • tests/creddy_tests/Makefile.am

    r2d56f83 r831da18  
    22# creddy_tests
    33#
    4 include  ${TESTDIR}/abac.mk
     4include  ../abac.mk
    55
    66EXPECTED_OKAY=50
  • tests/example_scripts/Makefile.am

    r2d56f83 r831da18  
    2828          cd $$i; \
    2929          printf "\n ==> RUN on %s\n" "$$i" >> $$here/result ; \
    30           make -s |tee -a $$here/result |grep BAD >> $$here/error; \
     30          make -i -s |tee -a $$here/result |grep BAD >> $$here/error; \
    3131          cd $$here; \
    3232        done
  • tests/example_scripts/c/Makefile.am

    r2d56f83 r831da18  
    33#
    44
    5 include  ${TESTDIR}/abac.mk
     5include  ../../abac.mk
    66
    77.PHONY: clean-local
  • tests/example_scripts/perl/Makefile.am

    r2d56f83 r831da18  
    33#
    44
    5 include  ${TESTDIR}/abac.mk
     5include  ../../abac.mk
    66
    77.PHONY: clean-local
  • tests/example_scripts/python/Makefile.am

    r2d56f83 r831da18  
    33#
    44
    5 include  ${TESTDIR}/abac.mk
     5include  ../../abac.mk
    66
    77.PHONY: clean-local
  • tests/example_scripts/wiki/Makefile.am

    r2d56f83 r831da18  
    33#
    44
    5 include  ${TESTDIR}/abac.mk
     5include  ../../abac.mk
    66
    77.PHONY: runcheck clean-local
  • tests/python_tests/Makefile.am

    r2d56f83 r831da18  
    33#
    44
    5 include  ${TESTDIR}/abac.mk
     5include  ../abac.mk
    66
    77EXPECTED_OKAY=11
     
    3737          cd $$here; \
    3838        done
    39         make ids
    40         make attrs
     39        make -i ids
     40        make -i attrs
    4141        @if test -f error ; \
    4242          then \
  • tests/scaling_tests/Makefile.am

    r92d6cca r831da18  
    3434          printf "\n ==> RUN on %s\n" "$$i" >> result; \
    3535          cd $$i; \
    36           make runcheck | tee -a $$here/result |grep BAD >> $$here/error; \
     36          make -i runcheck | tee -a $$here/result |grep BAD >> $$here/error; \
    3737          cd $$here; \
    3838        done;
  • tests/scaling_tests/daisychain/Makefile.am

    r2d56f83 r831da18  
    2121          here=`pwd`; \
    2222          cd $$i; \
    23           make -s test; \
     23          make -i -s test; \
    2424          cd $$here;\
    2525        done;
  • tests/scaling_tests/daisychain/likes_python/Makefile.am

    r2d56f83 r831da18  
    33#
    44
    5 include  ${TESTDIR}/abac.mk
     5include  ../../../abac.mk
    66
    77TEST=likes_0 likes_10 likes_20
  • tests/scaling_tests/haystack/Makefile.am

    r4f79997 r831da18  
    2121          here=`pwd`; \
    2222          cd $$i; \
    23           make -s test; \
     23          make -i -s test; \
    2424          cd $$here;\
    2525        done;
  • tests/scaling_tests/haystack/ralphs_prover/Makefile.am

    r4f79997 r831da18  
    33#
    44
    5 include  ${TESTDIR}/abac.mk
     5include  ../../../abac.mk
    66
    77TEST=ralphs_0 ralphs_10 ralphs_20
     
    3131        @make clean
    3232        cp ../../plotting/run_plot .
    33         @make -s test
    34         @make -s timing
     33        @make -i -s test
     34        @make -i -s timing
    3535        @./run_plot ralphs
  • tests/scaling_tests/haystack/ralphs_prover/run_one

    r92d6cca r831da18  
    1818chmod +x README run_query
    1919./README 1>/dev/null 2>&1
    20 time env ABAC_CN=1 ./run_query 1>ralphs.tmp 2> ralphs.time
    21 
     20env ABAC_CN=1 ./run_query 1>ralphs.tmp
    2221
    2322s=`grep -c "GOOD" ralphs.tmp 2>/dev/null`
  • tests/test_util.sh

    r4f79997 r831da18  
    11#!/bin/sh
    22
    3 debug=1
     3debug=0
    44
    55# look for creddy,
Note: See TracChangeset for help on using the changeset viewer.