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.

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

Known devices #403

Open
wants to merge 60 commits into
base: master
Choose a base branch
from
Open

Commits on Nov 27, 2015

  1. Remove UCIContainer.listOptions

    The code has been simplified by replacing the use of
    UCIContain.listOptions with checks to see if (UCIContainer.value
    instanceof Array). Also bugs identified and fixed.
    
    Background. While implementing new functionality to store uci list
    values, problems were encountered. While UCIContainer.set() accomodated
    for uci list values using UCIContainer.listOptions,
    UCIContainer.getScriptCommands() did not refer to
    UCIContainer.listOptions and did not return the correct commands to set
    uci list values. While investigating and correcting this problem,
    various other corrections and simplifications were undertaken.
    
    UCIContainer.set() is recoded
    UCIContainer.listOptions is replaced with instanceof Array checks
    UCIContainer.values is declared as an Object rather than an Array
    UCIContainer.clone() corrected clone of Array values
    nworbnhoj committed Nov 27, 2015
    Configuration menu
    Copy the full SHA
    fe38cc7 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2015

  1. resolve conflict

    nworbnhoj committed Nov 28, 2015
    Configuration menu
    Copy the full SHA
    a129734 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2015

  1. bugfix add new key

    nworbnhoj committed Nov 29, 2015
    Configuration menu
    Copy the full SHA
    7df3c0c View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2015

  1. Remove UCIContainer.keys

    The code has been made more simple and robust by removing the need to
    maintain keys separately.
    
    The use of keys[] has been replaced by tests on
    values.hasOwnProperty(key) as recommended at:
    http://stackoverflow.com/questions/11040472/check-if-object-property-
    exists-using-a-variable#11040508
    nworbnhoj committed Nov 30, 2015
    Configuration menu
    Copy the full SHA
    92a0def View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2015

  1. Remove UCIContainer.keys

    The code has been made more simple and robust by removing the need to
    maintain keys separately.
    
    The use of keys[] has been replaced by tests on
    values.hasOwnProperty(key) as recommended at:
    http://stackoverflow.com/questions/11040472/check-if-object-property-
    exists-using-a-variable#11040508
    nworbnhoj committed Dec 1, 2015
    Configuration menu
    Copy the full SHA
    c41a186 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2015

  1. Rough-cut Device Group implementation

    device.sh is implemented to enable DeviceNames to be associated with one
    or more MACs, and to enable DeviceNames to be assigned to Device Groups.
    nworbnhoj committed Dec 2, 2015
    Configuration menu
    Copy the full SHA
    30aaad8 View commit details
    Browse the repository at this point in the history
  2. fix i18n implementation

    completed the initial i18n implementation in devices.sh
    nworbnhoj committed Dec 2, 2015
    Configuration menu
    Copy the full SHA
    66952b8 View commit details
    Browse the repository at this point in the history
  3. Add device.sh to Gargoyle Menu

    Gargoyle - Connections - Devices
    nworbnhoj committed Dec 2, 2015
    Configuration menu
    Copy the full SHA
    00e00fb View commit details
    Browse the repository at this point in the history
  4. Implement SaveChanges & validate GroupName

    rename SelectMAC
    validate GroupName
    implement Save Changes to uci
    nworbnhoj committed Dec 2, 2015
    Configuration menu
    Copy the full SHA
    2333052 View commit details
    Browse the repository at this point in the history
  5. Bugfix extra }

    would have been nice if a extra } at the end of .js would generate a
    warning!
    nworbnhoj committed Dec 2, 2015
    Configuration menu
    Copy the full SHA
    b67a125 View commit details
    Browse the repository at this point in the history
  6. Bump dosfstools 3.0.28

    dosfstools 3.0.27 not found in repositories
    nworbnhoj committed Dec 2, 2015
    Configuration menu
    Copy the full SHA
    efae785 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2015

  1. Create README.md

    nworbnhoj committed Dec 3, 2015
    Configuration menu
    Copy the full SHA
    f1829c4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a3ae34c View commit details
    Browse the repository at this point in the history
  3. Bug Fix

    Remove missed reference to keys
    nworbnhoj committed Dec 3, 2015
    Configuration menu
    Copy the full SHA
    ad9eda6 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    99a10fe View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2015

  1. Bug fix

    To resolve a mess
    nworbnhoj committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    45eb832 View commit details
    Browse the repository at this point in the history
  2. Add blank uci file: known

    nworbnhoj committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    403d641 View commit details
    Browse the repository at this point in the history
  3. Various tidyup & bug fix

    - various js tidy-up and bug fix
    - correct device lable
    - css layout for device & group table columns
    nworbnhoj committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    5ef607b View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2015

  1. Implement Edit & Remove Buttons

    The Edit Button is done a little differently than std Gargoyle. In
    std Gargoyle the Edit Button pops up and populates a form for editing.
    Here, the Edited Row is Removed and the fields in the ADD form are
    populated with the existing info so that the user can adjust and re-add.
    This approach seems intuitive for the User and makes the JS code simpler
    and smaller. If editing a really large table then the User may be
    confused when the row dissapears while not being able to see the Add Row
    at the top?
    nworbnhoj committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    7469eb6 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2015

  1. Integrate Device Groups into Quotas page

    The Gagoyle admin can use a Device Group to define a Quota by selecting
    "Only the following Host(s) and providing an IP, or IP range, or a Device
    Group. The Group can be selected or entered manually and it is validated
    an saved thru the existing processes. The Device Group MACs are included
    in the validation to avoid quota overlaps involving MACs.
    
    To integrate the MACs validation, the groupsValid parameter was added to
    the function addAddressStringToTable() and this cascaded small
    adjustments to other JavaScript files which called this function.
    nworbnhoj committed Dec 6, 2015
    Configuration menu
    Copy the full SHA
    434387a View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2015

  1. uci dhcp

    Move uci configuration from known to dhcp
    nworbnhoj committed Dec 10, 2015
    Configuration menu
    Copy the full SHA
    b523cba View commit details
    Browse the repository at this point in the history
  2. Implement ipsets for Device Groups

    Each Device Group is reflected by an ipset of the same name. The ipset
    is utilised in iptables to implement quota policy for a Device Group. IP
    addresses are added and deleted from ipsets when a new dhcp lease is
    assigned by setting dhcp.dnsmasq.dhcp_script
    nworbnhoj committed Dec 10, 2015
    Configuration menu
    Copy the full SHA
    5bf6f4a View commit details
    Browse the repository at this point in the history
  3. Add dnsmasq.conf

    The dnsmasq dhcp-script is not available thru OpenWRT uci but it is
    possible to suppliment the uci settings with /etc/dnsmasq.conf
    https://wiki.openwrt.org/doc/uci/dhcp?&#using_plain_dnsmasqconf
    nworbnhoj committed Dec 10, 2015
    Configuration menu
    Copy the full SHA
    4b6fb90 View commit details
    Browse the repository at this point in the history
  4. Remove /etc/config/known

    nworbnhoj committed Dec 10, 2015
    Configuration menu
    Copy the full SHA
    03a93d9 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    3ed0a79 View commit details
    Browse the repository at this point in the history
  6. Improve refresh of Tables & Selects

    - Reset all tables & selects after Save
    - Add new Devices & Groups to Select Options while editing
    nworbnhoj committed Dec 10, 2015
    Configuration menu
    Copy the full SHA
    67ac871 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2015

  1. Configuration menu
    Copy the full SHA
    e97058a View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2015

  1. Bug fixes

    nworbnhoj committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    c53e308 View commit details
    Browse the repository at this point in the history
  2. Update README.md

    nworbnhoj committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    b5adb55 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2015

  1. Bug fix

    Only first Quota assigned to a Device Group was being translated into
    iptable rules. Fixed
    nworbnhoj committed Dec 16, 2015
    Configuration menu
    Copy the full SHA
    20a6974 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a476848 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    376063d View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2015

  1. Implement Device Groups into Firewall Restrictions

    Gargoyle Firewall Access Restrictions & Whitelist can now accept Device
    Groups
    
    A number of functions were broken out from restore_quotas.c into a new
    file uci-util.c to make them available to make_iptable_rules.c. This
    also required a change to the Makefile and uci_util.h
    
    The uci_context was introduced as a parameter to a number of functions
    in make_iptable_rules.c to ensure only a single call to
    uci_alloc_context().
    
    function resetGroupsOptions() was moved from quotas.js to common.js to
    make it readily available across Gargoyle GUI.
    nworbnhoj committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    6bc349a View commit details
    Browse the repository at this point in the history
  2. Remove duplicate code

    Duplicate (or improved) versions of these functions exist in common.js
    nworbnhoj committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    bd5fddc View commit details
    Browse the repository at this point in the history
  3. Minor renaming

    nworbnhoj committed Dec 18, 2015
    Configuration menu
    Copy the full SHA
    2a94a5f View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2015

  1. Implement Device Groups for QoS

    Gargoyle QoS Classification rules can now accept Device Groups
    nworbnhoj committed Dec 19, 2015
    Configuration menu
    Copy the full SHA
    fb0b5c9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3745514 View commit details
    Browse the repository at this point in the history
  3. Bugfix testAddrOverlap

    nworbnhoj committed Dec 19, 2015
    Configuration menu
    Copy the full SHA
    5b866da View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ae08937 View commit details
    Browse the repository at this point in the history

