From 283c69816157ef11aa93d54ab454a3368f35919e Mon Sep 17 00:00:00 2001 From: Jose Bollo Date: Wed, 30 Oct 2019 17:14:21 +0100 Subject: [PATCH] Improve documentation and licenses Signed-off-by: Jose Bollo --- LICENSE => Apache-2.0 | 0 CC-BY-SA-3.0 | 354 ++++++++++++++++++++++++++++++++++++++++++++++ CREDITS.md | 10 +- LICENSES.md | 23 +++ README.md | 72 ++++++++-- logo-cynagora-small.png | Bin 11034 -> 26978 bytes logo-cynagora.png | Bin 65942 -> 82240 bytes logo-cynagora.svg | 20 ++- src/cynagora-protocol.txt | 56 +++++++- 9 files changed, 510 insertions(+), 25 deletions(-) rename LICENSE => Apache-2.0 (100%) create mode 100644 CC-BY-SA-3.0 create mode 100644 LICENSES.md diff --git a/LICENSE b/Apache-2.0 similarity index 100% rename from LICENSE rename to Apache-2.0 diff --git a/CC-BY-SA-3.0 b/CC-BY-SA-3.0 new file mode 100644 index 0000000..bf0f938 --- /dev/null +++ b/CC-BY-SA-3.0 @@ -0,0 +1,354 @@ +Creative Commons Attribution-ShareAlike 3.0 Unported + +CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL +SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT +RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" +BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, +AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE. + +License + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE +COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY +COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS +AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE +TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE +CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE +IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. + + 1. Definitions + + a. "Adaptation" means a work based upon the Work, or upon the Work and + other pre-existing works, such as a translation, adaptation, derivative + work, arrangement of music or other alterations of a literary or + artistic work, or phonogram or performance and includes cinematographic + adaptations or any other form in which the Work may be recast, + transformed, or adapted including in any form recognizably derived from + the original, except that a work that constitutes a Collection will + not be considered an Adaptation for the purpose of this License. For + the avoidance of doubt, where the Work is a musical work, performance + or phonogram, the synchronization of the Work in timed-relation with + a moving image ("synching") will be considered an Adaptation for the + purpose of this License. + + b. "Collection" means a collection of literary or artistic works, + such as encyclopedias and anthologies, or performances, phonograms or + broadcasts, or other works or subject matter other than works listed in + Section 1(f) below, which, by reason of the selection and arrangement + of their contents, constitute intellectual creations, in which the Work + is included in its entirety in unmodified form along with one or more + other contributions, each constituting separate and independent works + in themselves, which together are assembled into a collective whole. A + work that constitutes a Collection will not be considered an Adaptation + (as defined below) for the purposes of this License. + + c. "Creative Commons Compatible License" means a license that is + listed at http://creativecommons.org/compatiblelicenses that has been + approved by Creative Commons as being essentially equivalent to this + License, including, at a minimum, because that license: (i) contains + terms that have the same purpose, meaning and effect as the License + Elements of this License; and, (ii) explicitly permits the relicensing + of adaptations of works made available under that license under this + License or a Creative Commons jurisdiction license with the same + License Elements as this License. + + d. "Distribute" means to make available to the public the original and + copies of the Work or Adaptation, as appropriate, through sale or other + transfer of ownership. + + e. "License Elements" means the following high-level license attributes + as selected by Licensor and indicated in the title of this License: + Attribution, ShareAlike. + + f. "Licensor" means the individual, individuals, entity or entities + that offer(s) the Work under the terms of this License. + + g. "Original Author" means, in the case of a literary or artistic + work, the individual, individuals, entity or entities who created the + Work or if no individual or entity can be identified, the publisher; + and in addition (i) in the case of a performance the actors, singers, + musicians, dancers, and other persons who act, sing, deliver, declaim, + play in, interpret or otherwise perform literary or artistic works or + expressions of folklore; (ii) in the case of a phonogram the producer + being the person or legal entity who first fixes the sounds of a + performance or other sounds; and, (iii) in the case of broadcasts, the + organization that transmits the broadcast. + + h. "Work" means the literary and/or artistic work offered under the + terms of this License including without limitation any production + in the literary, scientific and artistic domain, whatever may be + the mode or form of its expression including digital form, such as + a book, pamphlet and other writing; a lecture, address, sermon or + other work of the same nature; a dramatic or dramatico-musical work; a + choreographic work or entertainment in dumb show; a musical composition + with or without words; a cinematographic work to which are assimilated + works expressed by a process analogous to cinematography; a work of + drawing, painting, architecture, sculpture, engraving or lithography; a + photographic work to which are assimilated works expressed by a process + analogous to photography; a work of applied art; an illustration, + map, plan, sketch or three-dimensional work relative to geography, + topography, architecture or science; a performance; a broadcast; + a phonogram; a compilation of data to the extent it is protected + as a copyrightable work; or a work performed by a variety or circus + performer to the extent it is not otherwise considered a literary or + artistic work. + + i. "You" means an individual or entity exercising rights under this + License who has not previously violated the terms of this License + with respect to the Work, or who has received express permission from + the Licensor to exercise rights under this License despite a previous + violation. + + j. "Publicly Perform" means to perform public recitations of the + Work and to communicate to the public those public recitations, by + any means or process, including by wire or wireless means or public + digital performances; to make available to the public Works in such + a way that members of the public may access these Works from a place + and at a place individually chosen by them; to perform the Work to the + public by any means or process and the communication to the public of + the performances of the Work, including by public digital performance; + to broadcast and rebroadcast the Work by any means including signs, + sounds or images. + + k. "Reproduce" means to make copies of the Work by any means including + without limitation by sound or visual recordings and the right of + fixation and reproducing fixations of the Work, including storage of a + protected performance or phonogram in digital form or other electronic + medium. + + 2. Fair Dealing Rights. Nothing in this License is intended to reduce, + limit, or restrict any uses free from copyright or rights arising from + limitations or exceptions that are provided for in connection with the + copyright protection under copyright law or other applicable laws. + + 3. License Grant. Subject to the terms and conditions of this License, + Licensor hereby grants You a worldwide, royalty-free, non-exclusive, + perpetual (for the duration of the applicable copyright) license to + exercise the rights in the Work as stated below: + + a. to Reproduce the Work, to incorporate the Work into one or + more Collections, and to Reproduce the Work as incorporated in the + Collections; + + b. to create and Reproduce Adaptations provided that any such + Adaptation, including any translation in any medium, takes reasonable + steps to clearly label, demarcate or otherwise identify that changes + were made to the original Work. For example, a translation could be + marked "The original work was translated from English to Spanish," or a + modification could indicate "The original work has been modified."; + + c. to Distribute and Publicly Perform the Work including as + incorporated in Collections; and, + + d. to Distribute and Publicly Perform Adaptations. + + e. For the avoidance of doubt: + + i. Non-waivable Compulsory License Schemes. In those jurisdictions + in which the right to collect royalties through any statutory or + compulsory licensing scheme cannot be waived, the Licensor reserves + the exclusive right to collect such royalties for any exercise by + You of the rights granted under this License; + + ii. Waivable Compulsory License Schemes. In those jurisdictions + in which the right to collect royalties through any statutory or + compulsory licensing scheme can be waived, the Licensor waives the + exclusive right to collect such royalties for any exercise by You + of the rights granted under this License; and, + + iii. Voluntary License Schemes. The Licensor waives the right + to collect royalties, whether individually or, in the event that + the Licensor is a member of a collecting society that administers + voluntary licensing schemes, via that society, from any exercise by + You of the rights granted under this License. + + The above rights may be exercised in all media and formats whether now + known or hereafter devised. The above rights include the right to make + such modifications as are technically necessary to exercise the rights in + other media and formats. Subject to Section 8(f), all rights not expressly + granted by Licensor are hereby reserved. + + 4. Restrictions. The license granted in Section 3 above is expressly made + subject to and limited by the following restrictions: + + a. You may Distribute or Publicly Perform the Work only under the + terms of this License. You must include a copy of, or the Uniform + Resource Identifier (URI) for, this License with every copy of the + Work You Distribute or Publicly Perform. You may not offer or impose + any terms on the Work that restrict the terms of this License or the + ability of the recipient of the Work to exercise the rights granted to + that recipient under the terms of the License. You may not sublicense + the Work. You must keep intact all notices that refer to this License + and to the disclaimer of warranties with every copy of the Work You + Distribute or Publicly Perform. When You Distribute or Publicly Perform + the Work, You may not impose any effective technological measures on + the Work that restrict the ability of a recipient of the Work from You + to exercise the rights granted to that recipient under the terms of + the License. This Section 4(a) applies to the Work as incorporated in + a Collection, but this does not require the Collection apart from the + Work itself to be made subject to the terms of this License. If You + create a Collection, upon notice from any Licensor You must, to the + extent practicable, remove from the Collection any credit as required + by Section 4(c), as requested. If You create an Adaptation, upon notice + from any Licensor You must, to the extent practicable, remove from the + Adaptation any credit as required by Section 4(c), as requested. + + b. You may Distribute or Publicly Perform an Adaptation only under + the terms of: (i) this License; (ii) a later version of this License + with the same License Elements as this License; (iii) a Creative + Commons jurisdiction license (either this or a later license + version) that contains the same License Elements as this License + (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons + Compatible License. If you license the Adaptation under one of the + licenses mentioned in (iv), you must comply with the terms of that + license. If you license the Adaptation under the terms of any of the + licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), + you must comply with the terms of the Applicable License generally + and the following provisions: (I) You must include a copy of, or the + URI for, the Applicable License with every copy of each Adaptation + You Distribute or Publicly Perform; (II) You may not offer or impose + any terms on the Adaptation that restrict the terms of the Applicable + License or the ability of the recipient of the Adaptation to exercise + the rights granted to that recipient under the terms of the Applicable + License; (III) You must keep intact all notices that refer to the + Applicable License and to the disclaimer of warranties with every copy + of the Work as included in the Adaptation You Distribute or Publicly + Perform; (IV) when You Distribute or Publicly Perform the Adaptation, + You may not impose any effective technological measures on the + Adaptation that restrict the ability of a recipient of the Adaptation + from You to exercise the rights granted to that recipient under the + terms of the Applicable License. This Section 4(b) applies to the + Adaptation as incorporated in a Collection, but this does not require + the Collection apart from the Adaptation itself to be made subject to + the terms of the Applicable License. + + c. If You Distribute, or Publicly Perform the Work or any Adaptations + or Collections, You must, unless a request has been made pursuant + to Section 4(a), keep intact all copyright notices for the Work and + provide, reasonable to the medium or means You are utilizing: (i) the + name of the Original Author (or pseudonym, if applicable) if supplied, + and/or if the Original Author and/or Licensor designate another party + or parties (e.g., a sponsor institute, publishing entity, journal) + for attribution ("Attribution Parties") in Licensor's copyright + notice, terms of service or by other reasonable means, the name of + such party or parties; (ii) the title of the Work if supplied; (iii) + to the extent reasonably practicable, the URI, if any, that Licensor + specifies to be associated with the Work, unless such URI does not + refer to the copyright notice or licensing information for the Work; + and (iv), consistent with Section 3(b), in the case of an Adaptation, + a credit identifying the use of the Work in the Adaptation (e.g., + "French translation of the Work by Original Author," or "Screenplay + based on original Work by Original Author"). The credit required + by this Section 4(c) may be implemented in any reasonable manner; + provided, however, that in the case of a Adaptation or Collection, + at a minimum such credit will appear, if a credit for all contributing + authors of the Adaptation or Collection appears, then as part of these + credits and in a manner at least as prominent as the credits for the + other contributing authors. For the avoidance of doubt, You may only + use the credit required by this Section for the purpose of attribution + in the manner set out above and, by exercising Your rights under this + License, You may not implicitly or explicitly assert or imply any + connection with, sponsorship or endorsement by the Original Author, + Licensor and/or Attribution Parties, as appropriate, of You or Your use + of the Work, without the separate, express prior written permission of + the Original Author, Licensor and/or Attribution Parties. + + d. Except as otherwise agreed in writing by the Licensor or as may be + otherwise permitted by applicable law, if You Reproduce, Distribute + or Publicly Perform the Work either by itself or as part of any + Adaptations or Collections, You must not distort, mutilate, modify + or take other derogatory action in relation to the Work which would + be prejudicial to the Original Author's honor or reputation. Licensor + agrees that in those jurisdictions (e.g. Japan), in which any exercise + of the right granted in Section 3(b) of this License (the right to + make Adaptations) would be deemed to be a distortion, mutilation, + modification or other derogatory action prejudicial to the Original + Author's honor and reputation, the Licensor will waive or not assert, + as appropriate, this Section, to the fullest extent permitted by the + applicable national law, to enable You to reasonably exercise Your + right under Section 3(b) of this License (right to make Adaptations) + but not otherwise. + + 5. Representations, Warranties and Disclaimer + + UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR + OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY + KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, + INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, + FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT + OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER + OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF + IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + + 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE + LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY + SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING + OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + + 7. Termination + + a. This License and the rights granted hereunder will terminate + automatically upon any breach by You of the terms of this + License. Individuals or entities who have received Adaptations or + Collections from You under this License, however, will not have their + licenses terminated provided such individuals or entities remain in + full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will + survive any termination of this License. + + b. Subject to the above terms and conditions, the license granted + here is perpetual (for the duration of the applicable copyright in + the Work). Notwithstanding the above, Licensor reserves the right to + release the Work under different license terms or to stop distributing + the Work at any time; provided, however that any such election will not + serve to withdraw this License (or any other license that has been, or + is required to be, granted under the terms of this License), and this + License will continue in full force and effect unless terminated as + stated above. + + 8. Miscellaneous + + a. Each time You Distribute or Publicly Perform the Work or a + Collection, the Licensor offers to the recipient a license to the Work + on the same terms and conditions as the license granted to You under + this License. + + b. Each time You Distribute or Publicly Perform an Adaptation, Licensor + offers to the recipient a license to the original Work on the same + terms and conditions as the license granted to You under this License. + + c. If any provision of this License is invalid or unenforceable under + applicable law, it shall not affect the validity or enforceability of + the remainder of the terms of this License, and without further action + by the parties to this agreement, such provision shall be reformed + to the minimum extent necessary to make such provision valid and + enforceable. + + d. No term or provision of this License shall be deemed waived and no + breach consented to unless such waiver or consent shall be in writing + and signed by the party to be charged with such waiver or consent. + + e. This License constitutes the entire agreement between the parties + with respect to the Work licensed here. There are no understandings, + agreements or representations with respect to the Work not specified + here. Licensor shall not be bound by any additional provisions that may + appear in any communication from You. This License may not be modified + without the mutual written agreement of the Licensor and You. + + f. The rights granted under, and the subject matter referenced, in this + License were drafted utilizing the terminology of the Berne Convention + for the Protection of Literary and Artistic Works (as amended on + September 28, 1979), the Rome Convention of 1961, the WIPO Copyright + Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and + the Universal Copyright Convention (as revised on July 24, 1971). These + rights and subject matter take effect in the relevant jurisdiction + in which the License terms are sought to be enforced according to + the corresponding provisions of the implementation of those treaty + provisions in the applicable national law. If the standard suite of + rights granted under applicable copyright law includes additional + rights not granted under this License, such additional rights are + deemed to be included in the License; this License is not intended to + restrict the license of any rights under applicable law. + diff --git a/CREDITS.md b/CREDITS.md index 85c68b0..f1c4f05 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -1,9 +1,3 @@ -Thanks to Manassas for the logo (see below) +Thanks to Samsung Poland R&D team for the concepts of cynara. +Thanks to "Manassas" of wikipedia (a pseudo?) for the logo (see LICENSE) -LOGO ----- - -The logo is derived from the blason of Nancy (France) as created by Manassas: - "Manassas Image created for the Blazon Project of the French Wikipedia. - [CC BY-SA 3.0 (https://creativecommons.org/licenses/by-sa/3.0)]" -So the logo is also available using the same license. diff --git a/LICENSES.md b/LICENSES.md new file mode 100644 index 0000000..d6b140a --- /dev/null +++ b/LICENSES.md @@ -0,0 +1,23 @@ +The work found here is distributed under the terms of the license Apache-2.0 +with the exception of the logo that is disctibuted under the terms of the +license CC-BY-SA-3.0 (see below). + +The license Apache-2.0 can be found on web at URL + http://www.apache.org/licenses/LICENSE-2.0 +A copy is provided here file `Apache-2.0` + +LOGO +---- + +The logo is derived from the blason of Nancy (France) as created by Manassas: + `Manassas Image created for the Blazon Project of the French Wikipedia. + [CC BY-SA 3.0 (https://creativecommons.org/licenses/by-sa/3.0)]` +See https://commons.wikimedia.org/wiki/File:Blason_Nancy_54.svg. + +So the logo files used for cynagora are also available using the same license: + https://creativecommons.org/licenses/by/3.0/legalcode +A copy can be found here, file `CC-BY-SA-3.0` + +Files covered by this license are: `logo-cynagora.png`, `logo-cynagora-small.png` +and `logo-cynagora.svg`. + diff --git a/README.md b/README.md index 8123745..56959a9 100644 --- a/README.md +++ b/README.md @@ -34,10 +34,31 @@ In facts, the keys can be used with other values that the one primarily designed. For example, using the pid for the session is not safe. So it can be replaced with a string really identifying a session. -The database of *cynagora* is made of rules that set permissions +The database of *cynagora* is made of rules. Each cynagora rule is +a tuple of five strings and one integer: + + (CLIENT, SESSION, USER, PERMISSION, RESULT, EXPIRE). + +The strings `CLIENT`, `SESSION`, `USER`, `PERMISSION` are arbitrary. +They can also have the special value `*` (STAR) that means that the rule +matches any value. Otherwise, the rule matches a query only if the +value matches the string of the rule. That match is: + + - case sensitive for CLIENT, SESSION, USER + - case insensitive for PERMISSION + +The string RESULT has basically one of the two values `yes` or `no`. It can +also be an agent item that will imply a request to an existing agent. Cynagora implements handles differently the rules targeting any sessions -and the rules targeting specific sessions. +and the rules targeting specific sessions. The rules that have SESSION equals +to `*` are stored persistentely in the filesystem. That rule whose SESSION +is not STAR are volatile and only reside in memory. + +Expiration is a 64 bits signed integer that express the date of expiration +of the rule in epoch (number of seconds since 1 January 1970). The special +value 0 means no expiration, permanent rule. The negative values are used +to avoid caching, their expiration value is given by the formula `-(1 + x)`. ## API Overview @@ -56,12 +77,24 @@ Cynagora is a refit of [cynara][2] that allows inclusion of expirations. It implements the same permission database by principle but the details changes. +As a possible replacement, cynagora can supply a simple compatibility +library that offers light legacy API of cynara. This would allow to run +simple cynara clients (admin/check/async-check but not agents) without +changes. + # Compiling -The compilation use the build system *cmake*. Cynagora has no dependencies. -However, it can be built for using it with systemd activation. In that +Cynagora is written in language C. + +Cynagora only depends of _libcap_ that is used by the cynagora server. + +The server can be built for using systemd socket activation. In that case it requires _lisystemd_. +## Compiling with cmake and make + +The compilation use the build system *cmake*. + Example for compiling and installing cynagora: mkdir build @@ -73,9 +106,6 @@ Options to pass to cmake: - *WITH_SYSTEMD*: flag for generating systemd compatible units (default ON) - - *WITH_CYNARA_COMPAT*: flag for producing cynara compatibility artifacts - (default OFF) - - *DEFAULT_DB_DIR*: path of the directory for the database (default ${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/lib/cynagora) @@ -85,15 +115,37 @@ Options to pass to cmake: - *DEFAULT_INIT_FILE*: path to the initialization file to use (default ${CMAKE_INSTALL_FULL_SYSCONFDIR}/security/cynagora.initial) + - *WITH_CYNARA_COMPAT*: flag for producing cynara compatibility artifacts + (default OFF) + + - *DIRECT_CYNARA_COMPAT*: if true, dont use the shared client library to + access cynara server but use the static library instead, avoid a dependency + to the shared library. + Example: cmake -DCMAKE_INSTALL_PREFIX=~/.local -DWITH_SYSTEMD=OFF .. + make install + +## Compiling with meson and ninja + +You can compile using meson. Example: + + meson --prefix ~/.local -Dwith-systemd=false setup build + ninja -C build install + +Option are the same that above except that they are in lower case with dash: +*with-systemd*, *with-cynara-compat*, *direct-cynara-compat*. + +# Licenses -# License +Cynagora is licensed under a Apache License Version 2.0, January 2004, +available on [Apache website][3] or in Apache-2.0 file. -Cynagora is licensed under a Apache License Version 2.0, January 2004. -Available on Apache [website][3] or in LICENSE file. +Logo is licensed under Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0), +avaliable on [creative commons website][4] or in CC-BY-SA-3.0 file. [1]: https://git.automotivelinux.org/src/cynagora/ [2]: https://wiki.tizen.org/wiki/Security:Cynara [3]: https://www.apache.org/licenses/LICENSE-2.0 +[4]: https://creativecommons.org/licenses/by-sa/3.0/ diff --git a/logo-cynagora-small.png b/logo-cynagora-small.png index 14e9241ebffec55d7d2ac3e88f070a562a38c9d5..e7593a230dfa8ccf8aca5c7253ae3bb681c786af 100644 GIT binary patch delta 16091 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 diff --git a/logo-cynagora.png b/logo-cynagora.png index 1fb9d43421b7a8c1fa7e5c3bdfe95b71efa6d59f..dac2a8facfbf0fd2664368f65573d6d9e915f3f6 100644 GIT binary patch delta 16452 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

=u`MyP|6BL9j0SVMUy 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%0Dks72o!b`M@gU;)E931 zbK|Zdziz=Cpsx1t>*Iy*=9sXBdLyBKHbDGEN%0E`i^4?&MR;t)1mQe_Vzz=jP`I59 z55K4&zn~yY6fF2#e*BK{a)ubVW)&jEhD zTrLnl1Ox*9+Uno7{(s}y-^FjV|H>g@A+V^BfEbuZ*bXTsc3s#oFpn7M#z9+tI}ksV zUrbO);LkGubC3R!LlS&9XXD>?PU7b5xNe8YKW?tX&px7hQ{9kl$IKPg&-{XR`gUCAn zR@;9orkiILi1T%!T%RgDws1SBkFz&WN?x8v&Xh-Amgl;Q{T20ZG7@}$rrbci5#G-5 z->Fj3j27m>)Lhao=q5l&4JLQ+>5C2nF{$u=q zO8Li&`#1UjOUl2=|BqAtivJ7pZ~FgNLjQE^U%B$1;r}bjKVIU$!~fq?{vH1R1?9i- ze~0`#{{J_Xe>Lzs9unBx<_1{wmD8#T-=}_5T4rYY)Nz delta 30 mcmX@m#5%2+WrFhLv-SoYvg``noA2#E(9G(voz;QSnh^l5_X + logo cynagora @@ -25,7 +27,19 @@ image/svg+xml - + logo cynagora + + + manassas + + + + + CC-BY-SA-3.0 + + + @@ -43,8 +57,8 @@ id="base" showgrid="false" inkscape:zoom="1.1621212" - inkscape:cx="156.58139" - inkscape:cy="13.07222" + inkscape:cx="-21.971415" + inkscape:cy="10.060486" inkscape:window-x="0" inkscape:window-y="31" inkscape:current-layer="layer3" diff --git a/src/cynagora-protocol.txt b/src/cynagora-protocol.txt index bf255d9..ea3c1c2 100644 --- a/src/cynagora-protocol.txt +++ b/src/cynagora-protocol.txt @@ -8,10 +8,15 @@ Introduction - c->s: from client to cynagora server - s->c: from cynagora server to client - - EXPIRE: if missing, means forever - if positive, a number of second since EPOCH, invalid after it - CACHEID: a 32 bits positive integer - ID: a string + - EXPIRE: if missing, means: can cache forever + if '-', means: don't cache + if TIMESPEC (see below), means: valid until given relative time + - SEXPIRE: Same as EXPIRE but also allows TIMESPEC prefixed with '-', meaning + valid until given relative time and don't cache + +For TIMESPEC see notes. Messages -------- @@ -49,6 +54,8 @@ synopsis: c->s test ID CLIENT SESSION USER PERMISSION s->c (ack|yes|no) ID [EXPIRE] +Check whether the permission is granted (yes) or not granted (no) +or undecidable without querying an agent (ack). ### check a permission @@ -58,6 +65,8 @@ synopsis: c->s check ID CLIENT SESSION USER PERMISSION s->c (yes|no) ID [EXPIRE] +Check whether the permission is granted (yes) or not granted (no) and invoke +agent if needed. ### enter critical (admin) @@ -67,6 +76,9 @@ synopsis: c->s enter s->c done +Start modifications (prior to set or drop). + + ### leave critical (admin) synopsis: @@ -74,6 +86,9 @@ synopsis: c->s leave [commit|rollback] s->c done|error ... +Terminate modifications and commit it (commit) or cancel it (rollback). + + ### erase (admin) synopsis: @@ -81,22 +96,31 @@ synopsis: c->s drop CLIENT SESSION USER PERMISSION s->c done|error ... +Drop the rule matching the given filter. + + ### set (admin) synopsis: - c->s set CLIENT SESSION USER PERMISSION VALUE [EXPIRE] + c->s set CLIENT SESSION USER PERMISSION VALUE [SEXPIRE] s->c done|error ... +Create the rule as given. + + ### list permissions (admin): synopsis: c->s get CLIENT SESSION USER PERMISSION - s->c item CLIENT SESSION USER PERMISSION VALUE [EXPIRE] + s->c item CLIENT SESSION USER PERMISSION VALUE [SEXPIRE] s->c ... s->c done +List the rules matching the given filter. + + ### logging set/get (admin) synopsis: @@ -104,6 +128,9 @@ synopsis: c->s log [on|off] s->c done (on|off) +Tell to log or not the queries or query the current state. + + ### register agent (agent) synopsis: @@ -111,6 +138,9 @@ synopsis: c->s agent NAME s->c done|error ... +Register the agent of NAME + + ### ask agent (agent): synopsis: @@ -118,6 +148,9 @@ synopsis: s->c ask ASKID NAME VALUE CLIENT SESSION USER PERMISSION c->s reply ASKID ([yes|no] [always|session|one-time|EXPIRE]) +Receive an agent resolution request. + + ### sub check (agent): synopsis: @@ -125,9 +158,24 @@ synopsis: c->s sub ASKID ID CLIENT SESSION USER PERMISSION s->c (yes|no) ID [EXPIRE] +Make a check in the context of an agent resolution. + + Notes ----- +### TIMESPEC + +The TIMESPEC describe a number of seconds in the futur relative to now. +It can be a simple decimal integer. I can also use letters to designate +year (letter `y`), week (letter `w`), day (letter `d`), hour (letter `h`), +minute (letter `m`), second (letter `s`). + +Examples: + + - 15d + + ### CACHEID The cacheid identify the current cache. It changes each time the database -- 2.16.6