Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PasswordProtectedFiles #5067

Merged
merged 35 commits into from
Sep 23, 2018
Merged

PasswordProtectedFiles #5067

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
56418a3
PasswordProtectedFiles
dapocalypse Jul 28, 2018
ccea176
Added changelog for passwordprotectedfiles.
dapocalypse Jul 28, 2018
5ae29af
Password Protection Fixes
dapocalypse Jul 28, 2018
19ba053
Password Protection Fixes
dapocalypse Jul 28, 2018
093914b
fixes
dapocalypse Jul 28, 2018
d06f0a5
Makes password check a proc
dapocalypse Jul 29, 2018
b609ece
Proc Password Proctection Fixes
dapocalypse Jul 29, 2018
8af142c
Fixes typo acess
dapocalypse Jul 30, 2018
121103e
Allows to encrypt or decrypt files outside of file creation
dapocalypse Jul 30, 2018
2b4bd2b
Fix to encryp decrypt stuff
dapocalypse Jul 31, 2018
45fa2d4
Merge branch 'development' into development
dapocalypse Jul 31, 2018
f1da4d8
UGh, Fixes
dapocalypse Aug 1, 2018
fb816e4
Merge branch 'development' into development
dapocalypse Aug 1, 2018
3c00491
merge
dapocalypse Aug 1, 2018
49dc58a
Merge branch 'development' into development
dapocalypse Aug 3, 2018
7c83d5f
Fixes
dapocalypse Aug 3, 2018
8faefc1
Again?
dapocalypse Aug 3, 2018
28de024
forgot
dapocalypse Aug 3, 2018
43ec5f7
Merge branch 'development' into development
dapocalypse Aug 3, 2018
1ec8efc
Merge branch 'development' into development
dapocalypse Aug 3, 2018
8218fcb
Merge branch 'development' into development
dapocalypse Aug 4, 2018
17852bb
Merge branch 'development' into development
dapocalypse Aug 5, 2018
75e5820
Merge branch 'development' into development
dapocalypse Aug 5, 2018
af8cc38
Merge branch 'development' into development
dapocalypse Aug 7, 2018
f23c03d
Merge pull request #1 from Aurorastation/development
dapocalypse Aug 8, 2018
b867b90
Merge branch 'development' into development
dapocalypse Aug 11, 2018
d789693
Merge pull request #3 from Aurorastation/development
dapocalypse Aug 27, 2018
0fb1088
Yea, fixes shit
dapocalypse Aug 27, 2018
c5eac59
Merge pull request #4 from Aurorastation/development
dapocalypse Sep 2, 2018
65faf44
Fixes USB shit
dapocalypse Sep 2, 2018
5de0a28
Merge pull request #5 from Aurorastation/development
dapocalypse Sep 15, 2018
4d5c59f
Proably not the last commit
dapocalypse Sep 15, 2018
e26199a
Merge branch 'development' into development
dapocalypse Sep 16, 2018
38d917f
Merge branch 'development' into development
dapocalypse Sep 16, 2018
79ae330
Merge branch 'development' into development
skull132 Sep 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 17 additions & 3 deletions code/modules/modular_computers/file_system/programs/system/file_browser.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,9 @@
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
if(!HDD)
return 1
var/newpassword = sanitize(input(usr, "Enter a password or leave blank to leave unprotected:"))
var/datum/computer_file/data/F = new/datum/computer_file/data()
F.filename = newname
F.filetype = "TXT"
if (newpassword)
F.password = newpassword
HDD.store_file(F)
if(href_list["PRG_deletefile"])
. = 1
Expand Down Expand Up @@ -153,6 +150,23 @@
return 1
var/datum/computer_file/C = F.clone(0)
HDD.store_file(C)
if(href_list["PRG_encrypt"])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are no checks present to see if the file is already encrypted.
That would allow a user to just hit the encrypt button again to set a password of their choosing.
You need to make sure that no password is set before encrypting the file

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checks are now present

. = 1
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to check if HDD exists after this, and return if not. See line 135 or 146.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Skull's comment is now invalid, check is present

var/datum/computer_file/F = HDD.find_file_by_name(href_list["PRG_openfile"])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldnt that be ?
var/datum/computer_file/F = HDD.find_file_by_name(href_list["PRG_encrypt"])
-> Same for the decrypt option below

if (!F)
return
dapocalypse marked this conversation as resolved.
Show resolved Hide resolved
F.password = sanitize(input(usr, "Enter an encryption key:", "Encrypt File"))
if(href_list["PRG_decrypt"])
. = 1
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to check if HDD exists after this.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Skull's comment is now invalid, check is present

var/datum/computer_file/F = HDD.find_file_by_name(href_list["PRG_openfile"])
if (!F)
return
if (F.can_access_file(usr))
F.password = ""
else
return
if(.)
SSnanoui.update_uis(NM)

Expand Down
2 changes: 2 additions & 0 deletions nano/templates/file_manager.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
{{:helper.link('DELETE', null, { "PRG_deletefile" : value.name }, value.undeletable ? 'disabled' : null)}}
{{:helper.link('RENAME', null, { "PRG_rename" : value.name }, value.undeletable ? 'disabled' : null)}}
{{:helper.link('CLONE', null, { "PRG_clone" : value.name }, value.undeletable ? 'disabled' : null)}}
{{:helper.link('ENCRYPT', null, { "PRG_encrypt" : value.name }, value.undeletable ? 'disabled' : null)}}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should disable this button if the file is undeletable or if the file is already encrypted

{{:helper.link('DECRYPT', null, { "PRG_decrypt" : value.name }, value.undeletable ? 'disabled' : null)}}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should disable this button if the file is undeletable or if the file is already decrypted.

{{if data.usbconnected}}
{{:helper.link('EXPORT', null, { "PRG_copytousb" : value.name }, value.undeletable ? 'disabled' : null)}}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why remove copying to USB drive? Please return this button.

{{/if}}
Expand Down