You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by tk...@apache.org on 2013/09/11 15:54:09 UTC
[1/2] git commit: set correct links (partly fixes MARMOTTA-149)
Updated Branches:
refs/heads/develop 6d60b0476 -> 0c21ac9e6
set correct links (partly fixes MARMOTTA-149)
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/3ee09772
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/3ee09772
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/3ee09772
Branch: refs/heads/develop
Commit: 3ee097725eb82a5899d1e8693c0f13afc008b4f0
Parents: 6d60b04
Author: tkurz <tk...@apache.org>
Authored: Wed Sep 11 15:04:40 2013 +0200
Committer: tkurz <tk...@apache.org>
Committed: Wed Sep 11 15:04:40 2013 +0200
----------------------------------------------------------------------
.../src/main/resources/web/admin/about.html | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/3ee09772/platform/marmotta-core/src/main/resources/web/admin/about.html
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/admin/about.html b/platform/marmotta-core/src/main/resources/web/admin/about.html
index 743a39e..706bfda 100644
--- a/platform/marmotta-core/src/main/resources/web/admin/about.html
+++ b/platform/marmotta-core/src/main/resources/web/admin/about.html
@@ -37,7 +37,7 @@
<p>You can find all installed features on the module list on the right side. To get a quick access to common functionalities, we listed some links:</p>
<ul>
<li><a href="import.html">Import your data:</a> RDF and non-RDF formats are supported.</li>
- <li><a href="../../sparql/admin/snorql/snorql.html">SPARQL your data:</a> full SPARQL 1.1 support including querying and updates.</li>
+ <li><a href="../../sparql/admin/snorql.html">SPARQL your data:</a> full SPARQL 1.1 support including querying and updates.</li>
<li><a href="configuration.html">Configure your database:</a> Marmotta comes with h2 embedded; configure your own database to handle bigger data.</li>
<li><a href="dataview.html">Control your data:</a> the dataview gives an overview on the current data in the system. (Attention: there might be problems with the visualisation if big data sets).</li>
<li><a href="../../user/admin/users.html">Manage your user accounts:</a> the user module allows creating and managing user accounts.</li>
@@ -47,14 +47,14 @@
<h2>Marmotta Modules</h2>
<p>Apache Marmotta provides some modules:</p>
<dl>
- <dt>Core</dt> <dd>provides the core RDF and Linked Data Platform capabilities.</dd>
- <dt>SPARQL</dt> <dd>offers query capabilities for the triplestore.</dd>
- <dt>LDPath Querying</dt> <dd>provides support for LDPath within the platform.</dd>
- <dt>Linked Data Caching</dt> <dd>provides transparent mechanism to cache Web resources.</dd>
- <dt>Reasoner</dt> <dd>adds a rule-based reasoner to the triple store.</dd>
- <dt>Security</dt> <dd>implements security mechanism.</dd>
- <dt>User</dt> <dd>provides the user management features.</dd>
- <dt>Versioning</dt> <dd>offers versioning services on top of the triple store.</dd>
+ <dt><a href="../../core/admin/about.html">Core</a></dt> <dd>provides the core RDF and Linked Data Platform capabilities.</dd>
+ <dt><a href="../../sparql/admin/about.html">SPARQL</a></dt> <dd>offers query capabilities for the triplestore.</dd>
+ <dt><a href="../../ldpath/admin/about.html">LDPath Querying</a></dt> <dd>provides support for LDPath within the platform.</dd>
+ <dt><a href="../../cache/admin/about.html">Linked Data Caching</a></dt> <dd>provides transparent mechanism to cache Web resources.</dd>
+ <dt><a href="../../reasoner/admin/about.html">Reasoner</a></dt> <dd>adds a rule-based reasoner to the triple store.</dd>
+ <dt><a href="../../security/admin/about.html">Security</a></dt> <dd>implements security mechanism.</dd>
+ <dt><a href="../../user/me.html">User</a></dt> <dd>provides the user management features.</dd>
+ <dt><a href="../../versioning/admin/about.html">Versioning</a></dt> <dd>offers versioning services on top of the triple store.</dd>
</dl>
<!--###END_CONTENT###-->
</body>
[2/2] git commit: set content from marmotta webpage to security about
page (partly fixes MARMOTTA-149)
Posted by tk...@apache.org.
set content from marmotta webpage to security about page (partly fixes MARMOTTA-149)
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/0c21ac9e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/0c21ac9e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/0c21ac9e
Branch: refs/heads/develop
Commit: 0c21ac9e66e515b4957c935317c692ed2bf43c76
Parents: 3ee0977
Author: tkurz <tk...@apache.org>
Authored: Wed Sep 11 15:17:44 2013 +0200
Committer: tkurz <tk...@apache.org>
Committed: Wed Sep 11 15:17:44 2013 +0200
----------------------------------------------------------------------
.../src/main/resources/web/admin/about.html | 41 +++++++++++++++++++-
1 file changed, 40 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/0c21ac9e/platform/marmotta-security/src/main/resources/web/admin/about.html
----------------------------------------------------------------------
diff --git a/platform/marmotta-security/src/main/resources/web/admin/about.html b/platform/marmotta-security/src/main/resources/web/admin/about.html
index ad3186c..5681932 100644
--- a/platform/marmotta-security/src/main/resources/web/admin/about.html
+++ b/platform/marmotta-security/src/main/resources/web/admin/about.html
@@ -27,7 +27,46 @@
<!--###BEGIN_CONTENT###-->
<h1>Marmotta Security</h1>
<p>
- This module provide security mechanisms for Apache Marmotta
+ This module provide security mechanisms for Apache Marmotta, which implements its own authentication and authorization mechanism.
+</p>
+<h2>Users and roles</h2>
+ <p>There are two default users in Marmotta: anonymous and admin. The first one is not an actual user, but the user all anonymous requests use. The second is the user with administration rights on the system.
+ </p>
+ <p>At the same time, users are group in roles for simplifying permission management. The system comes with three groups (manager, editor and user) by default, but this could be customized as preferred.
+ </p>
+ <p>For instance, by default the admin user is part of manager, editor and user groups.
+ </p>
+<h2>Profiles</h2>
+ <p>There are three pre-defined profiles, <i>simple</i>, <i>standard</i>, and <i>restricted</i>:
+ </p>
+ <ul>
+ <li><b>simple</b> allows read access from everywhere and write access only from localhost or other local interfaces.</li>
+ <li><b>standard</b> allows read access from everywhere and write access only for authenticated users of the “manager” role.
+ <li><b>restricted</b> allows access only for authenticated users.</li>
+ </ul>
+ <p>By default, Marmotta will use the simple profile, allowing only access from localhost. If you want to change the profile, you can set the configuration property security.profile to standard, e.g. via the configuration interface in “Core Services” or “Security”. If your instance is running on a remote server, you can e.g. log in using SSH and run the following command:
+ </p>
+ <pre>
+ curl -X POST -H "Content-Type: application/json" -d '["standard"]' http://<HOST>:<PORT>/marmotta/config/data/security.profile</pre>
+ <p>
+ Afterwards, you can log in with the default admin user and password (“admin” and “pass123”). Needless to say you should change this password.
+ </p>
+ <h2>Rules</h2>
+ <p>The configuration is based on ACL rules such as:
+ </p>
+ <pre>
+ security.{TYPE}.{NAME}.pattern = {PATTERN}
+ security.{TYPE}.{NAME}.methods = {METHOD}
+ security.{TYPE}.{NAME}.priority = {PRIORITY}</pre>
+ <p>Where:</p>
+ <ul>
+ <li><b>{TYPE}</b> is the type of control, which can be <i>permission</i> for granting permission the requests matching this rule or <i>restriction</i> for restricting.</li>
+ <li><b>{NAME}</b> is an arbitrary label for naming the rule, which should be unique in combination with the type.</li>
+ <li><b>{PATTERN}</b> is the regular expression pattern which this rule matches.</li>
+ <li><b>{METHOD}</b> is the HTTP method this rule applies (<i>HEAD</i>, <i>OPTIONS</i>, <i>GET</i>, <i>POST</i>, <i>PUT</i> or <i>DELETE</i>). If the rules applies to more than one method, you can add all methods separated by commas or add additional property lines for each method, both options are valid.</li>
+ <li><b>{PRIORITY}</b> is the the priority of this rule in the access control list.</li>
+ </ul>
+ <p>The system evaluates the rules ordered by priority, allowing or rejecting access whenever a rule matches each request to the system. The adminnistration user interface provides an overview page for the status of the current rules applied to the system.
</p>
<!--###END_CONTENT###-->