-
Notifications
You must be signed in to change notification settings - Fork 500
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.
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
PasswordProtectedFiles #5067
PasswordProtectedFiles #5067
Changes from all commits
56418a3
ccea176
5ae29af
19ba053
093914b
d06f0a5
b609ece
8af142c
121103e
2b4bd2b
45fa2d4
f1da4d8
fb816e4
3c00491
49dc58a
7c83d5f
8faefc1
28de024
43ec5f7
1ec8efc
8218fcb
17852bb
75e5820
af8cc38
f23c03d
b867b90
d789693
0fb1088
c5eac59
65faf44
5de0a28
4d5c59f
e26199a
38d917f
79ae330
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,7 +19,14 @@ | |
|
||
if(href_list["PRG_openfile"]) | ||
. = 1 | ||
open_file = href_list["PRG_openfile"] | ||
var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive | ||
var/datum/computer_file/F = HDD.find_file_by_name(href_list["PRG_openfile"]) | ||
if (!F) | ||
return | ||
if (F.can_access_file(usr)) | ||
open_file = href_list["PRG_openfile"] | ||
else | ||
return | ||
if(href_list["PRG_newtextfile"]) | ||
. = 1 | ||
var/newname = sanitize(input(usr, "Enter file name or leave blank to cancel:", "File rename")) | ||
|
@@ -144,6 +151,29 @@ | |
return 1 | ||
var/datum/computer_file/C = F.clone(0) | ||
HDD.store_file(C) | ||
if(href_list["PRG_encrypt"]) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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. There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Skull's comment is now invalid, check is present |
||
if (!HDD) | ||
return | ||
var/datum/computer_file/F = HDD.find_file_by_name(href_list["PRG_encrypt"]) | ||
if(!F || F.undeletable) | ||
return | ||
if(F.password) | ||
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 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Need to check if HDD exists after this. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Skull's comment is now invalid, check is present |
||
if (!HDD) | ||
return | ||
var/datum/computer_file/F = HDD.find_file_by_name(href_list["PRG_encrypt"]) | ||
if(!F || F.undeletable) | ||
return | ||
if (F.can_access_file(usr)) | ||
F.password = "" | ||
else | ||
return | ||
if(.) | ||
SSnanoui.update_uis(NM) | ||
|
||
|
@@ -185,7 +215,8 @@ | |
"name" = F.filename, | ||
"type" = F.filetype, | ||
"size" = F.size, | ||
"undeletable" = F.undeletable | ||
"undeletable" = F.undeletable, | ||
"encrypted" = !!F.password | ||
))) | ||
data["files"] = files | ||
if(RHDD) | ||
|
@@ -196,7 +227,8 @@ | |
"name" = F.filename, | ||
"type" = F.filetype, | ||
"size" = F.size, | ||
"undeletable" = F.undeletable | ||
"undeletable" = F.undeletable, | ||
"encrypted" = !!F.password | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. My fault. |
||
))) | ||
data["usbfiles"] = usbfiles | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
################################ | ||
# Example Changelog File | ||
# | ||
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. | ||
# | ||
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) | ||
# When it is, any changes listed below will disappear. | ||
# | ||
# Valid Prefixes: | ||
# bugfix | ||
# wip (For works in progress) | ||
# tweak | ||
# soundadd | ||
# sounddel | ||
# rscadd (general adding of nice things) | ||
# rscdel (general deleting of nice things) | ||
# imageadd | ||
# imagedel | ||
# maptweak | ||
# spellcheck (typo fixes) | ||
# experiment | ||
# balance | ||
################################# | ||
|
||
# Your name. | ||
author: dapocalypse | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. DO NOT EDIT There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It´s now a different file |
||
|
||
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. | ||
delete-after: True | ||
|
||
# Any changes you've made. See valid prefix list above. | ||
# INDENT WITH TWO SPACES. NOT TABS. SPACES. | ||
# SCREW THIS UP AND IT WON'T WORK. | ||
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. | ||
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. | ||
changes: | ||
- rscadd: "Added a password protection system for files on modular computers." |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think
file '[filename]'
is a bit redundant. What are you going to be accessing that isn't a file?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Imho its fine.
Maybe remove just the "file"
So its only:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You're misunderstanding what I'm suggesting. Just removing the word 'file' is fine, so that it's
Please enter a password to access 'foo':
, or similar.