Changeset 1afd681


Ignore:
Timestamp:
Jul 15, 2013 1:36:25 PM (6 years ago)
Author:
Mei <mei@…>
Branches:
abac0-leak, abac0-mei, master
Children:
bceef20
Parents:
1546962
Message:

1) ready the 1.5 release..
2) tested out the new attribute features (nicknames), multiple GENI

attribute formats

3) polish up testing' build dir alittle bit more..

Files:
1 added
17 deleted
10 edited

Legend:

Unmodified
Added
Removed
  • Makefile.am

    r3c30b59 r1afd681  
    157157
    158158clean-local-tests:
    159         cd tests && make clean
     159        cd tests && ( if -f Makefile; then make clean; fi)
    160160
    161161dist-hook:
     
    163163                cd $(distdir)/java && ant clean ; \
    164164        fi
    165         cd tests && make clean
     165        cd tests && ( if -f Makefile; then make clean; fi)
    166166        cd cred_printer && make clean
    167167
     
    176176install-data-hook:
    177177        @echo ''
    178         @echo '+-------------------------------------------------------------+'
    179         @echo '| A friendly reminder:                                        |'
    180         @echo '| If you have not already run "make testing", then we strongly  |'
    181         @echo '| recommend you do so to expose any possible setup problem.   |'
    182         @echo '+-------------------------------------------------------------+'
     178        @echo '+--------------------------------------------------------------+'
     179        @echo '| A friendly reminder:                                         |'
     180        @echo '| If you have not already run "make testing", then we strongly |'
     181        @echo '| recommend you do so to expose any possible setup problem.    |'
     182        @echo '+--------------------------------------------------------------+'
    183183        @echo ''
    184184
  • doc/API

    r3c30b59 r1afd681  
    7171     in Role::short_string(Context) and when bake(Context) is called on a new
    7272     attribute.
    73      (C:abac_context_set__short_string)
     73     (C:abac_context_set_nickname)
    7474
    7575ABAC::Role
     
    324324     This version annotated the baked credential with any mnemonic names in the
    325325     context.
    326      (C:abac_attribute_bake)
     326     (C:abac_attribute_bake_context)
    327327
    328328   bool baked()
  • libabac/abac.hh

    r3c30b59 r1afd681  
    122122     in Role::short_string(Context) and when bake(Context) is called on a new
    123123     attribute.
    124      (C:abac_context_set__short_string)
     124     (C:abac_context_set_nickname)
    125125***/
    126126        void set_nickname(char *key, char *nick) {
     
    551551     This version annotated the baked credential with any mnemonic names in the
    552552     context.
    553      (C:abac_attribute_bake)
     553     (C:abac_attribute_bake_context)
    554554***/
    555555            bool bake(Context& c) {
  • tests/Makefile.am

    r3c30b59 r1afd681  
    1919DIRECTORY = example_scripts python_tests scaling_tests \
    2020          creddy_tests creddy_prover_tests attr_tests
     21
     22SUBDIRS = $(DIRECTORY)
    2123
    2224.PHONY: clean clean-local check_sh_env check_py_env tests
  • tests/creddy_tests/setup.sh

    r3c30b59 r1afd681  
    2727cp PGissuer.pem_save PGissuer.pem
    2828cp iProtoGENI.xml_save iProtoGENI.xml
    29 ## waiting for a real valid one..
    30 cp iProtoGENI.xml_save ProtoGENI.xml
     29## This will be valid for 3 years starting from 7/15/2013
     30cp vProtoGENI.xml_save ProtoGENI.xml
    3131
  • tests/example_scripts/Makefile.am

    r3c30b59 r1afd681  
    66
    77DIRECTORY = c perl python wiki
     8SUBDIRS = $(DIRECTORY)
    89
    910.PHONY : runcheck clean-local
  • tests/example_scripts/wiki/Makefile.am

    r3c30b59 r1afd681  
    1414
    1515
    16 FIRST=id1
    17 REST=id2 id3 id4 id5 attr1 attr2 ctxtQuery1 ctxtQuery2
     16TESTS=id1 id2 id3 id4 id5 attr1 attr2 attr3 attr4 ctxtQuery1 ctxtQuery2 ctxtQuery3 ctxtQuery4
    1817
    1918## need to enforce a specific order,
    20 all: $(FIRST) $(REST)
     19all: $(TESTS)
    2120
    2221id1: id1.py
     
    9998        fi)
    10099
     100attr3: attr3.py
     101        @make clean
     102        @echo "---running (wiki) attr3.py script"
     103        @(list=`$(MY_ENV) ./attr3.py`; \
     104          r1=`grep "&lt;-" V1_attr.xml |wc -l` ; \
     105          r2=`grep "<ABACprincipal><keyid>" V1_1_attr.xml V1_1b_attr.xml |wc -l` ; \
     106          rc="$$r1"+"$$r2"; \
     107        if [ "$$list" != "GENIv1.0GENIv1.1GENIv1.1" -o "$$rc" != "1+4" ]; then \
     108          echo "BAD:example_scripts/wiki/attr3.py:different attr rt0 xml format"; \
     109        else \
     110          echo "GOOD:example_scripts/wiki/attr3.py:different attr rt0 xml format"; \
     111        fi)
     112
     113attr4: attr4.py
     114        @make clean
     115        @echo "---running (wiki) attr4.py script"
     116        @(rs=`$(MY_ENV) ./attr4_setup.py`; \
     117          rc=`$(MY_ENV) ./attr4.py | grep mnemonic |wc -l`; \
     118        if [ "$$rc" != "6" ]; then \
     119          echo "BAD:example_scripts/wiki/attr4.py:setting nickname in attr"; \
     120        else \
     121          echo "GOOD:example_scripts/wiki/attr4.py:setting nickname in attr"; \
     122        fi)
     123
    101124ctxtQuery1: ctxtQuery1.py
    102125        make clean
     
    119142        fi)
    120143
     144ctxtQuery3: ctxtQuery3.py
     145        make clean
     146        @echo "---running (wiki) ctxtQuery3.py script"
     147        @$(MY_ENV) ./ctxtQuery3_setup.py 1>/dev/null 2>&1;
     148        @(rc=`$(MY_ENV) ./ctxtQuery3.py |grep "self contain, ok? 1"` ; \
     149        if [ "$$rc" = "" ]; then \
     150          echo "BAD:example_scripts/wiki/ctxtQuery3.py:loading self contained attribute"; \
     151        else \
     152          echo "GOOD:example_scripts/wiki/ctxtQuery3.py:loading self contained attribute"; \
     153        fi)
     154
     155ctxtQuery4: ctxtQuery4.py
     156        make clean
     157        @echo "---running (wiki) ctxtQuery4.py script"
     158        @$(MY_ENV) ./ctxtQuery4_setup.py 1>/dev/null 2>&1;
     159        @(rc=`$(MY_ENV) ./ctxtQuery4.py | grep identity1 |wc -l` ; \
     160        if [ "$$rc" = "1" ]; then \
     161          echo "GOOD:example_scripts/wiki/ctxtQuery4.py:trying mnemonic modification names"; \
     162        else \
     163          echo "BAD:example_scripts/wiki/ctxtQuery4.py:trying mnemonic modification names"; \
     164        fi)
     165
     166
    121167clean:
    122168        @rm -rf *.xml *.pem
  • tests/example_scripts/wiki/attr2.py

    rec550f7 r1afd681  
    11#!/usr/bin/env python
    22"""
    3 attr1.py
     3attr2.py
    44"""
    55import os
  • tests/scaling_tests/Makefile.am

    r3c30b59 r1afd681  
    77PLOT= daisychain/likes_python
    88#haystack/fruit_python
     9
     10SUBDIRS=$(DIRECTORY)
    911
    1012.PHONY : runcheck clean-local plot clean
  • tests/scaling_tests/daisychain/Makefile.am

    r3c30b59 r1afd681  
    55
    66DIRECTORY=likes_python
     7
     8SUBDIRS=$(DIRECTORY)
    79
    810all: runcheck
Note: See TracChangeset for help on using the changeset viewer.