Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Sharkey
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dima Krasner
Sharkey
Commits
42ecde47
Verified
Commit
42ecde47
authored
1 year ago
by
Mar0xy
Browse files
Options
Downloads
Patches
Plain Diff
upd: add IPs to data export
parent
739f9588
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
packages/backend/src/queue/processors/ExportAccountDataProcessorService.ts
+42
-5
42 additions, 5 deletions
...src/queue/processors/ExportAccountDataProcessorService.ts
with
42 additions
and
5 deletions
packages/backend/src/queue/processors/ExportAccountDataProcessorService.ts
+
42
−
5
View file @
42ecde47
/* eslint-disable no-constant-condition */
/* eslint-disable @typescript-eslint/no-unnecessary-condition */
import
*
as
fs
from
'
node:fs
'
;
import
{
Inject
,
Injectable
}
from
'
@nestjs/common
'
;
import
{
In
,
IsNull
,
MoreThan
,
Not
}
from
'
typeorm
'
;
...
...
@@ -8,7 +5,7 @@ import { format as dateFormat } from 'date-fns';
import
mime
from
'
mime-types
'
;
import
archiver
from
'
archiver
'
;
import
{
DI
}
from
'
@/di-symbols.js
'
;
import
type
{
AntennasRepository
,
BlockingsRepository
,
DriveFilesRepository
,
FollowingsRepository
,
MiBlocking
,
MiFollowing
,
MiMuting
,
MiNote
,
MiNoteFavorite
,
MiPoll
,
MiUser
,
MutingsRepository
,
NoteFavoritesRepository
,
NotesRepository
,
PollsRepository
,
UserListMembershipsRepository
,
UserListsRepository
,
UserProfilesRepository
,
UsersRepository
}
from
'
@/models/_.js
'
;
import
type
{
AntennasRepository
,
BlockingsRepository
,
DriveFilesRepository
,
FollowingsRepository
,
MiBlocking
,
MiFollowing
,
MiMuting
,
MiNote
,
MiNoteFavorite
,
MiPoll
,
MiUser
,
MutingsRepository
,
NoteFavoritesRepository
,
NotesRepository
,
PollsRepository
,
SigninsRepository
,
UserListMembershipsRepository
,
UserListsRepository
,
UserProfilesRepository
,
UsersRepository
}
from
'
@/models/_.js
'
;
import
type
{
Config
}
from
'
@/config.js
'
;
import
type
Logger
from
'
@/logger.js
'
;
import
{
DriveService
}
from
'
@/core/DriveService.js
'
;
...
...
@@ -19,9 +16,9 @@ import { bindThis } from '@/decorators.js';
import
{
Packed
}
from
'
@/misc/json-schema.js
'
;
import
{
UtilityService
}
from
'
@/core/UtilityService.js
'
;
import
{
DownloadService
}
from
'
@/core/DownloadService.js
'
;
import
{
EmailService
}
from
'
@/core/EmailService.js
'
;
import
{
QueueLoggerService
}
from
'
../QueueLoggerService.js
'
;
import
type
*
as
Bull
from
'
bullmq
'
;
import
{
EmailService
}
from
'
@/core/EmailService.js
'
;
@
Injectable
()
export
class
ExportAccountDataProcessorService
{
...
...
@@ -67,6 +64,9 @@ export class ExportAccountDataProcessorService {
@
Inject
(
DI
.
userListMembershipsRepository
)
private
userListMembershipsRepository
:
UserListMembershipsRepository
,
@
Inject
(
DI
.
signinsRepository
)
private
signinsRepository
:
SigninsRepository
,
private
utilityService
:
UtilityService
,
private
driveService
:
DriveService
,
private
idService
:
IdService
,
...
...
@@ -160,6 +160,43 @@ export class ExportAccountDataProcessorService {
profileStream
.
end
();
// Stored IPs export
const
signins
=
await
this
.
signinsRepository
.
findBy
({
userId
:
user
.
id
});
const
ipPath
=
path
+
'
/ips.json
'
;
fs
.
writeFileSync
(
ipPath
,
''
,
'
utf-8
'
);
const
ipStream
=
fs
.
createWriteStream
(
ipPath
,
{
flags
:
'
a
'
});
const
writeIPs
=
(
text
:
string
):
Promise
<
void
>
=>
{
return
new
Promise
<
void
>
((
res
,
rej
)
=>
{
ipStream
.
write
(
text
,
err
=>
{
if
(
err
)
{
this
.
logger
.
error
(
err
);
rej
(
err
);
}
else
{
res
();
}
});
});
};
await
writeIPs
(
`{"metaVersion":1,"host":"
${
this
.
config
.
host
}
","exportedAt":"
${
new
Date
().
toString
()}
","ips":[`
);
for
(
const
signin
of
signins
)
{
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const
{
userId
,
id
,
headers
,
user
,
...
signinTrimmed
}
=
signin
;
const
isFirst
=
signins
.
indexOf
(
signin
)
===
0
;
await
writeIPs
(
isFirst
?
JSON
.
stringify
(
signinTrimmed
)
:
'
,
\n
'
+
JSON
.
stringify
(
signinTrimmed
));
}
await
writeIPs
(
'
]}
'
);
ipStream
.
end
();
// Note Export
const
notesPath
=
path
+
'
/notes.json
'
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment