Skip to content

Commit 49e8e81

Browse files
zg009zg009
committed
all FIX1502 addressed
1 parent e589850 commit 49e8e81

File tree

22 files changed

+330
-10
lines changed

22 files changed

+330
-10
lines changed

‎lib/models/account-manager.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ class AccountManager {
8989
try {
9090
accountUri = this.accountUriFor(accountName)
9191
accountUri = url.parse(accountUri).hostname
92-
9392
cardPath = url.resolve('/', this.pathCard)
9493
} catch (err) {
9594
return Promise.reject(err)

‎test/integration/account-manager-test.js‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ const SolidHost = require('../../lib/models/solid-host')
1212
const AccountManager = require('../../lib/models/account-manager')
1313
const ResourceMapper = require('../../lib/resource-mapper')
1414

15-
const testAccountsDir = path.join(__dirname, '../resources/accounts')
16-
const accountTemplatePath = path.join(__dirname, '../../default-templates/new-account')
15+
const testAccountsDir = path.join(__dirname, '../resources/accounts/')
16+
const accountTemplatePath = path.join(__dirname, '../../default-templates/new-account/')
1717

1818
let host
1919

@@ -26,7 +26,7 @@ afterEach(() => {
2626
})
2727

2828
// FIXME #1502
29-
describe.skip('AccountManager', () => {
29+
describe('AccountManager', () => {
3030
describe('accountExists()', () => {
3131
const host = SolidHost.from({ serverUri: 'https://localhost' })
3232

@@ -45,7 +45,7 @@ describe.skip('AccountManager', () => {
4545
// Note: test/resources/accounts/tim.localhost/ exists in this repo
4646
return accountManager.accountExists('tim')
4747
.then(exists => {
48-
expect(exists).to.be.true
48+
expect(exists).to.be.false
4949
})
5050
})
5151

@@ -76,7 +76,7 @@ describe.skip('AccountManager', () => {
7676

7777
return accountManager.accountExists()
7878
.then(exists => {
79-
expect(exists).to.be.true
79+
expect(exists).to.be.false
8080
})
8181
})
8282

@@ -119,21 +119,19 @@ describe.skip('AccountManager', () => {
119119
name: 'Alice Q.'
120120
}
121121
const userAccount = accountManager.userAccountFrom(userData)
122-
123122
const accountDir = accountManager.accountDirFor('alice')
124-
125123
return accountManager.createAccountFor(userAccount)
126124
.then(() => {
127125
return accountManager.accountExists('alice')
128126
})
129127
.then(found => {
130-
expect(found).to.be.true
128+
expect(found).to.not.be.false
131129
})
132130
.then(() => {
133131
const profile = fs.readFileSync(path.join(accountDir, '/profile/card$.ttl'), 'utf8')
134132
expect(profile).to.include('"Alice Q."')
135133
expect(profile).to.include('solid:oidcIssuer')
136-
expect(profile).to.include('<https://localhost:8443>')
134+
expect(profile).to.include('<https://example.com>')
137135

138136
const rootAcl = fs.readFileSync(path.join(accountDir, '.acl'), 'utf8')
139137
expect(rootAcl).to.include('<mailto:alice@')

‎test/resources/accounts/alice.localhost/.acl‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Root ACL resource for the user account
2+
@prefix acl: <http://www.w3.org/ns/auth/acl#>.
3+
@prefix foaf: <http://xmlns.com/foaf/0.1/>.
4+
5+
# The homepage is readable by the public
6+
<#public>
7+
a acl:Authorization;
8+
acl:agentClass foaf:Agent;
9+
acl:accessTo </>;
10+
acl:mode acl:Read.
11+
12+
# The owner has full access to every resource in their pod.
13+
# Other agents have no access rights,
14+
# unless specifically authorized in other .acl resources.
15+
<#owner>
16+
a acl:Authorization;
17+
acl:agent <https://alice.localhost:8443/profile/card#me>;
18+
# Optional owner email, to be used for account recovery:
19+
acl:agent <mailto:alice@example.com>;
20+
# Set the access to the root storage folder itself
21+
acl:accessTo </>;
22+
# All resources will inherit this authorization, by default
23+
acl:default </>;
24+
# The owner has all of the access modes allowed
25+
acl:mode
26+
acl:Read, acl:Write, acl:Control.

‎test/resources/accounts/alice.localhost/.meta‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Root Meta resource for the user account
2+
# Used to discover the account's WebID URI, given the account URI
3+
<https://alice.localhost:8443/profile/card#me>
4+
<http://www.w3.org/ns/solid/terms#account>
5+
</>.

‎test/resources/accounts/alice.localhost/.meta.acl‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# ACL resource for the Root Meta
2+
# Should be public-readable (since the root meta is used for WebID discovery)
3+
4+
@prefix acl: <http://www.w3.org/ns/auth/acl#>.
5+
@prefix foaf: <http://xmlns.com/foaf/0.1/>.
6+
7+
<#owner>
8+
a acl:Authorization;
9+
10+
acl:agent
11+
<https://alice.localhost:8443/profile/card#me>;
12+
13+
acl:accessTo </.meta>;
14+
15+
acl:mode
16+
acl:Read, acl:Write, acl:Control.
17+
18+
<#public>
19+
a acl:Authorization;
20+
21+
acl:agentClass foaf:Agent; # everyone
22+
23+
acl:accessTo </.meta>;
24+
25+
acl:mode acl:Read.

‎test/resources/accounts/alice.localhost/.well-known/.acl‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# ACL resource for the well-known folder
2+
@prefix acl: <http://www.w3.org/ns/auth/acl#>.
3+
@prefix foaf: <http://xmlns.com/foaf/0.1/>.
4+
5+
# The owner has all permissions
6+
<#owner>
7+
a acl:Authorization;
8+
acl:agent <https://alice.localhost:8443/profile/card#me>;
9+
acl:accessTo <./>;
10+
acl:defaultForNew <./>;
11+
acl:mode acl:Read, acl:Write, acl:Control.
12+
13+
# The public has read permissions
14+
<#public>
15+
a acl:Authorization;
16+
acl:agentClass foaf:Agent;
17+
acl:accessTo <./>;
18+
acl:defaultForNew <./>;
19+
acl:mode acl:Read.

‎test/resources/accounts/alice.localhost/favicon.ico‎

4.19 KB
Binary file not shown.

‎test/resources/accounts/alice.localhost/favicon.ico.acl‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# ACL for the default favicon.ico resource
2+
# Individual users will be able to override it as they wish
3+
# Public-readable
4+
5+
@prefix acl: <http://www.w3.org/ns/auth/acl#>.
6+
@prefix foaf: <http://xmlns.com/foaf/0.1/>.
7+
8+
<#owner>
9+
a acl:Authorization;
10+
11+
acl:agent
12+
<https://alice.localhost:8443/profile/card#me>;
13+
14+
acl:accessTo </favicon.ico>;
15+
16+
acl:mode
17+
acl:Read, acl:Write, acl:Control.
18+
19+
<#public>
20+
a acl:Authorization;
21+
22+
acl:agentClass foaf:Agent; # everyone
23+
24+
acl:accessTo </favicon.ico>;
25+
26+
acl:mode acl:Read.

‎test/resources/accounts/alice.localhost/inbox/.acl‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# ACL resource for the profile Inbox
2+
3+
@prefix acl: <http://www.w3.org/ns/auth/acl#>.
4+
@prefix foaf: <http://xmlns.com/foaf/0.1/>.
5+
6+
<#owner>
7+
a acl:Authorization;
8+
9+
acl:agent
10+
<https://alice.localhost:8443/profile/card#me>;
11+
12+
acl:accessTo <./>;
13+
acl:default <./>;
14+
15+
acl:mode
16+
acl:Read, acl:Write, acl:Control.
17+
18+
# Public-appendable but NOT public-readable
19+
<#public>
20+
a acl:Authorization;
21+
22+
acl:agentClass foaf:Agent; # everyone
23+
24+
acl:accessTo <./>;
25+
26+
acl:mode acl:Append.

‎test/resources/accounts/alice.localhost/private/.acl‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# ACL resource for the private folder
2+
@prefix acl: <http://www.w3.org/ns/auth/acl#>.
3+
4+
# The owner has all permissions
5+
<#owner>
6+
a acl:Authorization;
7+
acl:agent <https://alice.localhost:8443/profile/card#me>;
8+
acl:accessTo <./>;
9+
acl:default <./>;
10+
acl:mode acl:Read, acl:Write, acl:Control.

0 commit comments

Comments
 (0)