Skip to content

Commit

Permalink
Fix #563
Browse files Browse the repository at this point in the history
  • Loading branch information
failys committed Sep 19, 2020
1 parent f62e405 commit fdf2448
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion cairis/config/architectural_pattern.dtd
Expand Up @@ -43,7 +43,7 @@

<!ELEMENT role (description)>
<!ATTLIST role name CDATA #REQUIRED>
<!ATTLIST role type (Stakeholder | Attacker) #REQUIRED>
<!ATTLIST role type (Stakeholder | Attacker | Data Controller | Data Processor | Data Subject | Machine) #REQUIRED>
<!ATTLIST role short_code CDATA #REQUIRED>

<!ELEMENT asset (description,tag*,significance,interface*,security_property*)>
Expand Down
2 changes: 1 addition & 1 deletion cairis/config/cairis_model.dtd
Expand Up @@ -87,7 +87,7 @@
<!ELEMENT riskanalysis (role*,asset*,vulnerability*,attacker*,threat*,risk*,response*,asset_association*)>
<!ELEMENT role (description)>
<!ATTLIST role name CDATA #REQUIRED>
<!ATTLIST role type (Stakeholder | Attacker) #REQUIRED>
<!ATTLIST role type (Stakeholder | Attacker | Data Controller | Data Processor | Data Subject | Machine) #REQUIRED>
<!ATTLIST role short_code CDATA #REQUIRED>

<!ELEMENT tag EMPTY>
Expand Down
2 changes: 1 addition & 1 deletion cairis/config/riskanalysis.dtd
Expand Up @@ -22,7 +22,7 @@
<!ELEMENT riskanalysis (role*,asset*,vulnerability*,attacker*,threat*,risk*,response*,asset_association*)>
<!ELEMENT role (description)>
<!ATTLIST role name CDATA #REQUIRED>
<!ATTLIST role type (Stakeholder | Attacker) #REQUIRED>
<!ATTLIST role type (Stakeholder | Attacker | Data Controller | Data Processor | Data Subject | Machine) #REQUIRED>
<!ATTLIST role short_code CDATA #REQUIRED>
<!ELEMENT description (#PCDATA)>

Expand Down
1 change: 1 addition & 0 deletions cairis/sql/init.sql
Expand Up @@ -4482,6 +4482,7 @@ INSERT INTO role_type(id,name) values(1,'Attacker');
INSERT INTO role_type(id,name) values(2,'Data Controller');
INSERT INTO role_type(id,name) values(3,'Data Processor');
INSERT INTO role_type(id,name) values(4,'Data Subject');
INSERT INTO role_type(id,name) values(5,'Machine');
INSERT INTO behavioural_variable(id,name) values (0,'Activities');
INSERT INTO behavioural_variable(id,name) values (1,'Attitudes');
INSERT INTO behavioural_variable(id,name) values (2,'Aptitudes');
Expand Down
5 changes: 3 additions & 2 deletions docs/roles.rst
Expand Up @@ -3,7 +3,7 @@ Roles

Roles represent the abstract classes representing human agents; these also encapsulate behaviours and responsibilities.

CAIRIS supports 5 types of role:
CAIRIS supports 6 types of role:

=============== ================================================================================================= ===============
Role Description
Expand All @@ -13,6 +13,7 @@ Attacker Human agents behaving maliciously.
Data Controller The entity that determines the purposes, conditions and means of the processing of personal data. GDPR
Data Processor The entity that processes data on behalf of the Data Controller. GDPR
Data Subject A natural person whose personal data is processed by a controller or processor. GDPR
Machine Software agents that behave with some level of autonomy.
=============== ================================================================================================= ===============

Adding, updating, and deleting a role
Expand Down Expand Up @@ -51,4 +52,4 @@ By changing the environment name in the environment combo box, the
responsibility model for a different environment can be viewed.
By clicking on a model element, information about that artifact can be viewed.

For details on how to print responsibility models as SVG files, see :doc:`Generating Documentation </gendoc>`.
For details on how to print responsibility models as SVG files, see :doc:`Generating Documentation </gendoc>`.

0 comments on commit fdf2448

Please sign in to comment.