Commits on Jan 1, 2016

  1. Configuration menu
    Copy the full SHA
    1d6f1bc View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2016

  1. Configuration menu
    Copy the full SHA
    be62450 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2016

  1. Configuration menu
    Copy the full SHA
    1c21f95 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9540eaa View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    35718cd View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    74237e7 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2016

  1. Replace StaticIP fieldset with Known Devices Fieldset

    The Known Devices fieldset can associate a host name with a MAC address
    and optionally assign a static IP address
    nworbnhoj committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    710d575 View commit details
    Browse the repository at this point in the history
  2. Bugfix typo

    nworbnhoj committed Jan 14, 2016
    Configuration menu
    Copy the full SHA
    44d6498 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2016

  1. Remove redundant entries from hosts and ethers

    The Known Devices table is populated with entries from uci and from
    /etc/ethers & /etc/hosts. When the user Saves Changes then all devices
    are saved into uci and /etc/ethers & /etc/hosts are recreated without
    redundant entries.
    nworbnhoj committed Jan 15, 2016
    Configuration menu
    Copy the full SHA
    6747567 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2016

  1. Add a UCI dnsmasq networkid for each Device Group

    An OpenWRT patch is backported to
    "Allow UCI dhcp classifier to accept a list of MAC"
    https://patchwork.ozlabs.org/patch/569678/
    
    Recording each Device Group additionally as a uci dhcp mac classifier
    enables the utilization of the dnsmasq --dhcp-option and makes 3
    functions in common.js redundant.
    https://wiki.openwrt.org/doc/uci/dhcp#classifying_clients_and_assigning_individual_options
    http://www.thekelleys.org.uk/dnsmasq/docs/dnsmasq-man.html
    nworbnhoj committed Jan 20, 2016
    Configuration menu
    Copy the full SHA
    5f5f543 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2016

  1. Retrieve WOL candidates from uci

    Potential Wake On Lan hosts are now drawn from the uci system first
    before drawing from arp, dhcp.leases and ethers
    nworbnhoj committed Jan 22, 2016
    Configuration menu
    Copy the full SHA
    4327503 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2016

  1. Merge branch 'master' of https://github.com/ericpaulbishop/gargoyle i…

    …nto known-devices
    
    resolved conflicts:
    	package/gargoyle/files/www/js/dhcp.js
    nworbnhoj committed Jan 23, 2016
    Configuration menu
    Copy the full SHA
    dbe7b60 View commit details
    Browse the repository at this point in the history
  2. Bugfix typo

    nworbnhoj committed Jan 23, 2016
    Configuration menu
    Copy the full SHA
    8cfc235 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2016

  1. Bugfix typo

    nworbnhoj committed Jan 24, 2016
    Configuration menu
    Copy the full SHA
    2e8c85b View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2016

  1. French Translations for Known Devices & Groups

    Thank you lyrz
    nworbnhoj committed Jan 26, 2016
    Configuration menu
    Copy the full SHA
    96a1399 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2016

  1. Show valid characters for Device and Group names

    The restiction on the Device and Group names are different (based on uci
    and ipset respectively) and a little confusing so it is important to
    guide the user.
    nworbnhoj committed Feb 8, 2016
    Configuration menu
    Copy the full SHA
    eb8d437 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2016

  1. Simplified Chinese Translations for Known Devices & Groups

    thank you ericwong
    nworbnhoj committed Feb 11, 2016
    Configuration menu
    Copy the full SHA
    256923f View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2016

  1. Merge branch 'master' of https://github.com/ericpaulbishop/gargoyle i…

    …nto known-devices
    
    Resolved Conflicts:
    	package/plugin-gargoyle-i18n-English-EN/files/www/i18n/English-
    EN/strings.js
    nworbnhoj committed Feb 28, 2016
    Configuration menu
    Copy the full SHA
    c215bf4 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2016

  1. Merge branch 'master' of https://github.com/ericpaulbishop/gargoyle i…

    …nto known-devices
    
    Resolved Conflicts:
    	package/gargoyle/files/www/dhcp.sh
    	package/gargoyle/files/www/js/common.js
    	package/gargoyle/files/www/js/dhcp.js
    	package/gargoyle/files/www/js/qos.js
    	package/gargoyle/files/www/js/quotas.js
    	package/gargoyle/files/www/quotas.sh
    nworbnhoj committed Mar 2, 2016
    Configuration menu
    Copy the full SHA
    e930b3d View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2016

  1. Bugfix save known device group

    Corrected and strengthened saveChanges() to handle whitespace properly
    and reject unknown host names
    nworbnhoj committed Mar 5, 2016
    Configuration menu
    Copy the full SHA
    6e1bb82 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2016

  1. Configuration menu
    Copy the full SHA
    3233e46 View commit details
    Browse the repository at this point in the history