Skip to content

Commit 9fa0720

Browse files
committed
update to README and fix admin
Signed-off-by: JDTobin <james.d.tobin3.ctr@mail.mil>
1 parent 19b28f1 commit 9fa0720

File tree

2 files changed

+48
-21
lines changed

2 files changed

+48
-21
lines changed

README.md

Lines changed: 47 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
The Experience Schema Service (XSS) maintains referential representations of domain entities, as well as transformational mappings that describe how to convert an entity from one particular schema representation to another.
44

5-
This component responsible for managing pertinent object/record metadata schemas, and the mappings for transforming records from a source metadata schema to a target metadata schema. This component will also be used to store and link vocabularies from stored schema.
5+
This component is responsible for managing pertinent object/record metadata schemas, and the mappings for transforming records from a source metadata schema to a target metadata schema. This component will also be used to store and link vocabularies from stored schema.
66

77

88
## Prerequisites
@@ -38,22 +38,24 @@ git clone https://github.com/OpenLXP/openlxp-xss.git
3838
- Create a `.env` file in the root directory
3939
- The following environment variables are required:
4040

41-
| Environment Variable | Description |
42-
| ------------------------- | ----------- |
43-
| AWS_ACCESS_KEY_ID | The Access Key ID for AWS |
44-
| AWS_SECRET_ACCESS_KEY | The Secret Access Key for AWS |
45-
| AWS_DEFAULT_REGION | The region for AWS |
46-
| CORS_ALLOWED_ORIGINS | List of trusted origins that are allowed to make cross-origin requests to the server |
47-
| DB_HOST | The host name, IP, or docker container name of the database |
48-
| DB_NAME | The name to give the database |
49-
| DB_PASSWORD | The password for the user to access the database |
50-
| DB_ROOT_PASSWORD | The password for the root user to access the database, should be the same as `DB_PASSWORD` if using the root user |
41+
| Environment Variable | Description |
42+
| ------------------------- | --------------------------------------------------------------------------------------------------------------------------- |
43+
| CORS_ALLOWED_ORIGINS | List of trusted origins that are allowed to make cross-origin requests to the server |
44+
| CSRF_TRUSTED_ORIGINS | A trusted origin for unsafe requests |
45+
| DB_HOST | The host name, IP, or docker container name of the database |
46+
| DB_NAME | The name to give the database |
47+
| DB_PASSWORD | The password for the user to access the database |
48+
| DB_ROOT_PASSWORD | The password for the root user to access the database, should be the same as `DB_PASSWORD` if using the root user |
5149
| DB_USER | The name of the user to use when connecting to the database. When testing use root to allow the creation of a test database |
52-
| DJANGO_SUPERUSER_EMAIL | The email of the superuser that will be created in the application |
53-
| DJANGO_SUPERUSER_PASSWORD | The password of the superuser that will be created in the application |
54-
| DJANGO_SUPERUSER_USERNAME | The username of the superuser that will be created in the application |
55-
| LOG_PATH | The path to the log file to use |
56-
| SECRET_KEY_VAL | The Secret Key for Django |
50+
| DJANGO_SUPERUSER_EMAIL | The email of the superuser that will be created in the application |
51+
| DJANGO_SUPERUSER_PASSWORD | The password of the superuser that will be created in the application |
52+
| DJANGO_SUPERUSER_USERNAME | The username of the superuser that will be created in the application |
53+
| ENTITY_ID | The Entity ID used to identify this application to Identity Providers when using Single Sign On |
54+
| HOSTS | A list of host names, separated by semicolons, that the application should accept requests for |
55+
| LOG_PATH | The path to the log file to use |
56+
| SECRET_KEY_VAL | The Secret Key for Django |
57+
| SP_PRIVATE_KEY | The Private Key to use when this application communicates with Identity Providers to use Single Sign On |
58+
| SP_PUBLIC_CERT | The Public Key to use when this application communicates with Identity Providers to use Single Sign On |
5759

5860
## 3. Deployment
5961
1. Create the OpenLXP docker network. Open a terminal and run the following command in the root directory of the project
@@ -134,22 +136,39 @@ git clone https://github.com/OpenLXP/openlxp-xss.git
134136
135137
- `Name` Term title
136138
137-
- `Desciption` Term entity's description
139+
- `Description` Term entity's description
138140
139141
- `Status` Select if the Term set is Published or Retired
140142
141143
- `Data Type` Term entity's corresponding data type
142144
143145
- `Use` Term entity's corresponding use case
146+
147+
- `Multiple Expected` Whether the Term should be a singular value or a list
144148
145149
- `Source` Term entity's corresponding source
146150
147-
- `term set` Select the reference to the parent term set from the drop down
151+
- `Term Set` Select the reference to the parent term set from the drop down
148152
149153
- `Mapping` Add mappings between terms entity's of different parent term set
150154
151155
- `Updated by` User that creates/updates the term
152156
157+
3. <u>[OPENLXP AUTHENTICATION](https://pypi.org/project/openlxp-authentication/)</u>
158+
- Saml configurations: Configure Security Assertion Markup Language (SAML)
159+
1. Click on `Saml configurations` > `Add Saml configuration`
160+
- Enter configurations below:
161+
162+
- `Name`: The name that will be used to identify the IdP in the URL.
163+
164+
- `Entity id`: The unique name provided by the IdP.
165+
166+
- `Url`: The connection URL to connect to the IdP at.
167+
168+
- `Cert`: The public cert used to connect to the IdP.
169+
170+
- `Attribute mapping`: The JSON formatted mapping to convert attributes provided by the IdP, to a User in this system.
171+
153172
## 5. Removing Deployment
154173
To destroy the created resources, simply run the command below in your terminal:
155174
@@ -165,7 +184,7 @@ Query string parameter: `name` `version` `iri`
165184
166185
167186
168-
**Note:This API fetches the required schema from the repository using the Name and Version or IRI parameters**
187+
*Note:This API fetches the required schema from the repository using the Name and Version or IRI parameters*
169188
170189
Query string parameter: `sourceName` `sourceVersion` `sourceIRI` `targetName` `targetVersion` `targetIRI`
171190
@@ -184,7 +203,15 @@ Test coverage information will be stored in an htmlcov directory
184203
docker-compose --env-file .env run app sh -c "coverage run manage.py test && coverage html && flake8"
185204
```
186205

206+
## Authentication
207+
208+
While XSS supports authentication and authorization, the schema and mapping APIs do not require authentication to use, as it is believed that they should be easily accessible shared resources.
209+
210+
The Django settings `SP_PUBLIC_CERT`, `SP_PRIVATE_KEY` , and `SP_ENTITY_ID` must be defined (if using docker-compose the variables can be passed through).
211+
212+
Information on the settings for the authentication module can be found on the [OpenLXP-Authentication repo](https://github.com/adlnet/openlxp-authentication).
213+
187214
## License
188215

189-
This project uses the [MIT](http://www.apache.org/licenses/LICENSE-2.0) license.
216+
This project uses the [Apache](http://www.apache.org/licenses/LICENSE-2.0) license.
190217

app/core/admin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class TermAdmin(admin.ModelAdmin):
9090
'modified', )
9191
fieldsets = (
9292
(None, {'fields': ('iri', 'name', 'uuid', 'description', 'status',)}),
93-
('Info', {'fields': ('data_type', 'use', 'learning_type',
93+
('Info', {'fields': ('data_type', 'use',
9494
'multiple_expected',
9595
'source',)}),
9696
('Connections', {'fields': ('term_set', 'mapping',)}),

0 commit comments

Comments
 (0)