Skip to content

Add feature to return only non-expired entries #304

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

Merged
pfn merged 5 commits into from
Mar 7, 2017
Merged

Add feature to return only non-expired entries #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ff1cfc3
adds feature to prevent returning expired entries
schrauger Mar 7, 2017
b73ab0d
fixes expire handler
schrauger Mar 7, 2017
a92b335
plugin compiled with new expire check feature
schrauger Mar 7, 2017
07ea5ab
removes plgx from branch
schrauger Mar 7, 2017
eaa21bd
fixes indent (change tab to space)
schrauger Mar 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed KeePassHttp.plgx
View file
Open in desktop
Binary file not shown.
6 changes: 6 additions & 0 deletions KeePassHttp/ConfigOpt.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public class ConfigOpt
const string AlwaysAllowAccessKey = "KeePassHttp_AlwaysAllowAccess";
const string AlwaysAllowUpdatesKey = "KeePassHttp_AlwaysAllowUpdates";
const string SearchInAllOpenedDatabasesKey = "KeePassHttp_SearchInAllOpenedDatabases";
const string HideExpiredKey = "KeePassHttp_HideExpired";
const string MatchSchemesKey = "KeePassHttp_MatchSchemes";
const string ReturnStringFieldsKey = "KeePassHttp_ReturnStringFields";
const string ReturnStringFieldsWithKphOnlyKey = "KeePassHttp_ReturnStringFieldsWithKphOnly";
Expand Down Expand Up @@ -59,6 +60,11 @@ public bool SearchInAllOpenedDatabases
set { _config.SetBool(SearchInAllOpenedDatabasesKey, value); }
}

public bool HideExpired
{
get { return _config.GetBool(HideExpiredKey, false); }
set { _config.SetBool(HideExpiredKey, value); }
}
public bool MatchSchemes
{
get { return _config.GetBool(MatchSchemesKey, false); }
Expand Down
17 changes: 17 additions & 0 deletions KeePassHttp/Handlers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,23 @@ private IEnumerable<PwEntryDatabase> FindMatchingEntries(Request r, Aes aes)
result = from e in result where filterSchemes(e.entry) select e;
}

Func<PwEntry, bool> hideExpired = delegate(PwEntry e)
{
DateTime dtNow = DateTime.UtcNow;

if(e.Expires && (e.ExpiryTime <= dtNow))
{
return false;
}

return true;
};

if (configOpt.HideExpired)
{
result = from e in result where hideExpired(e.entry) select e;
}

return result;
}

Expand Down
27 changes: 20 additions & 7 deletions KeePassHttp/OptionsForm.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions KeePassHttp/OptionsForm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ private void OptionsForm_Load(object sender, EventArgs e)
credAllowAccessCheckbox.Checked = _config.AlwaysAllowAccess;
credAllowUpdatesCheckbox.Checked = _config.AlwaysAllowUpdates;
credSearchInAllOpenedDatabases.Checked = _config.SearchInAllOpenedDatabases;
hideExpiredCheckbox.Checked = _config.HideExpired;
matchSchemesCheckbox.Checked = _config.MatchSchemes;
returnStringFieldsCheckbox.Checked = _config.ReturnStringFields;
returnStringFieldsWithKphOnlyCheckBox.Checked = _config.ReturnStringFieldsWithKphOnly;
Expand All @@ -60,6 +61,7 @@ private void okButton_Click(object sender, EventArgs e)
_config.AlwaysAllowAccess = credAllowAccessCheckbox.Checked;
_config.AlwaysAllowUpdates = credAllowUpdatesCheckbox.Checked;
_config.SearchInAllOpenedDatabases = credSearchInAllOpenedDatabases.Checked;
_config.HideExpired = hideExpiredCheckbox.Checked;
_config.MatchSchemes = matchSchemesCheckbox.Checked;
_config.ReturnStringFields = returnStringFieldsCheckbox.Checked;
_config.ReturnStringFieldsWithKphOnly = returnStringFieldsWithKphOnlyCheckBox.Checked;
Expand Down