Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
les
gancio
Commits
74bd8a45
Commit
74bd8a45
authored
Sep 19, 2019
by
les
Browse files
generate RSA key for old users
parent
1c8251c1
Changes
3
Show whitespace changes
Inline
Side-by-side
server/api/controller/user.js
View file @
74bd8a45
...
...
@@ -235,6 +235,22 @@ const userController = {
if
(
!
req
.
body
.
password
)
{
delete
req
.
body
.
password
}
// generate an rsa key in case not present
if
(
!
req
.
rsa
)
{
const
rsa
=
await
generateKeyPair
(
'
rsa
'
,
{
modulusLength
:
4096
,
publicKeyEncoding
:
{
type
:
'
spki
'
,
format
:
'
pem
'
},
privateKeyEncoding
:
{
type
:
'
pkcs8
'
,
format
:
'
pem
'
}
})
req
.
body
.
rsa
=
rsa
}
await
user
.
update
(
req
.
body
)
if
(
!
user
.
is_active
&&
req
.
body
.
is_active
&&
user
.
recover_code
)
{
...
...
server/federation/users.js
View file @
74bd8a45
...
...
@@ -104,7 +104,7 @@ module.exports = {
'
@context
'
:
'
https://www.w3.org/ns/activitystreams
'
,
id
:
`
${
config
.
baseurl
}
/federation/u/
${
name
}
/outbox?page=
${
page
}
`
,
type
:
'
OrderedCollectionPage
'
,
totalItems
:
user
.
follower
s
.
length
,
totalItems
:
user
.
event
s
.
length
,
partOf
:
`
${
config
.
baseurl
}
/federation/u/
${
name
}
/outbox`
,
orderedItems
:
user
.
events
.
map
(
e
=>
({
id
:
`
${
config
.
baseurl
}
/federation/m/
${
e
.
id
}
#create`
,
...
...
server/federation/webfinger.js
View file @
74bd8a45
...
...
@@ -11,8 +11,7 @@ const debug = require('debug')('webfinger')
router
.
use
(
cors
())
router
.
get
(
'
/webfinger
'
,
async
(
req
,
res
)
=>
{
const
resource
=
req
.
query
.
resource
if
(
!
resource
||
!
resource
.
includes
(
'
acct:
'
))
{
if
(
!
req
.
query
||
!
req
.
query
.
resource
||
!
req
.
query
.
resource
.
includes
(
'
acct:
'
))
{
debug
(
'
Bad webfinger request => %s
'
,
resource
.
query
)
return
res
.
status
(
400
).
send
(
'
Bad request. Please make sure "acct:USER@DOMAIN" is what you are sending as the "resource" query parameter.
'
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment