diff --git a/Core/build.xml b/Core/build.xml index c8a8aefadb..d111d640c9 100644 --- a/Core/build.xml +++ b/Core/build.xml @@ -54,6 +54,11 @@ + + + + + diff --git a/Core/manifest.mf b/Core/manifest.mf index 00681f3e7f..0f9b4579f6 100644 --- a/Core/manifest.mf +++ b/Core/manifest.mf @@ -2,7 +2,7 @@ Manifest-Version: 1.0 OpenIDE-Module: org.sleuthkit.autopsy.core/10 OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/core/Bundle.properties OpenIDE-Module-Layer: org/sleuthkit/autopsy/core/layer.xml -OpenIDE-Module-Implementation-Version: 31 +OpenIDE-Module-Implementation-Version: 32 OpenIDE-Module-Requires: org.openide.windows.WindowManager AutoUpdate-Show-In-Client: true AutoUpdate-Essential-Module: true diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties index 0340d16d32..1ec55b9283 100644 --- a/Core/nbproject/project.properties +++ b/Core/nbproject/project.properties @@ -139,5 +139,5 @@ nbm.homepage=http://www.sleuthkit.org/ nbm.module.author=Brian Carrier nbm.needs.restart=true source.reference.curator-recipes-2.8.0.jar=release/modules/ext/curator-recipes-2.8.0-sources.jar -spec.version.base=10.19 +spec.version.base=10.20 diff --git a/Core/src/org/sleuthkit/autopsy/actions/AddTagAction.java b/Core/src/org/sleuthkit/autopsy/actions/AddTagAction.java index 53cf076c2e..9c059205f5 100644 --- a/Core/src/org/sleuthkit/autopsy/actions/AddTagAction.java +++ b/Core/src/org/sleuthkit/autopsy/actions/AddTagAction.java @@ -1,7 +1,7 @@ /* * Autopsy Forensic Browser * - * Copyright 2011-2019 Basis Technology Corp. + * Copyright 2013-2020 Basis Technology Corp. * Contact: carrier sleuthkit org * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -139,7 +139,7 @@ abstract class AddTagAction extends AbstractAction implements Presenter.Popup { if (!tagNamesMap.isEmpty()) { for (Map.Entry entry : tagNamesMap.entrySet()) { TagName tagName = entry.getValue(); - TagSet tagSet = tagName.getTagSet(); + TagSet tagSet = tagsManager.getTagSet(tagName); // Show custom tags before predefined tags in the menu if (tagSet != null) { diff --git a/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java b/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java index ba586c7b22..a0c3b1c5c0 100644 --- a/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java +++ b/Core/src/org/sleuthkit/autopsy/actions/GetTagNameAndCommentDialog.java @@ -1,7 +1,7 @@ /* * Autopsy Forensic Browser * - * Copyright 2011-2018 Basis Technology Corp. + * Copyright 2013-2020 Basis Technology Corp. * Contact: carrier sleuthkit org * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,7 +23,6 @@ import java.awt.Window; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; import java.util.ArrayList; -import java.util.HashMap; import java.util.logging.Level; import java.util.List; import java.util.Map; @@ -36,7 +35,6 @@ import javax.swing.JComponent; import javax.swing.JDialog; import javax.swing.JList; import javax.swing.KeyStroke; -import org.openide.util.Exceptions; import org.openide.util.NbBundle; import org.openide.windows.WindowManager; import org.sleuthkit.autopsy.casemodule.Case; @@ -150,7 +148,7 @@ public class GetTagNameAndCommentDialog extends JDialog { } ); - try { + try { TagsManager tagsManager = Case.getCurrentCaseThrows().getServices().getTagsManager(); List standardTagNames = TagsManager.getStandardTagNames(); Map tagNamesMap = new TreeMap<>(tagsManager.getDisplayNamesToTagNamesMap()); @@ -161,7 +159,7 @@ public class GetTagNameAndCommentDialog extends JDialog { tagNamesMap.entrySet().stream().map((entry) -> entry.getValue()).forEachOrdered((tagName) -> { TagSet tagSet = null; try { - tagSet = tagName.getTagSet(); + tagSet = tagsManager.getTagSet(tagName); } catch (TskCoreException ex) { Logger.getLogger(GetTagNameAndCommentDialog.class .getName()).log(Level.SEVERE, "Failed to get tag set", ex); //NON-NLS diff --git a/Core/src/org/sleuthkit/autopsy/actions/ReplaceTagAction.java b/Core/src/org/sleuthkit/autopsy/actions/ReplaceTagAction.java index 91929db577..34ed836e3e 100644 --- a/Core/src/org/sleuthkit/autopsy/actions/ReplaceTagAction.java +++ b/Core/src/org/sleuthkit/autopsy/actions/ReplaceTagAction.java @@ -1,7 +1,7 @@ /* * Autopsy Forensic Browser * - * Copyright 2018 Basis Technology Corp. + * Copyright 2018-2020 Basis Technology Corp. * Contact: carrier sleuthkit org * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -131,7 +131,7 @@ abstract class ReplaceTagAction extends AbstractAction implements if (!tagNamesMap.isEmpty()) { for (Map.Entry entry : tagNamesMap.entrySet()) { TagName tagName = entry.getValue(); - TagSet tagSet = tagName.getTagSet(); + TagSet tagSet = tagsManager.getTagSet(tagName); // Show custom tags before predefined tags in the menu if (tagSet != null) { diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/services/TagsManager.java b/Core/src/org/sleuthkit/autopsy/casemodule/services/TagsManager.java index 746bac478c..1a9b2e792d 100755 --- a/Core/src/org/sleuthkit/autopsy/casemodule/services/TagsManager.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/services/TagsManager.java @@ -1,7 +1,7 @@ /* * Autopsy Forensic Browser * - * Copyright 2011-2020 Basis Technology Corp. + * Copyright 2013-2020 Basis Technology Corp. * Contact: carrier sleuthkit org * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -56,7 +56,7 @@ public class TagsManager implements Closeable { private final SleuthkitCase caseDb; private static String DEFAULT_TAG_SET_NAME = "Project VIC"; - + private static final Object lock = new Object(); static { @@ -235,16 +235,16 @@ public class TagsManager implements Closeable { public static String getNotableTagDisplayName() { return TagNameDefinition.getNotableTagDisplayName(); } - + /** * Creates a new TagSetDefinition file. - * + * * @param tagSetDef The tag set definition. - * - * @throws IOException + * + * @throws IOException */ public static void addTagSetDefinition(TagSetDefinition tagSetDef) throws IOException { - synchronized(lock) { + synchronized (lock) { TagSetDefinition.writeTagSetDefinition(tagSetDef); } } @@ -267,20 +267,20 @@ public class TagsManager implements Closeable { caseDb.addOrUpdateTagName(def.getDisplayName(), def.getDescription(), def.getColor(), def.getKnownStatus()); } //Assume new case and add tag sets - for(TagSetDefinition setDef: TagSetDefinition.readTagSetDefinitions()) { + for (TagSetDefinition setDef : TagSetDefinition.readTagSetDefinitions()) { List tagNameList = new ArrayList<>(); - for(TagNameDefinition tagNameDef: setDef.getTagNameDefinitions()) { + for (TagNameDefinition tagNameDef : setDef.getTagNameDefinitions()) { tagNameList.add(caseDb.addOrUpdateTagName(tagNameDef.getDisplayName(), tagNameDef.getDescription(), tagNameDef.getColor(), tagNameDef.getKnownStatus())); } - - if(!tagNameList.isEmpty()) { + + if (!tagNameList.isEmpty()) { taggingMgr.addTagSet(setDef.getName(), tagNameList); } } } } catch (TskCoreException ex) { LOGGER.log(Level.SEVERE, "Error updating standard tag name and tag set definitions", ex); - } catch(IOException ex) { + } catch (IOException ex) { LOGGER.log(Level.SEVERE, "Error loading tag set JSON files", ex); } @@ -288,28 +288,41 @@ public class TagsManager implements Closeable { tagName.saveToCase(caseDb); } } - + /** * Get a list of all tag sets currently in the case database. - * + * * @return A list, possibly empty, of TagSet objects. - * + * * @throws TskCoreException */ public List getAllTagSets() throws TskCoreException { return caseDb.getTaggingManager().getTagSets(); } - + + /** + * Gets the tag set a tag name (tag definition) belongs to, if any. + * + * @param tagName The tag name. + * + * @return A TagSet object or null. + * + * @throws TskCoreException If there is an error querying the case database. + */ + public TagSet getTagSet(TagName tagName) throws TskCoreException { + return caseDb.getTaggingManager().getTagSet(tagName); + } + /** * Add a new TagSet to the case database. Tags will be ranked in the order * which they are passed to this method. - * - * @param name Tag set name. + * + * @param name Tag set name. * @param tagNameList List of TagName in rank order. - * + * * @return A new TagSet object. - * - * @throws TskCoreException + * + * @throws TskCoreException */ public TagSet addTagSet(String name, List tagNameList) throws TskCoreException { return caseDb.getTaggingManager().addTagSet(name, tagNameList); @@ -501,7 +514,7 @@ public class TagsManager implements Closeable { * name to the case database. */ public TagName addTagName(String displayName, String description, TagName.HTML_COLOR color, TskData.FileKnown knownStatus) throws TagNameAlreadyExistsException, TskCoreException { - synchronized(lock) { + synchronized (lock) { try { TagName tagName = caseDb.addOrUpdateTagName(displayName, description, color, knownStatus); Set customTypes = TagNameDefinition.getTagNameDefinitions(); diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/Bundle.properties b/Core/src/org/sleuthkit/autopsy/centralrepository/Bundle.properties index 1c7e6c2d7e..37d4c54c72 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/Bundle.properties @@ -1,9 +1,9 @@ OpenIDE-Module-Name=Central Repository OpenIDE-Module-Display-Category=Ingest Module -OpenIDE-Module-Short-Description=Correlation Engine Ingest Module +OpenIDE-Module-Short-Description=Central Repository Ingest Module OpenIDE-Module-Long-Description=\ - Correlation Engine ingest module and central database. \n\n\ - The Correlation Engine ingest module stores attributes of artifacts matching selected correlation types into a central database.\n\ + Central Repository ingest module and central database. \n\n\ + The Central Repository ingest module stores attributes of artifacts matching selected correlation types into a central database.\n\ Stored attributes are used in future cases to correlate and analyzes files and artifacts during ingest. CentralRepoCommentDialog.commentLabel.text=Comment: CentralRepoCommentDialog.okButton.text=&OK diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/centralrepository/Bundle.properties-MERGED index 007af703c5..b4f7f835ef 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/Bundle.properties-MERGED @@ -4,10 +4,10 @@ AddEditCentralRepoCommentAction.menuItemText.addEditCentralRepoCommentNoMD5=Add/ CentralRepoCommentDialog.title.addEditCentralRepoComment=Add/Edit Central Repository Comment OpenIDE-Module-Name=Central Repository OpenIDE-Module-Display-Category=Ingest Module -OpenIDE-Module-Short-Description=Correlation Engine Ingest Module +OpenIDE-Module-Short-Description=Central Repository Ingest Module OpenIDE-Module-Long-Description=\ - Correlation Engine ingest module and central database. \n\n\ - The Correlation Engine ingest module stores attributes of artifacts matching selected correlation types into a central database.\n\ + Central Repository ingest module and central database. \n\n\ + The Central Repository ingest module stores attributes of artifacts matching selected correlation types into a central database.\n\ Stored attributes are used in future cases to correlate and analyzes files and artifacts during ingest. CentralRepoCommentDialog.commentLabel.text=Comment: CentralRepoCommentDialog.okButton.text=&OK diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationDataSource.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationDataSource.java index ac17a1e962..92c23d77c8 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationDataSource.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationDataSource.java @@ -28,7 +28,7 @@ import org.sleuthkit.datamodel.TskDataException; /** * - * Stores information about a Data Source in the correlation engine + * Stores information about a Data Source in the Central Repository * */ public class CorrelationDataSource implements Serializable { diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/Persona.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/Persona.java index 502e4ddfbc..cc1b17ab80 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/Persona.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/Persona.java @@ -234,7 +234,7 @@ public class Persona { private static Persona createPersona(String name, String comment, PersonaStatus status) throws CentralRepoException { // generate a UUID for the persona String uuidStr = UUID.randomUUID().toString(); - CentralRepoExaminer examiner = CentralRepository.getInstance().getOrInsertExaminer(System.getProperty("user.name")); + CentralRepoExaminer examiner = getCRInstance().getOrInsertExaminer(System.getProperty("user.name")); Instant instant = Instant.now(); Long timeStampMillis = instant.toEpochMilli(); @@ -248,22 +248,22 @@ public class Persona { + examiner.getId() + ")"; - CentralRepository.getInstance().executeInsertSQL(insertClause); + getCRInstance().executeInsertSQL(insertClause); return getPersonaByUUID(uuidStr); } /** * Sets the comment of this persona. * - * @param name The new comment. + * @param comment The new comment. * * @throws CentralRepoException If there is an error. */ public void setComment(String comment) throws CentralRepoException { - String updateClause = "UPDATE personas SET comment = \"" + comment + "\" WHERE id = " + id; + String updateClause = "UPDATE personas SET comment = '" + comment + "' WHERE id = " + id; CentralRepository cr = CentralRepository.getInstance(); if (cr != null) { - cr.executeUpdateSQL(updateClause); + getCRInstance().executeUpdateSQL(updateClause); } } @@ -275,7 +275,7 @@ public class Persona { * @throws CentralRepoException If there is an error. */ public void setName(String name) throws CentralRepoException { - String updateClause = "UPDATE personas SET name = \"" + name + "\" WHERE id = " + id; + String updateClause = "UPDATE personas SET name = '" + name + "' WHERE id = " + id; CentralRepository cr = CentralRepository.getInstance(); if (cr != null) { cr.executeUpdateSQL(updateClause); @@ -313,7 +313,9 @@ public class Persona { /** * Modifies the confidence / justification of the given PersonaAccount * - * @param account account to modify + * @param account Account to modify. + * @param confidence Level of confidence. + * @param justification Justification. * * @throws CentralRepoException If there is an error in querying the * Personas table. @@ -329,7 +331,7 @@ public class Persona { String deleteSQL = "UPDATE personas SET status_id = " + PersonaStatus.DELETED.status_id + " WHERE id = " + this.id; CentralRepository cr = CentralRepository.getInstance(); if (cr != null) { - cr.executeDeleteSQL(deleteSQL); + cr.executeUpdateSQL(deleteSQL); } } @@ -395,7 +397,7 @@ public class Persona { + "WHERE p.uuid = '" + uuid + "'"; PersonaQueryCallback queryCallback = new PersonaQueryCallback(); - CentralRepository.getInstance().executeSelectSQL(queryClause, queryCallback); + getCRInstance().executeSelectSQL(queryClause, queryCallback); Collection personas = queryCallback.getPersonas(); @@ -420,7 +422,7 @@ public class Persona { " AND LOWER(p.name) LIKE " + "LOWER('%" + partialName + "%')" ; PersonaQueryCallback queryCallback = new PersonaQueryCallback(); - CentralRepository.getInstance().executeSelectSQL(queryClause, queryCallback); + getCRInstance().executeSelectSQL(queryClause, queryCallback); return queryCallback.getPersonas(); } @@ -485,7 +487,9 @@ public class Persona { /** * Modifies the given alias. * - * @param alias alias to modify + * @param key Key for the alias to modify. + * @param confidence Level of confidence. + * @param justification Justification. * * @throws CentralRepoException If there is an error in querying the * Personas table. @@ -535,7 +539,9 @@ public class Persona { /** * Modifies the given metadata. * - * @param metadata metadata to modify + * @param key Key for the metadata to modify. + * @param confidence Level of confidence. + * @param justification Justification. * * @throws CentralRepoException If there is an error in querying the * Personas table. @@ -580,7 +586,7 @@ public class Persona { while (resultSet.next()) { // get Case for case_id - CorrelationCase correlationCase = CentralRepository.getInstance().getCaseById(resultSet.getInt("case_id")); + CorrelationCase correlationCase = getCRInstance().getCaseById(resultSet.getInt("case_id")); correlationCases.add(correlationCase); } } @@ -605,14 +611,14 @@ public class Persona { Collection accounts = PersonaAccount.getAccountsForPersona(this.getId()); for (CentralRepoAccount account : accounts) { int corrTypeId = account.getAccountType().getCorrelationTypeId(); - CorrelationAttributeInstance.Type correlationType = CentralRepository.getInstance().getCorrelationTypeById(corrTypeId); + CorrelationAttributeInstance.Type correlationType = getCRInstance().getCorrelationTypeById(corrTypeId); String tableName = CentralRepoDbUtil.correlationTypeToInstanceTableName(correlationType); String querySql = "SELECT DISTINCT case_id FROM " + tableName + " WHERE account_id = " + account.getId(); CaseForAccountInstanceQueryCallback queryCallback = new CaseForAccountInstanceQueryCallback(); - CentralRepository.getInstance().executeSelectSQL(querySql, queryCallback); + getCRInstance().executeSelectSQL(querySql, queryCallback); // Add any cases that aren't already on the list. for (CorrelationCase corrCase : queryCallback.getCases()) { @@ -639,8 +645,8 @@ public class Persona { while (resultSet.next()) { // get Case for case_id - CorrelationCase correlationCase = CentralRepository.getInstance().getCaseById(resultSet.getInt("case_id")); - CorrelationDataSource correlationDatasource = CentralRepository.getInstance().getDataSourceById(correlationCase, resultSet.getInt("data_source_id")); + CorrelationCase correlationCase = getCRInstance().getCaseById(resultSet.getInt("case_id")); + CorrelationDataSource correlationDatasource = getCRInstance().getDataSourceById(correlationCase, resultSet.getInt("data_source_id")); // Add data source to list if not already on it. if (!correlationDataSources.stream().anyMatch(p -> Objects.equals(p.getDataSourceObjectID(), correlationDatasource.getDataSourceObjectID()))) { @@ -668,14 +674,14 @@ public class Persona { Collection accounts = PersonaAccount.getAccountsForPersona(this.getId()); for (CentralRepoAccount account : accounts) { int corrTypeId = account.getAccountType().getCorrelationTypeId(); - CorrelationAttributeInstance.Type correlationType = CentralRepository.getInstance().getCorrelationTypeById(corrTypeId); + CorrelationAttributeInstance.Type correlationType = getCRInstance().getCorrelationTypeById(corrTypeId); String tableName = CentralRepoDbUtil.correlationTypeToInstanceTableName(correlationType); String querySql = "SELECT case_id, data_source_id FROM " + tableName + " WHERE account_id = " + account.getId(); DatasourceForAccountInstanceQueryCallback queryCallback = new DatasourceForAccountInstanceQueryCallback(); - CentralRepository.getInstance().executeSelectSQL(querySql, queryCallback); + getCRInstance().executeSelectSQL(querySql, queryCallback); // Add any data sources that aren't already on the list. for (CorrelationDataSource correlationDatasource : queryCallback.getDataSources()) { @@ -738,7 +744,7 @@ public class Persona { private static String getPersonaFromInstanceTableQueryTemplate(CentralRepoAccount.CentralRepoAccountType crAccountType) throws CentralRepoException { int corrTypeId = crAccountType.getCorrelationTypeId(); - CorrelationAttributeInstance.Type correlationType = CentralRepository.getInstance().getCorrelationTypeById(corrTypeId); + CorrelationAttributeInstance.Type correlationType = getCRInstance().getCorrelationTypeById(corrTypeId); String instanceTableName = CentralRepoDbUtil.correlationTypeToInstanceTableName(correlationType); return "SELECT " + instanceTableName + ".account_id, case_id, data_source_id, " @@ -762,7 +768,7 @@ public class Persona { public static Collection getPersonasForCase(CorrelationCase correlationCase) throws CentralRepoException { Collection personaList = new ArrayList<>(); - Collection accountTypes = CentralRepository.getInstance().getAllAccountTypes(); + Collection accountTypes = getCRInstance().getAllAccountTypes(); for (CentralRepoAccount.CentralRepoAccountType crAccountType : accountTypes) { String querySql = getPersonaFromInstanceTableQueryTemplate(crAccountType) @@ -770,7 +776,7 @@ public class Persona { + "AND personas.status_id != " + Persona.PersonaStatus.DELETED.getStatusId(); PersonaFromAccountInstanceQueryCallback queryCallback = new PersonaFromAccountInstanceQueryCallback(); - CentralRepository.getInstance().executeSelectSQL(querySql, queryCallback); + getCRInstance().executeSelectSQL(querySql, queryCallback); // Add persona that aren't already on the list. for (Persona persona : queryCallback.getPersonasList()) { @@ -794,7 +800,7 @@ public class Persona { public static Collection getPersonasForDataSource(CorrelationDataSource dataSource) throws CentralRepoException { Collection personaList = new ArrayList<>(); - Collection accountTypes = CentralRepository.getInstance().getAllAccountTypes(); + Collection accountTypes = getCRInstance().getAllAccountTypes(); for (CentralRepoAccount.CentralRepoAccountType crAccountType : accountTypes) { String querySql = getPersonaFromInstanceTableQueryTemplate(crAccountType) @@ -802,7 +808,7 @@ public class Persona { + "AND personas.status_id != " + Persona.PersonaStatus.DELETED.getStatusId(); PersonaFromAccountInstanceQueryCallback queryCallback = new PersonaFromAccountInstanceQueryCallback(); - CentralRepository.getInstance().executeSelectSQL(querySql, queryCallback); + getCRInstance().executeSelectSQL(querySql, queryCallback); // Add persona that aren't already on the list. for (Persona persona : queryCallback.getPersonasList()) { @@ -814,4 +820,23 @@ public class Persona { } return personaList; } + + + /** + * Wraps the call to CentralRepository.getInstance() throwing an + * exception if instance is null; + * + * @return Instance of CentralRepository + * + * @throws CentralRepoException + */ + private static CentralRepository getCRInstance() throws CentralRepoException { + CentralRepository instance = CentralRepository.getInstance(); + + if(instance == null) { + throw new CentralRepoException("Failed to get instance of CentralRespository, CR was null"); + } + + return instance; + } } diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/PersonaAccount.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/PersonaAccount.java index efd8b76152..3a921dd483 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/PersonaAccount.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/PersonaAccount.java @@ -121,23 +121,18 @@ public class PersonaAccount { /** * Creates an account for the specified Persona. * - * @param persona Persona for which the account is being added. - * @param account Account. + * @param persona Persona for which the account is being added. + * @param account Account. * @param justification Reason for assigning the alias, may be null. - * @param confidence Confidence level. + * @param confidence Confidence level. * * @return PersonaAccount + * * @throws CentralRepoException If there is an error in creating the - * account. + * account. */ static PersonaAccount addPersonaAccount(Persona persona, CentralRepoAccount account, String justification, Persona.Confidence confidence) throws CentralRepoException { - CentralRepository cr = CentralRepository.getInstance(); - - if(cr == null) { - throw new CentralRepoException("Failed to add Persona, Central Repository is not enable"); - } - - CentralRepoExaminer currentExaminer = cr.getOrInsertExaminer(System.getProperty("user.name")); + CentralRepoExaminer currentExaminer = getCRInstance().getOrInsertExaminer(System.getProperty("user.name")); Instant instant = Instant.now(); Long timeStampMillis = instant.toEpochMilli(); @@ -151,14 +146,14 @@ public class PersonaAccount { + currentExaminer.getId() + ")"; - CentralRepository.getInstance().executeInsertSQL(insertClause); + getCRInstance().executeInsertSQL(insertClause); String queryClause = PERSONA_ACCOUNTS_QUERY_CLAUSE + "WHERE persona_id = " + persona.getId() + " AND account_type_id = " + account.getAccountType().getAccountTypeId() - + " AND account_unique_identifier = \"" + account.getIdentifier() + "\""; + + " AND account_unique_identifier = '" + account.getIdentifier() + "'"; PersonaAccountsQueryCallback queryCallback = new PersonaAccountsQueryCallback(); - CentralRepository.getInstance().executeSelectSQL(queryClause, queryCallback); + getCRInstance().executeSelectSQL(queryClause, queryCallback); Collection accounts = queryCallback.getPersonaAccountsList(); if (accounts.size() != 1) { @@ -203,7 +198,7 @@ public class PersonaAccount { ); // create account - CentralRepoAccount.CentralRepoAccountType crAccountType = CentralRepository.getInstance().getAccountTypeByName(rs.getString("type_name")); + CentralRepoAccount.CentralRepoAccountType crAccountType = getCRInstance().getAccountTypeByName(rs.getString("type_name")); CentralRepoAccount account = new CentralRepoAccount( rs.getInt("account_id"), crAccountType, @@ -249,19 +244,13 @@ public class PersonaAccount { * persona_account. */ static Collection getPersonaAccountsForPersona(long personaId) throws CentralRepoException { - CentralRepository cr = CentralRepository.getInstance(); + String queryClause = PERSONA_ACCOUNTS_QUERY_CLAUSE + + " WHERE persona_accounts.persona_id = " + personaId; - if (cr != null) { - String queryClause = PERSONA_ACCOUNTS_QUERY_CLAUSE - + " WHERE persona_accounts.persona_id = " + personaId; + PersonaAccountsQueryCallback queryCallback = new PersonaAccountsQueryCallback(); + getCRInstance().executeSelectSQL(queryClause, queryCallback); - PersonaAccountsQueryCallback queryCallback = new PersonaAccountsQueryCallback(); - cr.executeSelectSQL(queryClause, queryCallback); - - return queryCallback.getPersonaAccountsList(); - } - - return new ArrayList<>(); + return queryCallback.getPersonaAccountsList(); } /** @@ -279,16 +268,9 @@ public class PersonaAccount { + " WHERE persona_accounts.account_id = " + accountId + " AND personas.status_id != " + Persona.PersonaStatus.DELETED.getStatusId(); - CentralRepository cr = CentralRepository.getInstance(); - - if (cr != null) { - PersonaAccountsQueryCallback queryCallback = new PersonaAccountsQueryCallback(); - cr.executeSelectSQL(queryClause, queryCallback); - - return queryCallback.getPersonaAccountsList(); - } - - return new ArrayList<>(); + PersonaAccountsQueryCallback queryCallback = new PersonaAccountsQueryCallback(); + getCRInstance().executeSelectSQL(queryClause, queryCallback); + return queryCallback.getPersonaAccountsList(); } /** @@ -308,15 +290,10 @@ public class PersonaAccount { + " WHERE LOWER(accounts.account_unique_identifier) LIKE LOWER('%" + accountIdentifierSubstring + "%')" + " AND personas.status_id != " + Persona.PersonaStatus.DELETED.getStatusId(); - CentralRepository cr = CentralRepository.getInstance(); - if (cr != null) { - PersonaAccountsQueryCallback queryCallback = new PersonaAccountsQueryCallback(); - cr.executeSelectSQL(queryClause, queryCallback); + PersonaAccountsQueryCallback queryCallback = new PersonaAccountsQueryCallback(); + getCRInstance().executeSelectSQL(queryClause, queryCallback); + return queryCallback.getPersonaAccountsList(); - return queryCallback.getPersonaAccountsList(); - } - - return new ArrayList<>(); } /** @@ -335,14 +312,9 @@ public class PersonaAccount { + " AND type_name = '" + account.getAccountType().getTypeName() + "' " + " AND personas.status_id != " + Persona.PersonaStatus.DELETED.getStatusId(); - CentralRepository cr = CentralRepository.getInstance(); - if (cr != null) { - PersonaAccountsQueryCallback queryCallback = new PersonaAccountsQueryCallback(); - cr.executeSelectSQL(queryClause, queryCallback); - return queryCallback.getPersonaAccountsList(); - } - - return new ArrayList<>(); + PersonaAccountsQueryCallback queryCallback = new PersonaAccountsQueryCallback(); + getCRInstance().executeSelectSQL(queryClause, queryCallback); + return queryCallback.getPersonaAccountsList(); } /** @@ -351,36 +323,24 @@ public class PersonaAccount { * @param id row id for the account to be removed * * @throws CentralRepoException If there is an error in removing the - * account. + * account. */ static void removePersonaAccount(long id) throws CentralRepoException { - CentralRepository cr = CentralRepository.getInstance(); - - if(cr == null) { - throw new CentralRepoException("Failed to remove persona account, Central Repo is not enabled"); - } - String deleteClause = " DELETE FROM persona_accounts WHERE id = " + id; - cr.executeDeleteSQL(deleteClause); + getCRInstance().executeDeleteSQL(deleteClause); } - + /** * Modifies the PersonaAccount row by the given id * * @param id row id for the account to be removed * * @throws CentralRepoException If there is an error in removing the - * account. + * account. */ static void modifyPersonaAccount(long id, Persona.Confidence confidence, String justification) throws CentralRepoException { - CentralRepository cr = CentralRepository.getInstance(); - - if (cr == null) { - throw new CentralRepoException("Failed to modify persona account, Central Repo is not enabled"); - } - - String updateClause = "UPDATE persona_accounts SET confidence_id = " + confidence.getLevelId() + ", justification = \"" + justification + "\" WHERE id = " + id; - cr.executeUpdateSQL(updateClause); + String updateClause = "UPDATE persona_accounts SET confidence_id = " + confidence.getLevelId() + ", justification = '" + justification + "' WHERE id = " + id; + getCRInstance().executeUpdateSQL(updateClause); } /** @@ -397,7 +357,7 @@ public class PersonaAccount { while (rs.next()) { // create account - CentralRepoAccount.CentralRepoAccountType crAccountType = CentralRepository.getInstance().getAccountTypeByName(rs.getString("type_name")); + CentralRepoAccount.CentralRepoAccountType crAccountType = getCRInstance().getAccountTypeByName(rs.getString("type_name")); CentralRepoAccount account = new CentralRepoAccount( rs.getInt("account_id"), crAccountType, @@ -418,28 +378,41 @@ public class PersonaAccount { * @param personaId Id of the persona to look for. * * @return Collection of all accounts associated with the given persona, may - * be empty. + * be empty. + * * @throws CentralRepoException If there is an error in getting the - * accounts. + * accounts. */ static Collection getAccountsForPersona(long personaId) throws CentralRepoException { - CentralRepository cr = CentralRepository.getInstance(); + String queryClause = "SELECT account_id, " + + " accounts.account_type_id as account_type_id, accounts.account_unique_identifier as account_unique_identifier," + + " account_types.type_name as type_name " + + " FROM persona_accounts " + + " JOIN accounts as accounts on persona_accounts.account_id = accounts.id " + + " JOIN account_types as account_types on accounts.account_type_id = account_types.id " + + " WHERE persona_accounts.persona_id = " + personaId; - if (cr != null) { - String queryClause = "SELECT account_id, " - + " accounts.account_type_id as account_type_id, accounts.account_unique_identifier as account_unique_identifier," - + " account_types.type_name as type_name " - + " FROM persona_accounts " - + " JOIN accounts as accounts on persona_accounts.account_id = accounts.id " - + " JOIN account_types as account_types on accounts.account_type_id = account_types.id " - + " WHERE persona_accounts.persona_id = " + personaId; + AccountsForPersonaQueryCallback queryCallback = new AccountsForPersonaQueryCallback(); + getCRInstance().executeSelectSQL(queryClause, queryCallback); - AccountsForPersonaQueryCallback queryCallback = new AccountsForPersonaQueryCallback(); - cr.executeSelectSQL(queryClause, queryCallback); + return queryCallback.getAccountsList(); + } - return queryCallback.getAccountsList(); + /** + * Wraps the call to CentralRepository.getInstance() throwing an exception + * if instance is null; + * + * @return Instance of CentralRepository + * + * @throws CentralRepoException + */ + private static CentralRepository getCRInstance() throws CentralRepoException { + CentralRepository instance = CentralRepository.getInstance(); + + if (instance == null) { + throw new CentralRepoException("Failed to get instance of CentralRespository, CR was null"); } - return new ArrayList<>(); + return instance; } } diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/PersonaAlias.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/PersonaAlias.java index 421d8d0d9e..63fcb346b9 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/PersonaAlias.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/PersonaAlias.java @@ -98,7 +98,7 @@ public class PersonaAlias { */ static PersonaAlias addPersonaAlias(Persona persona, String alias, String justification, Persona.Confidence confidence) throws CentralRepoException { - CentralRepoExaminer examiner = CentralRepository.getInstance().getOrInsertExaminer(System.getProperty("user.name")); + CentralRepoExaminer examiner = getCRInstance().getOrInsertExaminer(System.getProperty("user.name")); Instant instant = Instant.now(); Long timeStampMillis = instant.toEpochMilli(); @@ -113,16 +113,16 @@ public class PersonaAlias { + examiner.getId() + ")"; - CentralRepository.getInstance().executeInsertSQL(insertClause); + getCRInstance().executeInsertSQL(insertClause); String queryClause = SELECT_QUERY_BASE + "WHERE pa.persona_id = " + persona.getId() - + " AND pa.alias = \"" + alias + "\"" + + " AND pa.alias = '" + alias + "'" + " AND pa.date_added = " + timeStampMillis + " AND pa.examiner_id = " + examiner.getId(); PersonaAliasesQueryCallback queryCallback = new PersonaAliasesQueryCallback(); - CentralRepository.getInstance().executeSelectSQL(queryClause, queryCallback); + getCRInstance().executeSelectSQL(queryClause, queryCallback); Collection aliases = queryCallback.getAliases(); if (aliases.size() != 1) { @@ -141,7 +141,7 @@ public class PersonaAlias { */ static void removePersonaAlias(PersonaAlias alias) throws CentralRepoException { String deleteClause = " DELETE FROM persona_alias WHERE id = " + alias.getId(); - CentralRepository.getInstance().executeDeleteSQL(deleteClause); + getCRInstance().executeDeleteSQL(deleteClause); } /** @@ -158,7 +158,7 @@ public class PersonaAlias { throw new CentralRepoException("Failed to modify persona alias, Central Repo is not enabled"); } - String updateClause = "UPDATE persona_alias SET confidence_id = " + confidence.getLevelId() + ", justification = \"" + justification + "\" WHERE id = " + alias.id; + String updateClause = "UPDATE persona_alias SET confidence_id = " + confidence.getLevelId() + ", justification = '" + justification + "' WHERE id = " + alias.id; cr.executeUpdateSQL(updateClause); } @@ -208,9 +208,26 @@ public class PersonaAlias { String queryClause = SELECT_QUERY_BASE + "WHERE pa.persona_id = " + personaId; PersonaAliasesQueryCallback queryCallback = new PersonaAliasesQueryCallback(); - CentralRepository.getInstance().executeSelectSQL(queryClause, queryCallback); + getCRInstance().executeSelectSQL(queryClause, queryCallback); return queryCallback.getAliases(); } + /** + * Wraps the call to CentralRepository.getInstance() throwing an + * exception if instance is null; + * + * @return Instance of CentralRepository + * + * @throws CentralRepoException + */ + private static CentralRepository getCRInstance() throws CentralRepoException { + CentralRepository instance = CentralRepository.getInstance(); + + if(instance == null) { + throw new CentralRepoException("Failed to get instance of CentralRespository, CR was null"); + } + + return instance; + } } diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/PersonaMetadata.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/PersonaMetadata.java index 667c332dbc..a3fc414730 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/PersonaMetadata.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/PersonaMetadata.java @@ -107,7 +107,7 @@ public class PersonaMetadata { */ static PersonaMetadata addPersonaMetadata(long personaId, String name, String value, String justification, Persona.Confidence confidence) throws CentralRepoException { - CentralRepoExaminer examiner = CentralRepository.getInstance().getOrInsertExaminer(System.getProperty("user.name")); + CentralRepoExaminer examiner = getCRInstance().getOrInsertExaminer(System.getProperty("user.name")); Instant instant = Instant.now(); Long timeStampMillis = instant.toEpochMilli(); @@ -123,17 +123,17 @@ public class PersonaMetadata { + examiner.getId() + ")"; - CentralRepository.getInstance().executeInsertSQL(insertClause); + getCRInstance().executeInsertSQL(insertClause); String queryClause = SELECT_QUERY_BASE + "WHERE pmd.persona_id = " + personaId - + " AND pmd.name = \"" + name + "\"" - + " AND pmd.value = \"" + value + "\"" + + " AND pmd.name = '" + name + "'" + + " AND pmd.value = '" + value + "'" + " AND pmd.date_added = " + timeStampMillis + " AND pmd.examiner_id = " + examiner.getId(); PersonaMetadataQueryCallback queryCallback = new PersonaMetadataQueryCallback(); - CentralRepository.getInstance().executeSelectSQL(queryClause, queryCallback); + getCRInstance().executeSelectSQL(queryClause, queryCallback); Collection metadata = queryCallback.getMetadataList(); if (metadata.size() != 1) { @@ -152,7 +152,7 @@ public class PersonaMetadata { */ static void removePersonaMetadata(PersonaMetadata metadata) throws CentralRepoException { String deleteClause = " DELETE FROM persona_metadata WHERE id = " + metadata.getId(); - CentralRepository.getInstance().executeDeleteSQL(deleteClause); + getCRInstance().executeDeleteSQL(deleteClause); } /** @@ -169,7 +169,7 @@ public class PersonaMetadata { throw new CentralRepoException("Failed to modify persona metadata, Central Repo is not enabled"); } - String updateClause = "UPDATE persona_metadata SET confidence_id = " + confidence.getLevelId() + ", justification = \"" + justification + "\" WHERE id = " + metadata.id; + String updateClause = "UPDATE persona_metadata SET confidence_id = " + confidence.getLevelId() + ", justification = '" + justification + "' WHERE id = " + metadata.id; cr.executeUpdateSQL(updateClause); } @@ -219,10 +219,27 @@ public class PersonaMetadata { String queryClause = SELECT_QUERY_BASE + "WHERE pmd.persona_id = " + personaId; PersonaMetadataQueryCallback queryCallback = new PersonaMetadataQueryCallback(); - CentralRepository.getInstance().executeSelectSQL(queryClause, queryCallback); + getCRInstance().executeSelectSQL(queryClause, queryCallback); return queryCallback.getMetadataList(); } + /** + * Wraps the call to CentralRepository.getInstance() throwing an + * exception if instance is null; + * + * @return Instance of CentralRepository + * + * @throws CentralRepoException + */ + private static CentralRepository getCRInstance() throws CentralRepoException { + CentralRepository instance = CentralRepository.getInstance(); + + if(instance == null) { + throw new CentralRepoException("Failed to get instance of CentralRespository, CR was null"); + } + + return instance; + } } diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/RdbmsCentralRepo.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/RdbmsCentralRepo.java index 165440af45..b550804421 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/RdbmsCentralRepo.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/RdbmsCentralRepo.java @@ -1679,7 +1679,7 @@ abstract class RdbmsCentralRepo implements CentralRepository { bulkArtifacts.get(tableName).clear(); } - TimingMetric timingMetric = HealthMonitor.getTimingMetric("Correlation Engine: Bulk insert"); + TimingMetric timingMetric = HealthMonitor.getTimingMetric("Central Repository: Bulk insert"); HealthMonitor.submitTimingMetric(timingMetric); // Reset state diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/Bundle.properties-MERGED index e3c99ded13..d4cca6c407 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/Bundle.properties-MERGED @@ -1,5 +1,5 @@ caseeventlistener.evidencetag=Evidence -IngestEventsListener.ingestmodule.name=Correlation Engine +IngestEventsListener.ingestmodule.name=Central Repository IngestEventsListener.prevCaseComment.text=Previous Case: # {0} - typeName # {1} - count diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/IngestEventsListener.java b/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/IngestEventsListener.java index d399fe4614..03fa640ca5 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/IngestEventsListener.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/IngestEventsListener.java @@ -73,7 +73,7 @@ import org.sleuthkit.datamodel.CommunicationsUtils; * Listen for ingest events and update entries in the Central Repository * database accordingly */ -@NbBundle.Messages({"IngestEventsListener.ingestmodule.name=Correlation Engine"}) +@NbBundle.Messages({"IngestEventsListener.ingestmodule.name=Central Repository"}) public class IngestEventsListener { private static final Logger LOGGER = Logger.getLogger(CorrelationAttributeInstance.class.getName()); @@ -116,24 +116,24 @@ public class IngestEventsListener { /** * Increase the number of IngestEventsListeners adding contents to the - * Correlation Engine. + * Central Repository. */ public synchronized static void incrementCorrelationEngineModuleCount() { - correlationModuleInstanceCount++; //Should be called once in the Correlation Engine module's startup method. + correlationModuleInstanceCount++; //Should be called once in the Central Repository module's startup method. } /** * Decrease the number of IngestEventsListeners adding contents to the - * Correlation Engine. + * Central Repository. */ public synchronized static void decrementCorrelationEngineModuleCount() { if (getCeModuleInstanceCount() > 0) { //prevent it ingestJobCounter from going negative - correlationModuleInstanceCount--; //Should be called once in the Correlation Engine module's shutdown method. + correlationModuleInstanceCount--; //Should be called once in the Central Repository module's shutdown method. } } /** - * Reset the counter which keeps track of if the Correlation Engine Module + * Reset the counter which keeps track of if the Central Repository Module * is being run during injest to 0. */ synchronized static void resetCeModuleInstanceCount() { @@ -141,10 +141,10 @@ public class IngestEventsListener { } /** - * Whether or not the Correlation Engine Module is enabled for any of the + * Whether or not the Central Repository Module is enabled for any of the * currently running ingest jobs. * - * @return boolean True for Correlation Engine enabled, False for disabled + * @return boolean True for Central Repository enabled, False for disabled */ public synchronized static int getCeModuleInstanceCount() { return correlationModuleInstanceCount; @@ -282,7 +282,7 @@ public class IngestEventsListener { @Override public void propertyChange(PropertyChangeEvent evt) { - //if ingest is running we want there to check if there is a Correlation Engine module running + //if ingest is running we want there to check if there is a Central Repository module running //sometimes artifacts are generated by DSPs or other sources while ingest is not running //in these cases we still want to create correlation attributesForNewArtifact for those artifacts when appropriate if (!IngestManager.getInstance().isIngestRunning() || getCeModuleInstanceCount() > 0) { @@ -349,7 +349,7 @@ public class IngestEventsListener { if (getCeModuleInstanceCount() == 0) { recentlyAddedCeArtifacts.clear(); } - //else another instance of the Correlation Engine Module is still being run. + //else another instance of the Central Repository Module is still being run. /* * Ensure the data source in the Central Repository has hash values diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/Bundle.properties-MERGED index 96a73954fa..46a2f01a64 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/Bundle.properties-MERGED @@ -1,6 +1,6 @@ CentralRepoIngestModel_name_header=Name:
CentralRepoIngestModel_previous_case_header=
Previous Cases:
-CentralRepoIngestModule.errorMessage.isNotEnabled=Central repository settings are not initialized, cannot run Correlation Engine ingest module. +CentralRepoIngestModule.errorMessage.isNotEnabled=Central repository settings are not initialized, cannot run Central Repository ingest module. CentralRepoIngestModule.notfyBubble.title=Central Repository Not Initialized CentralRepoIngestModule.prevCaseComment.text=Previous Case: CentralRepoIngestModule.prevTaggedSet.text=Previously Tagged As Notable (Central Repository) @@ -8,7 +8,7 @@ CentralRepoIngestModule_notable_message_header=A file in this data source # {0} - Name of file that is Notable CentralRepoIngestModule_postToBB_knownBadMsg=Notable: {0} CentralRepoIngestModuleFactory.ingestmodule.desc=Saves properties to the central repository for later correlation -CentralRepoIngestModuleFactory.ingestmodule.name=Correlation Engine +CentralRepoIngestModuleFactory.ingestmodule.name=Central Repository IngestSettingsPanel.ingestSettingsLabel.text=Ingest Settings IngestSettingsPanel.flagTaggedNotableItemsCheckbox.text=Flag items previously tagged as notable IngestSettingsPanel.flagPreviouslySeenDevicesCheckbox.text=Flag devices previously seen in other cases diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/CentralRepoIngestModule.java b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/CentralRepoIngestModule.java index 1f7472d330..a7c3bd41e0 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/CentralRepoIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/CentralRepoIngestModule.java @@ -85,7 +85,7 @@ final class CentralRepoIngestModule implements FileIngestModule { private final boolean createCorrelationProperties; /** - * Instantiate the Correlation Engine ingest module. + * Instantiate the Central Repository ingest module. * * @param settings The ingest settings for the module instance. */ @@ -147,7 +147,7 @@ final class CentralRepoIngestModule implements FileIngestModule { */ if (abstractFile.getKnown() != TskData.FileKnown.KNOWN && flagTaggedNotableItems) { try { - TimingMetric timingMetric = HealthMonitor.getTimingMetric("Correlation Engine: Notable artifact query"); + TimingMetric timingMetric = HealthMonitor.getTimingMetric("Central Repository: Notable artifact query"); List caseDisplayNamesList = dbManager.getListCasesHavingArtifactInstancesKnownBad(filesType, md5); HealthMonitor.submitTimingMetric(timingMetric); if (!caseDisplayNamesList.isEmpty()) { @@ -220,7 +220,7 @@ final class CentralRepoIngestModule implements FileIngestModule { // see ArtifactManagerTimeTester for details @Messages({ "CentralRepoIngestModule.notfyBubble.title=Central Repository Not Initialized", - "CentralRepoIngestModule.errorMessage.isNotEnabled=Central repository settings are not initialized, cannot run Correlation Engine ingest module." + "CentralRepoIngestModule.errorMessage.isNotEnabled=Central repository settings are not initialized, cannot run Central Repository ingest module." }) @Override public void startUp(IngestJobContext context) throws IngestModuleException { @@ -235,7 +235,7 @@ final class CentralRepoIngestModule implements FileIngestModule { * posited. * * Note: Flagging cannot be disabled if any other instances of the - * Correlation Engine module are running. This restriction is to prevent + * Central Repository module are running. This restriction is to prevent * missing results in the case where the first module is flagging * notable items, and the proceeding module (with flagging disabled) * causes the first to stop flagging. @@ -276,7 +276,7 @@ final class CentralRepoIngestModule implements FileIngestModule { // Don't allow sqlite central repo databases to be used for multi user cases if ((autopsyCase.getCaseType() == Case.CaseType.MULTI_USER_CASE) && (CentralRepoDbManager.getSavedDbChoice().getDbPlatform() == CentralRepoPlatforms.SQLITE)) { - logger.log(Level.SEVERE, "Cannot run correlation engine on a multi-user case with a SQLite central repository."); + logger.log(Level.SEVERE, "Cannot run Central Repository ingest module on a multi-user case with a SQLite central repository."); throw new IngestModuleException("Cannot run on a multi-user case with a SQLite central repository."); // NON-NLS } jobId = context.getJobId(); diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/CentralRepoIngestModuleFactory.java b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/CentralRepoIngestModuleFactory.java index 078c3a5ac9..1c34f1ffad 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/CentralRepoIngestModuleFactory.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/CentralRepoIngestModuleFactory.java @@ -33,7 +33,7 @@ import org.sleuthkit.autopsy.ingest.NoIngestModuleIngestJobSettings; * Factory for Central Repository ingest modules */ @ServiceProvider(service = org.sleuthkit.autopsy.ingest.IngestModuleFactory.class) -@NbBundle.Messages({"CentralRepoIngestModuleFactory.ingestmodule.name=Correlation Engine", +@NbBundle.Messages({"CentralRepoIngestModuleFactory.ingestmodule.name=Central Repository", "CentralRepoIngestModuleFactory.ingestmodule.desc=Saves properties to the central repository for later correlation"}) public class CentralRepoIngestModuleFactory extends IngestModuleFactoryAdapter { diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettings.java b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettings.java index c48f2811a0..52d645bcac 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettings.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettings.java @@ -21,7 +21,7 @@ package org.sleuthkit.autopsy.centralrepository.ingestmodule; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; /** - * Ingest job settings for the Correlation Engine module. + * Ingest job settings for the Central Repository module. */ final class IngestSettings implements IngestModuleIngestJobSettings { diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettingsPanel.java index 29e2d91253..befe405281 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/IngestSettingsPanel.java @@ -22,7 +22,7 @@ import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel; /** - * Ingest job settings panel for the Correlation Engine module. + * Ingest job settings panel for the Central Repository module. */ @SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives final class IngestSettingsPanel extends IngestModuleIngestJobSettingsPanel { diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties b/Core/src/org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties index 3535f3cd52..26463c8818 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties @@ -1,15 +1,6 @@ -CTL_OpenPersonaManager=Persona Manager -CTL_PersonaManagerTopComponentAction=Persona Manager +CTL_OpenPersonas=Personas +CTL_PersonasTopComponentAction=Personas CTL_PersonaDetailsTopComponent=Persona Details -PersonaManagerTopComponent.createBtn.text=New Persona -PersonaManagerTopComponent.searchBtn.text=Search -PersonaManagerTopComponent.resultsTable.columnModel.title1=Name -PersonaManagerTopComponent.resultsTable.columnModel.title0=ID -PersonaManagerTopComponent.resultsTable.toolTipText= -PersonaManagerTopComponent.searchAccountRadio.text=Account -PersonaManagerTopComponent.searchNameRadio.text=Name -PersonaManagerTopComponent.searchField.text= -PersonaManagerTopComponent.editBtn.text=Edit Persona PersonaDetailsDialog.cancelBtn.text=Cancel PersonaDetailsDialog.okBtn.text=OK PersonaDetailsPanel.casesLbl.text=Cases found in: @@ -27,7 +18,6 @@ PersonaDetailsPanel.nameLbl.text=Name: AddAliasDialog.accountsLbl.text=Account: AddAliasDialog.okBtn.text=OK AddAliasDialog.cancelBtn.text=Cancel -PersonaManagerTopComponent.deleteBtn.text=Delete Persona PersonaDetailsPanel.casesLbl.text=Cases found in: PersonaDetailsPanel.deleteAliasBtn.text=Delete PersonaDetailsPanel.addAliasBtn.text=Add @@ -73,3 +63,20 @@ PersonaMetadataDialog.cancelBtn.text=Cancel PersonaDetailsPanel.editAccountBtn.text=Edit PersonaDetailsPanel.editMetadataBtn.text=Edit PersonaDetailsPanel.editAliasBtn.text=Edit +PersonasTopComponent.searchAccountRadio.text=Account +PersonasTopComponent.searchNameRadio.text=Name +PersonasTopComponent.searchField.text= +PersonasTopComponent.deleteBtn.text=Delete Persona +PersonasTopComponent.editBtn.text=Edit Persona +PersonasTopComponent.createBtn.text=New Persona +PersonasTopComponent.createAccountBtn.text=Create Account +PersonasTopComponent.searchBtn.text=Search +PersonasTopComponent.resultsTable.columnModel.title1=Name +PersonasTopComponent.resultsTable.columnModel.title0=ID +PersonasTopComponent.resultsTable.toolTipText= +CreatePersonaAccountDialog.cancelBtn.text=Cancel +CreatePersonaAccountDialog.typeLbl.text=Type: +CreatePersonaAccountDialog.identifierTextField.text= +CreatePersonaAccountDialog.identiferLbl.text=Identifier: +CreatePersonaAccountDialog.okBtn.text=OK +PersonasTopComponent.introText.text=Personas represent an online identity. They span cases and are stored in the Central Repository based on accounts that were found in artifacts. You can create, edit, and delete personas here. diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties-MERGED index ed71818774..7ddd81ee59 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties-MERGED @@ -3,10 +3,15 @@ AddMetadataDialog_dup_msg=A metadata entry with this name has already been added AddMetadataDialog_dup_Title=Metadata add failure AddMetadataDialog_empty_name_msg=A metadata entry cannot have an empty name or value. AddMetadataDialog_empty_name_Title=Missing field(s) -CTL_OpenPersonaManager=Persona Manager -CTL_PersonaManagerTopComponentAction=Persona Manager +CreatePersonaAccountDialog.title.text=Create Account +CreatePersonaAccountDialog_error_msg=Failed to create account. +CreatePersonaAccountDialog_error_title=Account failure +CreatePersonaAccountDialog_success_msg=Account added. +CreatePersonaAccountDialog_success_title=Account added +CTL_OpenPersonas=Personas +CTL_PersonasTopComponentAction=Personas CTL_PersonaDetailsTopComponent=Persona Details -OpenPersonasAction.displayName=Persona Manager +OpenPersonasAction.displayName=Personas PersonaAccountDialog.title.text=Add Account PersonaAccountDialog_dup_msg=This account is already added to the persona. PersonaAccountDialog_dup_Title=Account add failure @@ -23,32 +28,11 @@ PersonaAliasDialog_dup_msg=This alias has already been added to this persona. PersonaAliasDialog_dup_Title=Alias add failure PersonaAliasDialog_empty_msg=An alias cannot be empty. PersonaAliasDialog_empty_Title=Empty alias +PersonaDetailsDialog.cancelBtn.text=Cancel +PersonaDetailsDialog.okBtn.text=OK PersonaDetailsDialogCreateTitle=Create Persona PersonaDetailsDialogEditTitle=Edit Persona PersonaDetailsDialogViewTitle=View Persona -PersonaDetailsPanel_CentralRepoErr_msg=Failure to write to Central Repository. -PersonaDetailsPanel_CentralRepoErr_Title=Central Repository failure -PersonaDetailsPanel_empty_justification_msg=The justification field cannot be empty -PersonaDetailsPanel_empty_justification_Title=Empty justification -PersonaDetailsPanel_EmptyComment_msg=Persona comment cannot be empty. -PersonaDetailsPanel_EmptyComment_Title=Empty persona comment -PersonaDetailsPanel_EmptyName_msg=Persona name cannot be empty. -PersonaDetailsPanel_EmptyName_Title=Empty persona name -PersonaDetailsPanel_load_exception_msg=Failed to load persona. -PersonaDetailsPanel_load_exception_Title=Initialization failure -PersonaDetailsPanel_NotEnoughAccounts_msg=A persona needs at least one account. -PersonaDetailsPanel_NotEnoughAccounts_Title=Missing account -PersonaManagerTopComponent.createBtn.text=New Persona -PersonaManagerTopComponent.searchBtn.text=Search -PersonaManagerTopComponent.resultsTable.columnModel.title1=Name -PersonaManagerTopComponent.resultsTable.columnModel.title0=ID -PersonaManagerTopComponent.resultsTable.toolTipText= -PersonaManagerTopComponent.searchAccountRadio.text=Account -PersonaManagerTopComponent.searchNameRadio.text=Name -PersonaManagerTopComponent.searchField.text= -PersonaManagerTopComponent.editBtn.text=Edit Persona -PersonaDetailsDialog.cancelBtn.text=Cancel -PersonaDetailsDialog.okBtn.text=OK PersonaDetailsPanel.casesLbl.text=Cases found in: PersonaDetailsPanel.deleteAliasBtn.text=Delete PersonaDetailsPanel.addAliasBtn.text=Add @@ -64,7 +48,6 @@ PersonaDetailsPanel.nameLbl.text=Name: AddAliasDialog.accountsLbl.text=Account: AddAliasDialog.okBtn.text=OK AddAliasDialog.cancelBtn.text=Cancel -PersonaManagerTopComponent.deleteBtn.text=Delete Persona PersonaDetailsPanel.casesLbl.text=Cases found in: PersonaDetailsPanel.deleteAliasBtn.text=Delete PersonaDetailsPanel.addAliasBtn.text=Add @@ -98,6 +81,18 @@ PersonaAliasDialog.justificationLbl.text=Justification: PersonaAliasDialog.aliasTextField.text= PersonaAliasDialog.aliasLbl.text=Alias: PersonaAliasDialog.okBtn.text_1=OK +PersonaDetailsPanel_CentralRepoErr_msg=Failure to write to Central Repository. +PersonaDetailsPanel_CentralRepoErr_Title=Central Repository failure +PersonaDetailsPanel_empty_justification_msg=The justification field cannot be empty +PersonaDetailsPanel_empty_justification_Title=Empty justification +PersonaDetailsPanel_EmptyComment_msg=Persona comment cannot be empty. +PersonaDetailsPanel_EmptyComment_Title=Empty persona comment +PersonaDetailsPanel_EmptyName_msg=Persona name cannot be empty. +PersonaDetailsPanel_EmptyName_Title=Empty persona name +PersonaDetailsPanel_load_exception_msg=Failed to load persona. +PersonaDetailsPanel_load_exception_Title=Initialization failure +PersonaDetailsPanel_NotEnoughAccounts_msg=A persona needs at least one account. +PersonaDetailsPanel_NotEnoughAccounts_Title=Missing account PersonaMetadataDialog.confidenceLbl.text=Confidence: PersonaMetadataDialog.justificationTextField.text= PersonaMetadataDialog.justificationLbl.text=Justification: @@ -110,10 +105,27 @@ PersonaMetadataDialog.cancelBtn.text=Cancel PersonaDetailsPanel.editAccountBtn.text=Edit PersonaDetailsPanel.editMetadataBtn.text=Edit PersonaDetailsPanel.editAliasBtn.text=Edit -PMTopComponent_delete_confirmation_msg=Are you sure you want to delete this persona? -PMTopComponent_delete_confirmation_Title=Are you sure? -PMTopComponent_delete_exception_msg=Failed to delete persona. -PMTopComponent_delete_exception_Title=Delete failure -PMTopComponent_Name=Persona Manager -PMTopComponent_search_exception_msg=Failed to search personas. -PMTopComponent_search_exception_Title=Search failure +PersonasTopComponent.searchAccountRadio.text=Account +PersonasTopComponent.searchNameRadio.text=Name +PersonasTopComponent.searchField.text= +PersonasTopComponent.deleteBtn.text=Delete Persona +PersonasTopComponent.editBtn.text=Edit Persona +PersonasTopComponent.createBtn.text=New Persona +PersonasTopComponent.createAccountBtn.text=Create Account +PersonasTopComponent.searchBtn.text=Search +PersonasTopComponent.resultsTable.columnModel.title1=Name +PersonasTopComponent.resultsTable.columnModel.title0=ID +PersonasTopComponent.resultsTable.toolTipText= +CreatePersonaAccountDialog.cancelBtn.text=Cancel +CreatePersonaAccountDialog.typeLbl.text=Type: +CreatePersonaAccountDialog.identifierTextField.text= +CreatePersonaAccountDialog.identiferLbl.text=Identifier: +CreatePersonaAccountDialog.okBtn.text=OK +PersonasTopComponent.introText.text=Personas represent an online identity. They span cases and are stored in the Central Repository based on accounts that were found in artifacts. You can create, edit, and delete personas here. +PersonasTopComponent_delete_confirmation_msg=Are you sure you want to delete this persona? +PersonasTopComponent_delete_confirmation_Title=Are you sure? +PersonasTopComponent_delete_exception_msg=Failed to delete persona. +PersonasTopComponent_delete_exception_Title=Delete failure +PersonasTopComponent_Name=Personas +PersonasTopComponent_search_exception_msg=Failed to search personas. +PersonasTopComponent_search_exception_Title=Search failure diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/persona/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/centralrepository/persona/Bundle_ja.properties index f757a8f7ef..bfdd721a69 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/persona/Bundle_ja.properties +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/persona/Bundle_ja.properties @@ -8,3 +8,5 @@ PersonaAliasDialog.cancelBtn.text_1=\u53d6\u308a\u6d88\u3057 PersonaAliasDialog.okBtn.text_1=OK PersonaMetadataDialog.okBtn.text=OK PersonaMetadataDialog.cancelBtn.text=\u53d6\u308a\u6d88\u3057 +CreatePersonaAccountDialog.okBtn.text=OK +CreatePersonaAccountDialog.cancelBtn.text=\u53d6\u308a\u6d88\u3057 diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/persona/CreatePersonaAccountDialog.form b/Core/src/org/sleuthkit/autopsy/centralrepository/persona/CreatePersonaAccountDialog.form new file mode 100644 index 0000000000..fd74cca117 --- /dev/null +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/persona/CreatePersonaAccountDialog.form @@ -0,0 +1,168 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/persona/CreatePersonaAccountDialog.java b/Core/src/org/sleuthkit/autopsy/centralrepository/persona/CreatePersonaAccountDialog.java new file mode 100644 index 0000000000..d4d23f7f0e --- /dev/null +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/persona/CreatePersonaAccountDialog.java @@ -0,0 +1,281 @@ +/* + * Central Repository + * + * Copyright 2020 Basis Technology Corp. + * Contact: carrier sleuthkit org + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.sleuthkit.autopsy.centralrepository.persona; + +import java.awt.Component; +import java.io.Serializable; +import java.util.Collection; +import java.util.logging.Level; +import javax.swing.JDialog; +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.JOptionPane; +import javax.swing.ListCellRenderer; +import javax.swing.SwingUtilities; +import org.openide.util.NbBundle.Messages; +import org.openide.windows.WindowManager; +import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoAccount; +import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoAccount.CentralRepoAccountType; +import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoException; +import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepository; +import org.sleuthkit.autopsy.coreutils.Logger; + +/** + * Configuration dialog for creating an account. + */ +@SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives +public class CreatePersonaAccountDialog extends JDialog { + + private static final Logger logger = Logger.getLogger(CreatePersonaAccountDialog.class.getName()); + + private static final long serialVersionUID = 1L; + + private final TypeChoiceRenderer TYPE_CHOICE_RENDERER = new TypeChoiceRenderer(); + + /** + * Creates new create account dialog. + */ + @Messages({"CreatePersonaAccountDialog.title.text=Create Account",}) + public CreatePersonaAccountDialog(PersonaDetailsPanel pdp) { + super(SwingUtilities.windowForComponent(pdp), + Bundle.PersonaAccountDialog_title_text(), + ModalityType.APPLICATION_MODAL); + + initComponents(); + typeComboBox.setRenderer(TYPE_CHOICE_RENDERER); + display(); + } + + /** + * This class handles displaying and rendering drop down menu for account + * choices. + */ + private class TypeChoiceRenderer extends JLabel implements ListCellRenderer, Serializable { + + private static final long serialVersionUID = 1L; + + @Override + public Component getListCellRendererComponent( + JList list, CentralRepoAccountType value, + int index, boolean isSelected, boolean cellHasFocus) { + setText(value.getAcctType().getDisplayName()); + return this; + } + } + + private CentralRepoAccountType[] getAllAccountTypes() { + Collection allAccountTypes; + try { + allAccountTypes = CentralRepository.getInstance().getAllAccountTypes(); + } catch (CentralRepoException e) { + logger.log(Level.SEVERE, "Failed to access central repository", e); + JOptionPane.showMessageDialog(this, + Bundle.PersonaAccountDialog_get_types_exception_Title(), + Bundle.PersonaAccountDialog_get_types_exception_msg(), + JOptionPane.ERROR_MESSAGE); + return new CentralRepoAccountType[0]; + } + return allAccountTypes.toArray(new CentralRepoAccountType[0]); + } + + /** + * This method is called from within the constructor to initialize the form. + * WARNING: Do NOT modify this code. The content of this method is always + * regenerated by the Form Editor. + */ + @SuppressWarnings("unchecked") + // //GEN-BEGIN:initComponents + private void initComponents() { + + settingsPanel = new javax.swing.JPanel(); + identiferLbl = new javax.swing.JLabel(); + identifierTextField = new javax.swing.JTextField(); + typeLbl = new javax.swing.JLabel(); + typeComboBox = new javax.swing.JComboBox<>(); + cancelBtn = new javax.swing.JButton(); + okBtn = new javax.swing.JButton(); + + setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); + setResizable(false); + + settingsPanel.setBorder(javax.swing.BorderFactory.createEtchedBorder()); + + org.openide.awt.Mnemonics.setLocalizedText(identiferLbl, org.openide.util.NbBundle.getMessage(CreatePersonaAccountDialog.class, "CreatePersonaAccountDialog.identiferLbl.text")); // NOI18N + + identifierTextField.setText(org.openide.util.NbBundle.getMessage(CreatePersonaAccountDialog.class, "CreatePersonaAccountDialog.identifierTextField.text")); // NOI18N + identifierTextField.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + identifierTextFieldActionPerformed(evt); + } + }); + + org.openide.awt.Mnemonics.setLocalizedText(typeLbl, org.openide.util.NbBundle.getMessage(CreatePersonaAccountDialog.class, "CreatePersonaAccountDialog.typeLbl.text")); // NOI18N + + typeComboBox.setModel(new javax.swing.DefaultComboBoxModel<>(getAllAccountTypes())); + + javax.swing.GroupLayout settingsPanelLayout = new javax.swing.GroupLayout(settingsPanel); + settingsPanel.setLayout(settingsPanelLayout); + settingsPanelLayout.setHorizontalGroup( + settingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(settingsPanelLayout.createSequentialGroup() + .addContainerGap() + .addGroup(settingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(settingsPanelLayout.createSequentialGroup() + .addComponent(typeLbl) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(typeComboBox, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addGroup(settingsPanelLayout.createSequentialGroup() + .addComponent(identiferLbl) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(identifierTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 281, Short.MAX_VALUE))) + .addContainerGap()) + ); + settingsPanelLayout.setVerticalGroup( + settingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(settingsPanelLayout.createSequentialGroup() + .addContainerGap() + .addGroup(settingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(identiferLbl) + .addComponent(identifierTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(settingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(typeComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(typeLbl, javax.swing.GroupLayout.PREFERRED_SIZE, 9, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + ); + + org.openide.awt.Mnemonics.setLocalizedText(cancelBtn, org.openide.util.NbBundle.getMessage(CreatePersonaAccountDialog.class, "CreatePersonaAccountDialog.cancelBtn.text")); // NOI18N + cancelBtn.setMaximumSize(new java.awt.Dimension(79, 23)); + cancelBtn.setMinimumSize(new java.awt.Dimension(79, 23)); + cancelBtn.setPreferredSize(new java.awt.Dimension(79, 23)); + cancelBtn.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + cancelBtnActionPerformed(evt); + } + }); + + org.openide.awt.Mnemonics.setLocalizedText(okBtn, org.openide.util.NbBundle.getMessage(CreatePersonaAccountDialog.class, "CreatePersonaAccountDialog.okBtn.text")); // NOI18N + okBtn.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + okBtnActionPerformed(evt); + } + }); + + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); + getContentPane().setLayout(layout); + layout.setHorizontalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addContainerGap(194, Short.MAX_VALUE) + .addComponent(okBtn) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(cancelBtn, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addContainerGap()) + .addComponent(settingsPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + ); + + layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {cancelBtn, okBtn}); + + layout.setVerticalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addContainerGap() + .addComponent(settingsPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(okBtn) + .addComponent(cancelBtn, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + ); + + pack(); + }// //GEN-END:initComponents + + private void display() { + this.setLocationRelativeTo(WindowManager.getDefault().getMainWindow()); + setVisible(true); + } + + @Messages({ + "CreatePersonaAccountDialog_error_title=Account failure", + "CreatePersonaAccountDialog_error_msg=Failed to create account.", + }) + private CentralRepoAccount createAccount(CentralRepoAccount.CentralRepoAccountType type, String identifier) { + CentralRepoAccount ret = null; + try { + CentralRepository cr = CentralRepository.getInstance(); + if (cr != null) { + ret = cr.getOrCreateAccount(type, identifier); + } + } catch (CentralRepoException e) { + logger.log(Level.SEVERE, "Failed to create account", e); + JOptionPane.showMessageDialog(this, + Bundle.CreatePersonaAccountDialog_error_title(), + Bundle.CreatePersonaAccountDialog_error_msg(), + JOptionPane.ERROR_MESSAGE); + } + return ret; + } + + @Messages({ + "CreatePersonaAccountDialog_success_title=Account added", + "CreatePersonaAccountDialog_success_msg=Account added.", + }) + private void okBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okBtnActionPerformed + if (identifierTextField.getText().isEmpty()) { + JOptionPane.showMessageDialog(this, + Bundle.PersonaAccountDialog_identifier_empty_msg(), + Bundle.PersonaAccountDialog_identifier_empty_Title(), + JOptionPane.ERROR_MESSAGE); + return; + } + + CentralRepoAccount.CentralRepoAccountType type = + (CentralRepoAccount.CentralRepoAccountType) typeComboBox.getSelectedItem(); + String identifier = identifierTextField.getText(); + + if (createAccount(type, identifier) != null) { + // show account created message + JOptionPane.showMessageDialog(this, + Bundle.CreatePersonaAccountDialog_success_msg(), + Bundle.CreatePersonaAccountDialog_success_title(), + JOptionPane.INFORMATION_MESSAGE); + + dispose(); + } + }//GEN-LAST:event_okBtnActionPerformed + + private void cancelBtnActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancelBtnActionPerformed + dispose(); + }//GEN-LAST:event_cancelBtnActionPerformed + + private void identifierTextFieldActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_identifierTextFieldActionPerformed + // TODO add your handling code here: + }//GEN-LAST:event_identifierTextFieldActionPerformed + + // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JButton cancelBtn; + private javax.swing.JLabel identiferLbl; + private javax.swing.JTextField identifierTextField; + private javax.swing.JButton okBtn; + private javax.swing.JPanel settingsPanel; + private javax.swing.JComboBox typeComboBox; + private javax.swing.JLabel typeLbl; + // End of variables declaration//GEN-END:variables +} diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/persona/OpenPersonaManagerAction.java b/Core/src/org/sleuthkit/autopsy/centralrepository/persona/OpenPersonasAction.java similarity index 88% rename from Core/src/org/sleuthkit/autopsy/centralrepository/persona/OpenPersonaManagerAction.java rename to Core/src/org/sleuthkit/autopsy/centralrepository/persona/OpenPersonasAction.java index 9d40eeb357..5407abc981 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/persona/OpenPersonaManagerAction.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/persona/OpenPersonasAction.java @@ -35,18 +35,18 @@ import org.sleuthkit.autopsy.coreutils.ThreadConfined; * An Action that opens the Persona Search window. */ -@ActionID(category = "Tools", id = "org.sleuthkit.autopsy.centralrepository.persona.OpenPersonaManagerAction") -@ActionRegistration(displayName = "#CTL_OpenPersonaManager", lazy = false) +@ActionID(category = "Tools", id = "org.sleuthkit.autopsy.centralrepository.persona.OpenPersonasAction") +@ActionRegistration(displayName = "#CTL_OpenPersonas", lazy = false) @ActionReferences(value = { @ActionReference(path = "Menu/Tools", position = 105) }) -public final class OpenPersonaManagerAction extends CallableSystemAction { +public final class OpenPersonasAction extends CallableSystemAction { private static final long serialVersionUID = 1L; private final JMenuItem menuItem; - public OpenPersonaManagerAction() { + public OpenPersonasAction() { menuItem = super.getMenuPresenter(); this.setEnabled(CentralRepository.isEnabled()); } @@ -54,7 +54,7 @@ public final class OpenPersonaManagerAction extends CallableSystemAction { @Override @ThreadConfined(type = ThreadConfined.ThreadType.AWT) public void performAction() { - final TopComponent topComponent = WindowManager.getDefault().findTopComponent("PersonaManagerTopComponent"); + final TopComponent topComponent = WindowManager.getDefault().findTopComponent("PersonasTopComponent"); if (topComponent != null) { if (topComponent.isOpened() == false) { topComponent.open(); @@ -65,7 +65,7 @@ public final class OpenPersonaManagerAction extends CallableSystemAction { } @Override - @NbBundle.Messages("OpenPersonasAction.displayName=Persona Manager") + @NbBundle.Messages("OpenPersonasAction.displayName=Personas") public String getName() { return Bundle.OpenPersonasAction_displayName(); } diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/persona/PersonaManagerTopComponent.form b/Core/src/org/sleuthkit/autopsy/centralrepository/persona/PersonasTopComponent.form similarity index 62% rename from Core/src/org/sleuthkit/autopsy/centralrepository/persona/PersonaManagerTopComponent.form rename to Core/src/org/sleuthkit/autopsy/centralrepository/persona/PersonasTopComponent.form index 4c2a65a276..45edb3e159 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/persona/PersonaManagerTopComponent.form +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/persona/PersonasTopComponent.form @@ -1,35 +1,12 @@ - -
- - - + @@ -46,17 +23,52 @@ - + + - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -70,16 +82,10 @@ - + - - - - - - - + @@ -89,6 +95,19 @@ + + + + + + + + + + + + + @@ -106,7 +125,7 @@ - + @@ -114,6 +133,10 @@ + + + + @@ -122,7 +145,7 @@ - + @@ -133,7 +156,7 @@ - + @@ -143,7 +166,14 @@ - + + + + + + + + @@ -157,20 +187,20 @@ - + - <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaManagerTopComponent.resultsTable.columnModel.title0" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonasTopComponent.resultsTable.columnModel.title0" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> - <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonaManagerTopComponent.resultsTable.columnModel.title1" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> + <ResourceString bundle="org/sleuthkit/autopsy/centralrepository/persona/Bundle.properties" key="PersonasTopComponent.resultsTable.columnModel.title1" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/> @@ -184,48 +214,59 @@ - + - - - - - - - - - - - - - - - - + - + - + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/persona/PersonaManagerTopComponent.java b/Core/src/org/sleuthkit/autopsy/centralrepository/persona/PersonasTopComponent.java similarity index 67% rename from Core/src/org/sleuthkit/autopsy/centralrepository/persona/PersonaManagerTopComponent.java rename to Core/src/org/sleuthkit/autopsy/centralrepository/persona/PersonasTopComponent.java index 93dc22e4e0..7b1b95afa3 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/persona/PersonaManagerTopComponent.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/persona/PersonasTopComponent.java @@ -44,27 +44,29 @@ import org.sleuthkit.autopsy.coreutils.Logger; * Top component for the Personas tool * */ -@TopComponent.Description(preferredID = "PersonaManagerTopComponent", persistenceType = TopComponent.PERSISTENCE_NEVER) -@TopComponent.Registration(mode = "personamanager", openAtStartup = false) -@RetainLocation("personamanager") +@TopComponent.Description(preferredID = "PersonasTopComponent", persistenceType = TopComponent.PERSISTENCE_NEVER) +@TopComponent.Registration(mode = "personas", openAtStartup = false) +@RetainLocation("personas") @SuppressWarnings("PMD.SingularField") -public final class PersonaManagerTopComponent extends TopComponent { +public final class PersonasTopComponent extends TopComponent { + + private static final long serialVersionUID = 1L; - private static final Logger logger = Logger.getLogger(PersonaManagerTopComponent.class.getName()); + private static final Logger logger = Logger.getLogger(PersonasTopComponent.class.getName()); private List currentResults = null; private Persona selectedPersona = null; @Messages({ - "PMTopComponent_Name=Persona Manager", - "PMTopComponent_delete_exception_Title=Delete failure", - "PMTopComponent_delete_exception_msg=Failed to delete persona.", - "PMTopComponent_delete_confirmation_Title=Are you sure?", - "PMTopComponent_delete_confirmation_msg=Are you sure you want to delete this persona?", + "PersonasTopComponent_Name=Personas", + "PersonasTopComponent_delete_exception_Title=Delete failure", + "PersonasTopComponent_delete_exception_msg=Failed to delete persona.", + "PersonasTopComponent_delete_confirmation_Title=Are you sure?", + "PersonasTopComponent_delete_confirmation_msg=Are you sure you want to delete this persona?", }) - public PersonaManagerTopComponent() { + public PersonasTopComponent() { initComponents(); - setName(Bundle.PMTopComponent_Name()); + setName(Bundle.PersonasTopComponent_Name()); executeSearch(); searchBtn.addActionListener(new ActionListener() { @@ -77,7 +79,7 @@ public final class PersonaManagerTopComponent extends TopComponent { editBtn.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - new PersonaDetailsDialog(PersonaManagerTopComponent.this, + new PersonaDetailsDialog(PersonasTopComponent.this, PersonaDetailsMode.EDIT, selectedPersona, new CreateEditCallbackImpl()); } }); @@ -85,7 +87,7 @@ public final class PersonaManagerTopComponent extends TopComponent { createBtn.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - new PersonaDetailsDialog(PersonaManagerTopComponent.this, + new PersonaDetailsDialog(PersonasTopComponent.this, PersonaDetailsMode.CREATE, selectedPersona, new CreateEditCallbackImpl()); } }); @@ -94,8 +96,8 @@ public final class PersonaManagerTopComponent extends TopComponent { @Override public void actionPerformed(ActionEvent e) { NotifyDescriptor confirm = new NotifyDescriptor.Confirmation( - Bundle.PMTopComponent_delete_confirmation_msg(), - Bundle.PMTopComponent_delete_confirmation_Title(), + Bundle.PersonasTopComponent_delete_confirmation_msg(), + Bundle.PersonasTopComponent_delete_confirmation_Title(), NotifyDescriptor.YES_NO_OPTION); DialogDisplayer.getDefault().notify(confirm); if (confirm.getValue().equals(NotifyDescriptor.YES_OPTION)) { @@ -105,9 +107,9 @@ public final class PersonaManagerTopComponent extends TopComponent { } } catch (CentralRepoException ex) { logger.log(Level.SEVERE, "Failed to delete persona: " + selectedPersona.getName(), ex); - JOptionPane.showMessageDialog(PersonaManagerTopComponent.this, - Bundle.PMTopComponent_delete_exception_msg(), - Bundle.PMTopComponent_delete_exception_Title(), + JOptionPane.showMessageDialog(PersonasTopComponent.this, + Bundle.PersonasTopComponent_delete_exception_msg(), + Bundle.PersonasTopComponent_delete_exception_Title(), JOptionPane.ERROR_MESSAGE); return; } @@ -132,6 +134,13 @@ public final class PersonaManagerTopComponent extends TopComponent { searchAccountRadio.addActionListener((ActionEvent e) -> { searchField.setText(""); }); + + createAccountBtn.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + new CreatePersonaAccountDialog(detailsPanel); + } + }); } /** @@ -214,8 +223,8 @@ public final class PersonaManagerTopComponent extends TopComponent { } @Messages({ - "PMTopComponent_search_exception_Title=Search failure", - "PMTopComponent_search_exception_msg=Failed to search personas.",}) + "PersonasTopComponent_search_exception_Title=Search failure", + "PersonasTopComponent_search_exception_msg=Failed to search personas.",}) private void executeSearch() { Collection results; try { @@ -227,8 +236,8 @@ public final class PersonaManagerTopComponent extends TopComponent { } catch (CentralRepoException ex) { logger.log(Level.SEVERE, "Failed to search personas", ex); JOptionPane.showMessageDialog(this, - Bundle.PMTopComponent_search_exception_Title(), - Bundle.PMTopComponent_search_exception_msg(), + Bundle.PersonasTopComponent_search_exception_Title(), + Bundle.PersonasTopComponent_search_exception_msg(), JOptionPane.ERROR_MESSAGE); return; } @@ -254,49 +263,69 @@ public final class PersonaManagerTopComponent extends TopComponent { private void initComponents() { searchButtonGroup = new javax.swing.ButtonGroup(); - jSplitPane1 = new javax.swing.JSplitPane(); + introTextScrollPane = new javax.swing.JScrollPane(); + introText = new javax.swing.JTextArea(); + mainSplitPane = new javax.swing.JSplitPane(); searchPanel = new javax.swing.JPanel(); searchField = new javax.swing.JTextField(); searchNameRadio = new javax.swing.JRadioButton(); searchAccountRadio = new javax.swing.JRadioButton(); + searchBtn = new javax.swing.JButton(); resultsPane = new javax.swing.JScrollPane(); resultsTable = new javax.swing.JTable(); - searchBtn = new javax.swing.JButton(); + createAccountBtn = new javax.swing.JButton(); editBtn = new javax.swing.JButton(); - createBtn = new javax.swing.JButton(); deleteBtn = new javax.swing.JButton(); + createButtonSeparator = new javax.swing.JSeparator(); + createBtn = new javax.swing.JButton(); + detailsScrollPane = new javax.swing.JScrollPane(); detailsPanel = new org.sleuthkit.autopsy.centralrepository.persona.PersonaDetailsPanel(); - setMinimumSize(new java.awt.Dimension(400, 400)); + setName(""); // NOI18N - searchField.setText(org.openide.util.NbBundle.getMessage(PersonaManagerTopComponent.class, "PersonaManagerTopComponent.searchField.text")); // NOI18N + introTextScrollPane.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); + + introText.setBackground(getBackground()); + introText.setColumns(20); + introText.setLineWrap(true); + introText.setRows(5); + introText.setText(org.openide.util.NbBundle.getMessage(PersonasTopComponent.class, "PersonasTopComponent.introText.text")); // NOI18N + introText.setWrapStyleWord(true); + introText.setFocusable(false); + introTextScrollPane.setViewportView(introText); + + mainSplitPane.setDividerLocation(400); + + searchField.setText(org.openide.util.NbBundle.getMessage(PersonasTopComponent.class, "PersonasTopComponent.searchField.text")); // NOI18N searchButtonGroup.add(searchNameRadio); searchNameRadio.setSelected(true); - org.openide.awt.Mnemonics.setLocalizedText(searchNameRadio, org.openide.util.NbBundle.getMessage(PersonaManagerTopComponent.class, "PersonaManagerTopComponent.searchNameRadio.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(searchNameRadio, org.openide.util.NbBundle.getMessage(PersonasTopComponent.class, "PersonasTopComponent.searchNameRadio.text")); // NOI18N searchButtonGroup.add(searchAccountRadio); - org.openide.awt.Mnemonics.setLocalizedText(searchAccountRadio, org.openide.util.NbBundle.getMessage(PersonaManagerTopComponent.class, "PersonaManagerTopComponent.searchAccountRadio.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(searchAccountRadio, org.openide.util.NbBundle.getMessage(PersonasTopComponent.class, "PersonasTopComponent.searchAccountRadio.text")); // NOI18N - resultsTable.setToolTipText(org.openide.util.NbBundle.getMessage(PersonaManagerTopComponent.class, "PersonaManagerTopComponent.resultsTable.toolTipText")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(searchBtn, org.openide.util.NbBundle.getMessage(PersonasTopComponent.class, "PersonasTopComponent.searchBtn.text")); // NOI18N + + resultsTable.setToolTipText(org.openide.util.NbBundle.getMessage(PersonasTopComponent.class, "PersonasTopComponent.resultsTable.toolTipText")); // NOI18N resultsTable.getTableHeader().setReorderingAllowed(false); resultsPane.setViewportView(resultsTable); if (resultsTable.getColumnModel().getColumnCount() > 0) { resultsTable.getColumnModel().getColumn(0).setMaxWidth(25); - resultsTable.getColumnModel().getColumn(0).setHeaderValue(org.openide.util.NbBundle.getMessage(PersonaManagerTopComponent.class, "PersonaManagerTopComponent.resultsTable.columnModel.title0")); // NOI18N - resultsTable.getColumnModel().getColumn(1).setHeaderValue(org.openide.util.NbBundle.getMessage(PersonaManagerTopComponent.class, "PersonaManagerTopComponent.resultsTable.columnModel.title1")); // NOI18N + resultsTable.getColumnModel().getColumn(0).setHeaderValue(org.openide.util.NbBundle.getMessage(PersonasTopComponent.class, "PersonasTopComponent.resultsTable.columnModel.title0")); // NOI18N + resultsTable.getColumnModel().getColumn(1).setHeaderValue(org.openide.util.NbBundle.getMessage(PersonasTopComponent.class, "PersonasTopComponent.resultsTable.columnModel.title1")); // NOI18N } - org.openide.awt.Mnemonics.setLocalizedText(searchBtn, org.openide.util.NbBundle.getMessage(PersonaManagerTopComponent.class, "PersonaManagerTopComponent.searchBtn.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(createAccountBtn, org.openide.util.NbBundle.getMessage(PersonasTopComponent.class, "PersonasTopComponent.createAccountBtn.text")); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(editBtn, org.openide.util.NbBundle.getMessage(PersonaManagerTopComponent.class, "PersonaManagerTopComponent.editBtn.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(editBtn, org.openide.util.NbBundle.getMessage(PersonasTopComponent.class, "PersonasTopComponent.editBtn.text")); // NOI18N editBtn.setEnabled(false); - org.openide.awt.Mnemonics.setLocalizedText(createBtn, org.openide.util.NbBundle.getMessage(PersonaManagerTopComponent.class, "PersonaManagerTopComponent.createBtn.text")); // NOI18N - - org.openide.awt.Mnemonics.setLocalizedText(deleteBtn, org.openide.util.NbBundle.getMessage(PersonaManagerTopComponent.class, "PersonaManagerTopComponent.deleteBtn.text")); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(deleteBtn, org.openide.util.NbBundle.getMessage(PersonasTopComponent.class, "PersonasTopComponent.deleteBtn.text")); // NOI18N deleteBtn.setEnabled(false); + org.openide.awt.Mnemonics.setLocalizedText(createBtn, org.openide.util.NbBundle.getMessage(PersonasTopComponent.class, "PersonasTopComponent.createBtn.text")); // NOI18N + javax.swing.GroupLayout searchPanelLayout = new javax.swing.GroupLayout(searchPanel); searchPanel.setLayout(searchPanelLayout); searchPanelLayout.setHorizontalGroup( @@ -304,12 +333,7 @@ public final class PersonaManagerTopComponent extends TopComponent { .addGroup(searchPanelLayout.createSequentialGroup() .addContainerGap() .addGroup(searchPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(searchPanelLayout.createSequentialGroup() - .addComponent(createBtn) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(editBtn) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(deleteBtn)) + .addComponent(createButtonSeparator) .addComponent(resultsPane, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE) .addComponent(searchField) .addGroup(searchPanelLayout.createSequentialGroup() @@ -317,7 +341,17 @@ public final class PersonaManagerTopComponent extends TopComponent { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(searchAccountRadio) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(searchBtn))) + .addComponent(searchBtn)) + .addGroup(searchPanelLayout.createSequentialGroup() + .addGroup(searchPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(createAccountBtn) + .addGroup(searchPanelLayout.createSequentialGroup() + .addComponent(createBtn) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(editBtn) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(deleteBtn))) + .addGap(0, 0, Short.MAX_VALUE))) .addContainerGap()) ); searchPanelLayout.setVerticalGroup( @@ -331,36 +365,52 @@ public final class PersonaManagerTopComponent extends TopComponent { .addComponent(searchAccountRadio) .addComponent(searchBtn)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(resultsPane, javax.swing.GroupLayout.DEFAULT_SIZE, 528, Short.MAX_VALUE) + .addComponent(resultsPane, javax.swing.GroupLayout.DEFAULT_SIZE, 300, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(searchPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(editBtn) .addComponent(createBtn) .addComponent(deleteBtn)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(createButtonSeparator, javax.swing.GroupLayout.PREFERRED_SIZE, 4, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(createAccountBtn, javax.swing.GroupLayout.PREFERRED_SIZE, 32, javax.swing.GroupLayout.PREFERRED_SIZE) .addContainerGap()) ); - jSplitPane1.setLeftComponent(searchPanel); - jSplitPane1.setRightComponent(detailsPanel); + mainSplitPane.setLeftComponent(searchPanel); + + detailsScrollPane.setViewportView(detailsPanel); + + mainSplitPane.setRightComponent(detailsScrollPane); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); this.setLayout(layout); layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jSplitPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 692, Short.MAX_VALUE) + .addComponent(introTextScrollPane) + .addComponent(mainSplitPane, javax.swing.GroupLayout.DEFAULT_SIZE, 724, Short.MAX_VALUE) ); layout.setVerticalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jSplitPane1) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addComponent(introTextScrollPane, javax.swing.GroupLayout.PREFERRED_SIZE, 49, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(mainSplitPane, javax.swing.GroupLayout.DEFAULT_SIZE, 470, Short.MAX_VALUE)) ); }// //GEN-END:initComponents // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JButton createAccountBtn; private javax.swing.JButton createBtn; + private javax.swing.JSeparator createButtonSeparator; private javax.swing.JButton deleteBtn; private org.sleuthkit.autopsy.centralrepository.persona.PersonaDetailsPanel detailsPanel; + private javax.swing.JScrollPane detailsScrollPane; private javax.swing.JButton editBtn; - private javax.swing.JSplitPane jSplitPane1; + private javax.swing.JTextArea introText; + private javax.swing.JScrollPane introTextScrollPane; + private javax.swing.JSplitPane mainSplitPane; private javax.swing.JScrollPane resultsPane; private javax.swing.JTable resultsTable; private javax.swing.JRadioButton searchAccountRadio; diff --git a/Core/src/org/sleuthkit/autopsy/commonpropertiessearch/CommonAttributePanel.java b/Core/src/org/sleuthkit/autopsy/commonpropertiessearch/CommonAttributePanel.java index b301e69d04..7bfdd2ad02 100644 --- a/Core/src/org/sleuthkit/autopsy/commonpropertiessearch/CommonAttributePanel.java +++ b/Core/src/org/sleuthkit/autopsy/commonpropertiessearch/CommonAttributePanel.java @@ -862,7 +862,7 @@ final class CommonAttributePanel extends javax.swing.JDialog implements Observer /** * If the settings reflect that a inter-case search is being performed, * checks that the data sources in the current case have been processed with - * Correlation Engine enabled and exist in the central repository. Prompting + * Central Repository enabled and exist in the central repository. Prompting * the user as to whether they still want to perform the search in the case * any data sources are unprocessed. If the settings reflect that a * intra-case search is being performed, it just performs the search. @@ -870,7 +870,7 @@ final class CommonAttributePanel extends javax.swing.JDialog implements Observer * Notes: - Does not check that the data sources were processed into the * current central repository instead of another. - Does not check that the * appropriate modules to make all correlation types available were run. - - * Does not check if the correlation engine was run with any of the + * Does not check if the Central Repository was run with any of the * correlation properties properties disabled. */ @Messages({"CommonAttributePanel.incompleteResults.introText=Results may be incomplete. Not all data sources in the current case were ingested into the current Central Repository. The following data sources have not been processed:", @@ -902,14 +902,14 @@ final class CommonAttributePanel extends javax.swing.JDialog implements Observer //if the datasource was previously processed we do not need to perform this check for (CorrelationDataSource correlatedDataSource : correlatedDataSources) { if (deviceID.equals(correlatedDataSource.getDeviceID())) { - //if the datasource exists in the central repository it may of been processed with the correlation engine + //if the datasource exists in the central repository it may of been processed with the Central Repository dataSourceCorrelationMap.put(dataSource, CorrelatedStatus.IN_CENTRAL_REPO); break; } } } if (dataSourceCorrelationMap.get(dataSource) == CorrelatedStatus.IN_CENTRAL_REPO) { - //if the data source was in the central repository check if any of the modules run on it were the correlation engine + //if the data source was in the central repository check if any of the modules run on it were the Central Repository for (IngestModuleInfo ingestModuleInfo : jobInfo.getIngestModuleInfo()) { if (correlationEngineModuleName.equals(ingestModuleInfo.getDisplayName())) { dataSourceCorrelationMap.put(dataSource, CorrelatedStatus.CORRELATED); diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/CallLogDataViewer.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/CallLogDataViewer.java index 19cdf59b7f..535bdf5d5e 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/CallLogDataViewer.java +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/CallLogDataViewer.java @@ -21,7 +21,7 @@ package org.sleuthkit.autopsy.communications.relationships; import java.beans.PropertyChangeEvent; import org.openide.explorer.ExplorerManager; import org.openide.nodes.Node; -import org.sleuthkit.autopsy.contentviewers.CallLogArtifactViewer; +import org.sleuthkit.autopsy.contentviewers.artifactviewers.CallLogArtifactViewer; import org.sleuthkit.autopsy.corecomponentinterfaces.DataContent; import org.sleuthkit.datamodel.BlackboardArtifact; diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactDataViewer.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactDataViewer.java index f8d4527523..3bff440b28 100755 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactDataViewer.java +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/ContactDataViewer.java @@ -21,7 +21,7 @@ package org.sleuthkit.autopsy.communications.relationships; import java.beans.PropertyChangeEvent; import org.openide.explorer.ExplorerManager; import org.openide.nodes.Node; -import org.sleuthkit.autopsy.contentviewers.ContactArtifactViewer; +import org.sleuthkit.autopsy.contentviewers.artifactviewers.ContactArtifactViewer; import org.sleuthkit.autopsy.corecomponentinterfaces.DataContent; import org.sleuthkit.datamodel.BlackboardArtifact; diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/MessageDataContent.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/MessageDataContent.java index 0998b89f46..cf4101a059 100644 --- a/Core/src/org/sleuthkit/autopsy/communications/relationships/MessageDataContent.java +++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/MessageDataContent.java @@ -25,7 +25,7 @@ import org.openide.explorer.ExplorerManager; import org.openide.nodes.Node; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException; -import org.sleuthkit.autopsy.contentviewers.MessageArtifactViewer; +import org.sleuthkit.autopsy.contentviewers.artifactviewers.MessageArtifactViewer; import org.sleuthkit.autopsy.corecomponentinterfaces.DataContent; import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.datamodel.AbstractFile; diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties b/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties index 5bac74e842..840704e39e 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties @@ -939,46 +939,4 @@ manager.properties.lafError =\ manager.properties.brokenProperty = Broken default property {0} value: {1} manager.properties.missingProperty = Missing default property {0} value: {1} -DefaultArtifactContentViewer.copyMenuItem.text=Copy -DefaultArtifactContentViewer.selectAllMenuItem.text=Select All -ContactArtifactViewer.contactNameLabel.text=Joanna Doe -ContactArtifactViewer.phonesLabel.text=Phone -ContactArtifactViewer.emailsLabel.text=Email -ContactArtifactViewer.othersLabel.text=Other -DefaultArtifactContentViewer.copyMenuItem.text=Copy -DefaultArtifactContentViewer.selectAllMenuItem.text=Select All -CallLogArtifactViewer.dataSourceNameLabel.text=data source name -CallLogArtifactViewer.jLabel2.text=Device Id -CallLogArtifactViewer.deviceIdLabel.text=device id -CallLogArtifactViewer.localAccountIdLabel.text=local account -CallLogArtifactViewer.localAccountLabel.text=Local Account -CallLogArtifactViewer.jLabel4.text=Data Source Name -CallLogArtifactViewer.otherInfoLabel.text=Other Information -CallLogArtifactViewer.sourceSectionLabel.text=Source -CallLogArtifactViewer.callDetailsLabel.text=Call Details -CallLogArtifactViewer.durationLabel.text=Duration.... -CallLogArtifactViewer.dateTimeLabel.text=Date/Time..... -CallLogArtifactViewer.directionLabel.text=Direction -CallLogArtifactViewer.onLabel.text=On -CallLogArtifactViewer.callLabel.text=call -MessageArtifactViewer.fromText.text=from address goes here -MessageArtifactViewer.datetimeText.text=date goes here -MessageArtifactViewer.headersScrollPane.TabConstraints.tabTitle=Headers -MessageArtifactViewer.fromLabel.text=From: -MessageArtifactViewer.directionText.text=direction -MessageArtifactViewer.subjectText.text=subject goes here -MessageArtifactViewer.viewInNewWindowButton.text=View in New Window -MessageArtifactViewer.subjectLabel.text=Subject: -MessageArtifactViewer.attachmentsPanel.TabConstraints.tabTitle=Attachments -MessageArtifactViewer.ccText.text=cc list goes here -MessageArtifactViewer.ccLabel.text=CC: -MessageArtifactViewer.rtfbodyScrollPane.TabConstraints.tabTitle=RTF -MessageArtifactViewer.toText.text=to list goes here -MessageArtifactViewer.toLabel.text=To: -MessageArtifactViewer.htmlPane.TabConstraints.tabTitle=HTML -CallLogArtifactViewer.localAccountPersonaLabel.text=Persona -CallLogArtifactViewer.localAccountPersonaNameLabel.text=jLabel1 -CallLogArtifactViewer.localAccountPersonaButton.text=jButton1 -ContactArtifactViewer.personasLabel.text=Personas -MessageArtifactViewer.accountsTab.TabConstraints.tabTitle=Accounts -ContactArtifactViewer.contactImage.text= + diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties-MERGED old mode 100755 new mode 100644 index 0aa57ce92b..ec1b7be47e --- a/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle.properties-MERGED @@ -35,28 +35,6 @@ AnnotationsContentViewer.title=Annotations AnnotationsContentViewer.toolTip=Displays tags and comments associated with the selected content. ApplicationContentViewer.title=Application ApplicationContentViewer.toolTip=Displays file contents. -CallLogArtifactViewer_crdisbaled_persona_button_text=Create -CallLogArtifactViewer_crdisbaled_persona_label=Unknown -CallLogArtifactViewer_number_from=From -CallLogArtifactViewer_number_to=To -CallLogArtifactViewer_persona_button_new=Create -CallLogArtifactViewer_persona_button_view=View -CallLogArtifactViewer_persona_label=\ Persona -CallLogArtifactViewer_persona_searching=Searching... -CallLogArtifactViewer_persona_text_none=None Found -ContactArtifactViewer_missing_account_label=Missing Account: -ContactArtifactViewer_persona_account_justification=Account found in Contact artifact -ContactArtifactViewer_persona_button_new=Create -ContactArtifactViewer_persona_button_view=View -ContactArtifactViewer_persona_label=Persona -ContactArtifactViewer_persona_searching=\ Searching... -ContactArtifactViewer_persona_text_none=None found -ContactArtifactViewer_persona_unknown=Unknown -DataContentViewerArtifact.failedToGetAttributes.message=Failed to get some or all attributes from case database -DataContentViewerArtifact.failedToGetSourcePath.message=Failed to get source file path from case database -DefaultArtifactContentViewer.attrsTableHeader.sources=Source(s) -DefaultArtifactContentViewer.attrsTableHeader.type=Type -DefaultArtifactContentViewer.attrsTableHeader.value=Value FXVideoPanel.pauseButton.infoLabel.playbackErr=Unable to play video. FXVideoPanel.progress.bufferingCancelled=media buffering was canceled FXVideoPanel.progress.bufferingInterrupted=media buffering was interrupted @@ -107,11 +85,6 @@ MediaViewVideoPanel.progressLabel.text=00:00 MediaViewVideoPanel.infoLabel.text=info MediaViewImagePanel.imgFileTooLarge.msg=Could not load image file (too large): {0} -MessageAccountPanel_button_create_label=Create -MessageAccountPanel_button_view_label=View -MessageAccountPanel_persona_label=Persona: -MessageAccountPanel_unknown_label=Unknown -MessageArtifactViewer.AttachmentPanel.title=Attachments Metadata.nodeText.none=None Metadata.nodeText.truncated=(results truncated) Metadata.nodeText.unknown=Unknown @@ -1054,46 +1027,4 @@ manager.properties.lafError =\ manager.properties.brokenProperty = Broken default property {0} value: {1} manager.properties.missingProperty = Missing default property {0} value: {1} -DefaultArtifactContentViewer.copyMenuItem.text=Copy -DefaultArtifactContentViewer.selectAllMenuItem.text=Select All -ContactArtifactViewer.contactNameLabel.text=Joanna Doe -ContactArtifactViewer.phonesLabel.text=Phone -ContactArtifactViewer.emailsLabel.text=Email -ContactArtifactViewer.othersLabel.text=Other -DefaultArtifactContentViewer.copyMenuItem.text=Copy -DefaultArtifactContentViewer.selectAllMenuItem.text=Select All -CallLogArtifactViewer.dataSourceNameLabel.text=data source name -CallLogArtifactViewer.jLabel2.text=Device Id -CallLogArtifactViewer.deviceIdLabel.text=device id -CallLogArtifactViewer.localAccountIdLabel.text=local account -CallLogArtifactViewer.localAccountLabel.text=Local Account -CallLogArtifactViewer.jLabel4.text=Data Source Name -CallLogArtifactViewer.otherInfoLabel.text=Other Information -CallLogArtifactViewer.sourceSectionLabel.text=Source -CallLogArtifactViewer.callDetailsLabel.text=Call Details -CallLogArtifactViewer.durationLabel.text=Duration.... -CallLogArtifactViewer.dateTimeLabel.text=Date/Time..... -CallLogArtifactViewer.directionLabel.text=Direction -CallLogArtifactViewer.onLabel.text=On -CallLogArtifactViewer.callLabel.text=call -MessageArtifactViewer.fromText.text=from address goes here -MessageArtifactViewer.datetimeText.text=date goes here -MessageArtifactViewer.headersScrollPane.TabConstraints.tabTitle=Headers -MessageArtifactViewer.fromLabel.text=From: -MessageArtifactViewer.directionText.text=direction -MessageArtifactViewer.subjectText.text=subject goes here -MessageArtifactViewer.viewInNewWindowButton.text=View in New Window -MessageArtifactViewer.subjectLabel.text=Subject: -MessageArtifactViewer.attachmentsPanel.TabConstraints.tabTitle=Attachments -MessageArtifactViewer.ccText.text=cc list goes here -MessageArtifactViewer.ccLabel.text=CC: -MessageArtifactViewer.rtfbodyScrollPane.TabConstraints.tabTitle=RTF -MessageArtifactViewer.toText.text=to list goes here -MessageArtifactViewer.toLabel.text=To: -MessageArtifactViewer.htmlPane.TabConstraints.tabTitle=HTML -CallLogArtifactViewer.localAccountPersonaLabel.text=Persona -CallLogArtifactViewer.localAccountPersonaNameLabel.text=jLabel1 -CallLogArtifactViewer.localAccountPersonaButton.text=jButton1 -ContactArtifactViewer.personasLabel.text=Personas -MessageArtifactViewer.accountsTab.TabConstraints.tabTitle=Accounts -ContactArtifactViewer.contactImage.text= + diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle_ja.properties index c5e6cc6eb4..9d325512a9 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle_ja.properties +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/Bundle_ja.properties @@ -149,20 +149,3 @@ MediaViewImagePanel.tagsMenu.text_1=\u30bf\u30b0\u30e1\u30cb\u30e5\u30fc SQLiteViewer.readTable.errorText=\u6b21\u306e\u30c6\u30fc\u30d6\u30eb\u306e\u884c\u3092\u53d6\u5f97\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: {0} # {0} - tableName SQLiteViewer.selectTable.errorText=\u6b21\u306e\u30c6\u30fc\u30d6\u30eb\u306e\u884c\u30ab\u30a6\u30f3\u30c8\u3092\u53d6\u5f97\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f: {0} -DefaultArtifactContentViewer.selectAllMenuItem.text=\u3059\u3079\u3066\u3092\u9078\u629e -DefaultArtifactContentViewer.copyMenuItem.text=\u30b3\u30d4\u30fc -MessageArtifactViewer.fromText.text=\u9001\u4fe1\u5143\u30a2\u30c9\u30ec\u30b9\u3092\u3053\u3053\u306b\u8868\u793a -MessageArtifactViewer.datetimeText.text=\u65e5\u4ed8\u3092\u3053\u3053\u306b\u8868\u793a -MessageArtifactViewer.headersScrollPane.TabConstraints.tabTitle=\u30d8\u30c3\u30c0\u30fc -MessageArtifactViewer.fromLabel.text=\u5dee\u51fa\u4eba: -MessageArtifactViewer.directionText.text=\u9001\u53d7\u4fe1\u306e\u7a2e\u5225 -MessageArtifactViewer.subjectText.text=\u4ef6\u540d\u3092\u3053\u3053\u306b\u8868\u793a -MessageArtifactViewer.viewInNewWindowButton.text=\u65b0\u3057\u3044\u30a6\u30a3\u30f3\u30c9\u30a6\u3067\u8868\u793a -MessageArtifactViewer.subjectLabel.text=\u4ef6\u540d: -MessageArtifactViewer.attachmentsPanel.TabConstraints.tabTitle=\u6dfb\u4ed8\u30d5\u30a1\u30a4\u30eb -MessageArtifactViewer.ccText.text=\u5b9b\u5148\u306eCC\u30ea\u30b9\u30c8\u3092\u3053\u3053\u306b\u8868\u793a -MessageArtifactViewer.ccLabel.text=CC: -MessageArtifactViewer.rtfbodyScrollPane.TabConstraints.tabTitle=RTF -MessageArtifactViewer.toText.text=\u5b9b\u5148\u306eTO\u30ea\u30b9\u30c8\u3092\u3053\u3053\u306b\u8868\u793a -MessageArtifactViewer.toLabel.text=\u5b9b\u5148: -MessageArtifactViewer.htmlPane.TabConstraints.tabTitle=HTML diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/ContactArtifactViewer.form b/Core/src/org/sleuthkit/autopsy/contentviewers/ContactArtifactViewer.form deleted file mode 100644 index 467d3ae72d..0000000000 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/ContactArtifactViewer.form +++ /dev/null @@ -1,227 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/ContactArtifactViewer.java b/Core/src/org/sleuthkit/autopsy/contentviewers/ContactArtifactViewer.java deleted file mode 100644 index 2d11fcf853..0000000000 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/ContactArtifactViewer.java +++ /dev/null @@ -1,942 +0,0 @@ -/* - * Autopsy Forensic Browser - * - * Copyright 2020 Basis Technology Corp. - * Contact: carrier sleuthkit org - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.sleuthkit.autopsy.contentviewers; - -import java.awt.Component; -import java.awt.Font; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.event.ActionListener; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.CancellationException; -import java.util.concurrent.ExecutionException; -import java.util.logging.Level; -import java.util.stream.Collectors; -import javax.imageio.ImageIO; -import javax.swing.ImageIcon; -import javax.swing.JButton; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import org.openide.util.lookup.ServiceProvider; -import javax.swing.SwingWorker; -import org.openide.util.NbBundle; -import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoAccount; -import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoException; -import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepository; -import org.sleuthkit.autopsy.centralrepository.datamodel.Persona; -import org.sleuthkit.autopsy.centralrepository.datamodel.PersonaAccount; -import org.sleuthkit.autopsy.centralrepository.persona.PersonaDetailsDialog; -import org.sleuthkit.autopsy.centralrepository.persona.PersonaDetailsDialogCallback; -import org.sleuthkit.autopsy.centralrepository.persona.PersonaDetailsMode; -import org.sleuthkit.autopsy.centralrepository.persona.PersonaDetailsPanel; -import org.sleuthkit.autopsy.coreutils.Logger; -import org.sleuthkit.datamodel.AbstractFile; -import org.sleuthkit.datamodel.BlackboardArtifact; -import org.sleuthkit.datamodel.BlackboardAttribute; -import org.sleuthkit.datamodel.Content; -import org.sleuthkit.datamodel.TskCoreException; - -/** - * This class displays the TSK_CONTACT artifact. - */ -@ServiceProvider(service = ArtifactContentViewer.class) -public class ContactArtifactViewer extends javax.swing.JPanel implements ArtifactContentViewer { - - private final static Logger logger = Logger.getLogger(ContactArtifactViewer.class.getName()); - private static final long serialVersionUID = 1L; - - private static final int TOP_INSET = 4; - private static final int LEFT_INSET = 12; - - // contact name, if available. - private String contactName; - - // A list of unique accounts matching the attributes of the contact artifact. - private final List contactUniqueAccountsList = new ArrayList<>(); - - // A list of all unique personas and their account, found by searching on the - // account identifier attributes of the Contact artifact. - private final Map> contactUniquePersonasMap = new HashMap<>(); - - private final static String DEFAULT_IMAGE_PATH = "/org/sleuthkit/autopsy/images/defaultContact.png"; - private final ImageIcon defaultImage; - - /** - * Creates new form for ContactArtifactViewer - */ - public ContactArtifactViewer() { - initComponents(); - - defaultImage = new ImageIcon(ContactArtifactViewer.class.getResource(DEFAULT_IMAGE_PATH)); - } - - /** - * This method is called from within the constructor to initialize the form. - * WARNING: Do NOT modify this code. The content of this method is always - * regenerated by the Form Editor. - */ - @SuppressWarnings("unchecked") - // //GEN-BEGIN:initComponents - private void initComponents() { - java.awt.GridBagConstraints gridBagConstraints; - - namePanel = new javax.swing.JPanel(); - contactNameLabel = new javax.swing.JLabel(); - phonesLabel = new javax.swing.JLabel(); - phoneNumbersPanel = new javax.swing.JPanel(); - emailsLabel = new javax.swing.JLabel(); - emailsPanel = new javax.swing.JPanel(); - othersLabel = new javax.swing.JLabel(); - otherAttrsPanel = new javax.swing.JPanel(); - javax.swing.Box.Filler interPanelfiller = new javax.swing.Box.Filler(new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 32767)); - personasLabel = new javax.swing.JLabel(); - personasPanel = new javax.swing.JPanel(); - javax.swing.Box.Filler bottomFiller = new javax.swing.Box.Filler(new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 32767)); - javax.swing.Box.Filler rightFiller = new javax.swing.Box.Filler(new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 0), new java.awt.Dimension(32767, 0)); - contactImage = new javax.swing.JLabel(); - - setLayout(new java.awt.GridBagLayout()); - - namePanel.setLayout(new java.awt.GridBagLayout()); - - contactNameLabel.setFont(contactNameLabel.getFont().deriveFont((contactNameLabel.getFont().getStyle() | java.awt.Font.ITALIC) | java.awt.Font.BOLD, contactNameLabel.getFont().getSize()+6)); - org.openide.awt.Mnemonics.setLocalizedText(contactNameLabel, org.openide.util.NbBundle.getMessage(ContactArtifactViewer.class, "ContactArtifactViewer.contactNameLabel.text")); // NOI18N - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 0; - gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; - gridBagConstraints.ipadx = 111; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.weightx = 1.0; - namePanel.add(contactNameLabel, gridBagConstraints); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 1; - gridBagConstraints.gridwidth = 5; - gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.weightx = 1.0; - gridBagConstraints.insets = new java.awt.Insets(6, 19, 0, 0); - add(namePanel, gridBagConstraints); - - phonesLabel.setFont(phonesLabel.getFont().deriveFont(phonesLabel.getFont().getStyle() | java.awt.Font.BOLD, phonesLabel.getFont().getSize()+2)); - org.openide.awt.Mnemonics.setLocalizedText(phonesLabel, org.openide.util.NbBundle.getMessage(ContactArtifactViewer.class, "ContactArtifactViewer.phonesLabel.text")); // NOI18N - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 2; - gridBagConstraints.gridwidth = 3; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.insets = new java.awt.Insets(6, 19, 0, 0); - add(phonesLabel, gridBagConstraints); - - phoneNumbersPanel.setLayout(new java.awt.GridBagLayout()); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 3; - gridBagConstraints.gridwidth = 4; - gridBagConstraints.fill = java.awt.GridBagConstraints.VERTICAL; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.insets = new java.awt.Insets(6, 19, 0, 0); - add(phoneNumbersPanel, gridBagConstraints); - - emailsLabel.setFont(emailsLabel.getFont().deriveFont(emailsLabel.getFont().getStyle() | java.awt.Font.BOLD, emailsLabel.getFont().getSize()+2)); - org.openide.awt.Mnemonics.setLocalizedText(emailsLabel, org.openide.util.NbBundle.getMessage(ContactArtifactViewer.class, "ContactArtifactViewer.emailsLabel.text")); // NOI18N - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 4; - gridBagConstraints.gridwidth = 2; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.insets = new java.awt.Insets(6, 19, 0, 0); - add(emailsLabel, gridBagConstraints); - - emailsPanel.setLayout(new java.awt.GridBagLayout()); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 5; - gridBagConstraints.gridwidth = 4; - gridBagConstraints.fill = java.awt.GridBagConstraints.VERTICAL; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.insets = new java.awt.Insets(6, 19, 0, 0); - add(emailsPanel, gridBagConstraints); - - othersLabel.setFont(othersLabel.getFont().deriveFont(othersLabel.getFont().getStyle() | java.awt.Font.BOLD, othersLabel.getFont().getSize()+2)); - org.openide.awt.Mnemonics.setLocalizedText(othersLabel, org.openide.util.NbBundle.getMessage(ContactArtifactViewer.class, "ContactArtifactViewer.othersLabel.text")); // NOI18N - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 6; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.insets = new java.awt.Insets(6, 19, 0, 0); - add(othersLabel, gridBagConstraints); - - otherAttrsPanel.setLayout(new java.awt.GridBagLayout()); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 7; - gridBagConstraints.gridwidth = 4; - gridBagConstraints.fill = java.awt.GridBagConstraints.VERTICAL; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.insets = new java.awt.Insets(6, 19, 0, 0); - add(otherAttrsPanel, gridBagConstraints); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 8; - gridBagConstraints.gridheight = 2; - gridBagConstraints.fill = java.awt.GridBagConstraints.VERTICAL; - gridBagConstraints.weighty = 0.1; - add(interPanelfiller, gridBagConstraints); - - personasLabel.setFont(personasLabel.getFont().deriveFont(personasLabel.getFont().getStyle() | java.awt.Font.BOLD, personasLabel.getFont().getSize()+2)); - org.openide.awt.Mnemonics.setLocalizedText(personasLabel, org.openide.util.NbBundle.getMessage(ContactArtifactViewer.class, "ContactArtifactViewer.personasLabel.text")); // NOI18N - personasLabel.setMaximumSize(new java.awt.Dimension(90, 19)); - personasLabel.setMinimumSize(new java.awt.Dimension(90, 19)); - personasLabel.setPreferredSize(new java.awt.Dimension(90, 19)); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 9; - gridBagConstraints.gridwidth = 3; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.insets = new java.awt.Insets(6, 19, 0, 0); - add(personasLabel, gridBagConstraints); - - personasPanel.setLayout(new java.awt.GridBagLayout()); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 10; - gridBagConstraints.gridwidth = 4; - gridBagConstraints.fill = java.awt.GridBagConstraints.VERTICAL; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.insets = new java.awt.Insets(6, 19, 0, 0); - add(personasPanel, gridBagConstraints); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 11; - gridBagConstraints.gridwidth = 4; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.weighty = 1.0; - add(bottomFiller, gridBagConstraints); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 4; - gridBagConstraints.gridy = 3; - gridBagConstraints.gridheight = 8; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.ipadx = 2; - gridBagConstraints.weightx = 1.0; - add(rightFiller, gridBagConstraints); - - contactImage.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/images/defaultContact.png"))); // NOI18N - org.openide.awt.Mnemonics.setLocalizedText(contactImage, org.openide.util.NbBundle.getMessage(ContactArtifactViewer.class, "ContactArtifactViewer.contactImage.text")); // NOI18N - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 0; - gridBagConstraints.insets = new java.awt.Insets(6, 19, 0, 0); - add(contactImage, gridBagConstraints); - }// //GEN-END:initComponents - - @Override - public void setArtifact(BlackboardArtifact artifact) { - - // Reset the panel. - resetComponent(); - - if (artifact == null) { - return; - } - - List phoneNumList = new ArrayList<>(); - List emailList = new ArrayList<>(); - List nameList = new ArrayList<>(); - List otherList = new ArrayList<>(); - List accountAttributesList = new ArrayList<>(); - - try { - // Get all the attributes and group them by the section panels they go in - for (BlackboardAttribute bba : artifact.getAttributes()) { - if (bba.getAttributeType().getTypeName().startsWith("TSK_PHONE")) { - phoneNumList.add(bba); - accountAttributesList.add(bba); - } else if (bba.getAttributeType().getTypeName().startsWith("TSK_EMAIL")) { - emailList.add(bba); - accountAttributesList.add(bba); - } else if (bba.getAttributeType().getTypeName().startsWith("TSK_NAME")) { - nameList.add(bba); - } else { - otherList.add(bba); - if (bba.getAttributeType().getTypeName().equalsIgnoreCase("TSK_ID")) { - accountAttributesList.add(bba); - } - } - } - } catch (TskCoreException ex) { - logger.log(Level.SEVERE, String.format("Error getting attributes for artifact (artifact_id=%d, obj_id=%d)", artifact.getArtifactID(), artifact.getObjectID()), ex); - } - // update name section - updateNamePanel(nameList); - - // update contact attributes sections - updateSection(phoneNumList, this.phonesLabel, this.phoneNumbersPanel); - updateSection(emailList, this.emailsLabel, this.emailsPanel); - updateSection(otherList, this.othersLabel, this.otherAttrsPanel); - - try { - initiatePersonasSearch(accountAttributesList); - } catch (CentralRepoException ex) { - logger.log(Level.SEVERE, String.format("Error getting Personas for Contact artifact (artifact_id=%d, obj_id=%d)", artifact.getArtifactID(), artifact.getObjectID()), ex); - } - - contactImage.setIcon(getImageFromArtifact(artifact)); - - // repaint - this.revalidate(); - this.repaint(); - } - - @Override - public Component getComponent() { - // Slap a vertical scrollbar on the panel. - return new JScrollPane(this, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); - } - - /** - * Checks if the given artifact is supported by this viewer. This viewer - * supports TSK_CONTACT artifacts. - * - * @param artifact artifact to check. - * - * @return True if the artifact is supported, false otherwise. - */ - @Override - public boolean isSupported(BlackboardArtifact artifact) { - return artifact.getArtifactTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_CONTACT.getTypeID(); - } - - /** - * Clears all artifact specific state. - */ - private void resetComponent() { - contactNameLabel.setVisible(false); - emailsLabel.setVisible(false); - emailsPanel.removeAll(); - //namePanel.removeAll(); // this is not dynamically populated, do not remove. - otherAttrsPanel.removeAll(); - othersLabel.setVisible(false); - personasLabel.setVisible(false); - personasPanel.removeAll(); - phoneNumbersPanel.removeAll(); - phonesLabel.setVisible(false); - - contactName = null; - contactUniqueAccountsList.clear(); - contactUniquePersonasMap.clear(); - contactImage.setIcon(defaultImage); - } - - /** - * Updates the contact name in the view. - * - * @param attributesList - */ - private void updateNamePanel(List attributesList) { - for (BlackboardAttribute bba : attributesList) { - if (bba.getAttributeType().getTypeName().startsWith("TSK_NAME")) { - contactName = bba.getDisplayString(); - contactNameLabel.setText(contactName); - contactNameLabel.setVisible(true); - break; - } - } - - contactNameLabel.revalidate(); - } - - /** - * Updates the view by displaying the given list of attributes in the given - * section panel. - * - * @param sectionAttributesList list of attributes to display. - * @param sectionLabel section name label. - * @param sectionPanel section panel to display the attributes in. - */ - private void updateSection(List sectionAttributesList, JLabel sectionLabel, JPanel sectionPanel) { - - // If there are no attributes for tis section, hide the section panel and the section label - if (sectionAttributesList.isEmpty()) { - sectionLabel.setVisible(false); - sectionPanel.setVisible(false); - return; - } - - // create a gridbag layout to show each attribute on one line - GridBagLayout gridBagLayout = new GridBagLayout(); - GridBagConstraints constraints = new GridBagConstraints(); - constraints.anchor = GridBagConstraints.FIRST_LINE_START; - constraints.gridy = 0; - constraints.insets = new java.awt.Insets(TOP_INSET, LEFT_INSET, 0, 0); - for (BlackboardAttribute bba : sectionAttributesList) { - constraints.fill = GridBagConstraints.NONE; - constraints.weightx = 0; - - constraints.gridx = 0; - - // Add a label for attribute type - javax.swing.JLabel attrTypeLabel = new javax.swing.JLabel(); - String attrLabel = bba.getAttributeType().getDisplayName(); - attrTypeLabel.setText(attrLabel); - - // make type label bold - uncomment if needed. - //attrTypeLabel.setFont(attrTypeLabel.getFont().deriveFont(Font.BOLD, attrTypeLabel.getFont().getSize() )); - gridBagLayout.setConstraints(attrTypeLabel, constraints); - sectionPanel.add(attrTypeLabel); - - // Add the attribute value - constraints.gridx++; - javax.swing.JLabel attrValueLabel = new javax.swing.JLabel(); - attrValueLabel.setText(bba.getValueString()); - gridBagLayout.setConstraints(attrValueLabel, constraints); - sectionPanel.add(attrValueLabel); - - // add a filler to take up rest of the space - constraints.gridx++; - constraints.weightx = 1.0; - constraints.fill = GridBagConstraints.HORIZONTAL; - sectionPanel.add(new javax.swing.Box.Filler(new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 0), new java.awt.Dimension(32767, 0))); - - constraints.gridy++; - } - - sectionLabel.setVisible(true); - sectionPanel.setVisible(true); - - sectionPanel.setLayout(gridBagLayout); - sectionPanel.revalidate(); - sectionPanel.repaint(); - } - - /** - * Kicks off a search for personas, based in the list of attributes. - * - * @param accountAttributesList a list of account identifying attributes. - * - * @throws CentralRepoException - */ - @NbBundle.Messages({ - "ContactArtifactViewer_persona_searching= Searching...", - "ContactArtifactViewer_persona_unknown=Unknown" - }) - private void initiatePersonasSearch(List accountAttributesList) throws CentralRepoException { - - personasLabel.setVisible(true); - - String personaStatusLabelText = CentralRepository.isEnabled() - ? Bundle.ContactArtifactViewer_persona_searching() - : Bundle.ContactArtifactViewer_persona_unknown(); - - // create a gridbag layout to show each participant on one line - GridBagLayout gridBagLayout = new GridBagLayout(); - GridBagConstraints constraints = new GridBagConstraints(); - constraints.anchor = GridBagConstraints.FIRST_LINE_START; - constraints.gridx = 0; - constraints.gridy = 0; - constraints.insets = new java.awt.Insets(TOP_INSET, LEFT_INSET, 0, 0); - - // Add a Persona Name label - constraints.fill = GridBagConstraints.NONE; - constraints.weightx = 0; - - //javax.swing.Box.Filler filler1 = this.createFiller(5, 0); - //personasPanel.add(filler1, constraints); - javax.swing.JLabel personaLabel = new javax.swing.JLabel(); - personaLabel.setText(Bundle.ContactArtifactViewer_persona_label()); - personaLabel.setFont(personaLabel.getFont().deriveFont(Font.BOLD, personaLabel.getFont().getSize())); - gridBagLayout.setConstraints(personaLabel, constraints); - personasPanel.add(personaLabel); - - constraints.gridy++; - javax.swing.JLabel personaStatusLabel = new javax.swing.JLabel(); - personaStatusLabel.setText(personaStatusLabelText); - gridBagLayout.setConstraints(personaStatusLabel, constraints); - personasPanel.add(personaStatusLabel); - - - if (CentralRepository.isEnabled() ) { - personasLabel.setEnabled(true); - - // Kick off a background task to serach for personas for the contact - ContactPersonaSearcherTask personaSearchTask = new ContactPersonaSearcherTask(accountAttributesList); - personaSearchTask.execute(); - } else { - personasLabel.setEnabled(false); - personaLabel.setEnabled(false); - personaStatusLabel.setEnabled(false); - } - - personasPanel.setLayout(gridBagLayout); - personasPanel.revalidate(); - personasPanel.repaint(); - } - - /** - * Updates the Persona panel with the gathered persona information. - */ - private void updatePersonasPanel() { - // Clear out the panel - personasPanel.removeAll(); - - GridBagLayout gridBagLayout = new GridBagLayout(); - GridBagConstraints constraints = new GridBagConstraints(); - constraints.anchor = GridBagConstraints.FIRST_LINE_START; - constraints.gridx = 0; - constraints.gridy = 0; - constraints.insets = new java.awt.Insets(TOP_INSET, LEFT_INSET, 0, 0); - - if (contactUniquePersonasMap.isEmpty()) { - showPersona(null, Collections.emptyList(), gridBagLayout, constraints); - } else { - for (Map.Entry> entry : contactUniquePersonasMap.entrySet()) { - List missingAccounts = new ArrayList<>(); - ArrayList personaAccounts = entry.getValue(); - - // create a list of accounts missing from this persona - for (CentralRepoAccount account : contactUniqueAccountsList) { - if (personaAccounts.contains(account) == false) { - missingAccounts.add(account); - } - } - - showPersona(entry.getKey(), missingAccounts, gridBagLayout, constraints); - - constraints.gridy += 2; - } - } - - personasPanel.setLayout(gridBagLayout); - personasPanel.setSize(personasPanel.getPreferredSize()); - personasPanel.revalidate(); - personasPanel.repaint(); - } - - @NbBundle.Messages({ - "ContactArtifactViewer_persona_label=Persona ", - "ContactArtifactViewer_persona_text_none=None found", - "ContactArtifactViewer_persona_button_view=View", - "ContactArtifactViewer_persona_button_new=Create", - "ContactArtifactViewer_missing_account_label=Missing Account: " - }) - - /** - * Displays the given persona in the persona panel. - * - * @param persona Persona to display. - * @param missingAccountsList List of accounts this persona may be missing. - * @param gridBagLayout Layout to use. - * @param constraints layout constraints. - * - * @throws CentralRepoException - */ - private void showPersona(Persona persona, List missingAccountsList, GridBagLayout gridBagLayout, GridBagConstraints constraints) { - - constraints.fill = GridBagConstraints.NONE; - constraints.weightx = 0; - constraints.gridx = 0; - - //javax.swing.Box.Filler filler1 = createFiller(5, 0); - // gridBagLayout.setConstraints(filler1, constraints); - //personasPanel.add(filler1); - // Add a "Persona" label - //constraints.gridx++; - javax.swing.JLabel personaLabel = new javax.swing.JLabel(); - personaLabel.setText(Bundle.ContactArtifactViewer_persona_label()); - personaLabel.setFont(personaLabel.getFont().deriveFont(Font.BOLD, personaLabel.getFont().getSize())); - gridBagLayout.setConstraints(personaLabel, constraints); - personasPanel.add(personaLabel); - - javax.swing.JLabel personaNameLabel = new javax.swing.JLabel(); - javax.swing.JButton personaButton = new javax.swing.JButton(); - - String personaName; - String personaButtonText; - ActionListener personaButtonListener; - - if (persona != null) { - personaName = persona.getName(); - personaButtonText = Bundle.ContactArtifactViewer_persona_button_view(); - personaButtonListener = new ViewPersonaButtonListener(persona); - } else { - personaName = Bundle.ContactArtifactViewer_persona_text_none(); - personaButtonText = Bundle.ContactArtifactViewer_persona_button_new(); - personaButtonListener = new CreatePersonaButtonListener(new PersonaUIComponents(personaNameLabel, personaButton)); - } - - // Add the label for persona name, - constraints.gridy++; - constraints.gridx = 0; - personaNameLabel.setText(personaName); - gridBagLayout.setConstraints(personaNameLabel, constraints); - personasPanel.add(personaNameLabel); - - //constraints.gridx++; - //personasPanel.add(createFiller(5, 0), constraints); - // Add a Persona action button - constraints.gridx++; - personaButton.setText(personaButtonText); - personaButton.addActionListener(personaButtonListener); - - // no top inset of the button, in order to center align with the labels. - constraints.insets = new java.awt.Insets(0, LEFT_INSET, 0, 0); - gridBagLayout.setConstraints(personaButton, constraints); - personasPanel.add(personaButton); - - // restore normal inset - constraints.insets = new java.awt.Insets(TOP_INSET, LEFT_INSET, 0, 0); - - // show missing accounts. - for (CentralRepoAccount missingAccount : missingAccountsList) { - constraints.weightx = 0; - constraints.gridx = 0; - constraints.gridy++; - - // Add a "Missing Account: " label - constraints.gridx++; // Ident - javax.swing.JLabel missingAccountLabel = new javax.swing.JLabel(); - missingAccountLabel.setText(Bundle.ContactArtifactViewer_missing_account_label()); - gridBagLayout.setConstraints(missingAccountLabel, constraints); - personasPanel.add(missingAccountLabel); - - // Add the label for account id, - constraints.gridx++; - javax.swing.JLabel missingAccountIdentifierLabel = new javax.swing.JLabel(); - missingAccountIdentifierLabel.setText(missingAccount.getIdentifier()); - gridBagLayout.setConstraints(missingAccountIdentifierLabel, constraints); - personasPanel.add(missingAccountIdentifierLabel); - } - } - - /** - * Gets an image from a TSK_CONTACT artifact. - * - * @param artifact - * - * @return Image from a TSK_CONTACT artifact or default image if none was - * found or the artifact is not a TSK_CONTACT - */ - private ImageIcon getImageFromArtifact(BlackboardArtifact artifact) { - ImageIcon imageIcon = defaultImage; - - if (artifact == null) { - return imageIcon; - } - - BlackboardArtifact.ARTIFACT_TYPE artifactType = BlackboardArtifact.ARTIFACT_TYPE.fromID(artifact.getArtifactTypeID()); - if (artifactType != BlackboardArtifact.ARTIFACT_TYPE.TSK_CONTACT) { - return imageIcon; - } - - try { - for (Content content : artifact.getChildren()) { - if (content instanceof AbstractFile) { - AbstractFile file = (AbstractFile) content; - - try { - BufferedImage image = ImageIO.read(new File(file.getLocalAbsPath())); - imageIcon = new ImageIcon(image); - break; - } catch (IOException ex) { - // ImageIO.read will through an IOException if file is not an image - // therefore we don't need to report this exception just try - // the next file. - } - } - } - } catch (TskCoreException ex) { - logger.log(Level.WARNING, String.format("Unable to load image for contact: %d", artifact.getId()), ex); - } - - return imageIcon; - } - - /** - * Thread to search for a personas for all account identifier attributes for - * a contact. - */ - private class ContactPersonaSearcherTask extends SwingWorker>, Void> { - - private final List accountAttributesList; - private final List uniqueAccountsList = new ArrayList<>(); - - /** - * Creates a persona searcher task. - * - * @param accountAttributesList List of attributes that may map to - * accounts. - */ - ContactPersonaSearcherTask(List accountAttributesList) { - this.accountAttributesList = accountAttributesList; - } - - @Override - protected Map> doInBackground() throws Exception { - - Map> uniquePersonas = new HashMap<>(); - - for (BlackboardAttribute bba : accountAttributesList) { - - // Get account, add to accounts list - Collection personas; - - Collection accountCandidates - = CentralRepoAccount.getAccountsWithIdentifier(bba.getValueString()); - - if (accountCandidates.isEmpty() == false) { - CentralRepoAccount account = accountCandidates.iterator().next(); - if (uniqueAccountsList.contains(account) == false) { - uniqueAccountsList.add(account); - } - - // get personas for the account - personas = PersonaAccount.getPersonaAccountsForAccount(account.getId()) - .stream() - .map(PersonaAccount::getPersona) - .collect(Collectors.toList()); - - // make a list of unique personas, along with all their accounts - for (Persona persona : personas) { - if (uniquePersonas.containsKey(persona) == false) { - Collection accounts = persona.getPersonaAccounts() - .stream() - .map(PersonaAccount::getAccount) - .collect(Collectors.toList()); - - ArrayList personaAccountsList = new ArrayList<>(accounts); - uniquePersonas.put(persona, personaAccountsList); - } - } - } - - } - - return uniquePersonas; - } - - @Override - protected void done() { - - Map> personasMap; - try { - personasMap = super.get(); - - if (this.isCancelled()) { - return; - } - - contactUniquePersonasMap.clear(); - contactUniquePersonasMap.putAll(personasMap); - contactUniqueAccountsList.clear(); - contactUniqueAccountsList.addAll(uniqueAccountsList); - - updatePersonasPanel(); - - } catch (CancellationException ex) { - logger.log(Level.INFO, "Persona searching was canceled."); //NON-NLS - } catch (InterruptedException ex) { - logger.log(Level.INFO, "Persona searching was interrupted."); //NON-NLS - } catch (ExecutionException ex) { - logger.log(Level.SEVERE, "Fatal error during Persona search.", ex); //NON-NLS - } - - } - } - - /** - * A wrapper class that bags the UI components that need to be updated when - * a persona search task or a create dialog returns. - */ - private class PersonaUIComponents { - - private final JLabel personaNameLabel; - private final JButton personaActionButton; - - /** - * Constructor. - * - * @param personaNameLabel Persona name label. - * @param personaActionButton Persona action button. - */ - PersonaUIComponents(JLabel personaNameLabel, JButton personaActionButton) { - this.personaNameLabel = personaNameLabel; - this.personaActionButton = personaActionButton; - } - - /** - * Returns persona name label. - * - * @return Persona name label. - */ - public JLabel getPersonaNameLabel() { - return personaNameLabel; - } - - /** - * Returns persona action button. - * - * @return Persona action button. - */ - public JButton getPersonaActionButton() { - return personaActionButton; - } - } - - /** - * Action listener for Create persona button. - */ - private class CreatePersonaButtonListener implements ActionListener { - - private final PersonaUIComponents personaUIComponents; - - /** - * Constructs a listener for Create persona button.. - * - * @param personaUIComponents UI components. - */ - CreatePersonaButtonListener(PersonaUIComponents personaUIComponents) { - this.personaUIComponents = personaUIComponents; - } - - @NbBundle.Messages({ - "ContactArtifactViewer_persona_account_justification=Account found in Contact artifact" - }) - - @Override - public void actionPerformed(java.awt.event.ActionEvent evt) { - // Launch the Persona Create dialog - do not display immediately - PersonaDetailsDialog createPersonaDialog = new PersonaDetailsDialog(ContactArtifactViewer.this, - PersonaDetailsMode.CREATE, null, new PersonaCreateCallbackImpl(personaUIComponents), false); - - // Pre populate the persona name and accounts if we have them. - PersonaDetailsPanel personaPanel = createPersonaDialog.getDetailsPanel(); - - if (contactName != null) { - personaPanel.setPersonaName(contactName); - } - - // pass the list of accounts to the dialog - for (CentralRepoAccount account : contactUniqueAccountsList) { - personaPanel.addAccount(account, Bundle.ContactArtifactViewer_persona_account_justification(), Persona.Confidence.HIGH); - } - - // display the dialog now - createPersonaDialog.display(); - } - } - - /** - * Action listener for View persona button. - */ - private class ViewPersonaButtonListener implements ActionListener { - - private final Persona persona; - - /** - * Creates listener for View persona button. - * - * @param persona - */ - ViewPersonaButtonListener(Persona persona) { - this.persona = persona; - } - - @Override - public void actionPerformed(java.awt.event.ActionEvent evt) { - new PersonaDetailsDialog(ContactArtifactViewer.this, - PersonaDetailsMode.VIEW, persona, new PersonaViewCallbackImpl()); - } - } - - /** - * Callback method for the create mode of the PersonaDetailsDialog - */ - class PersonaCreateCallbackImpl implements PersonaDetailsDialogCallback { - - private final PersonaUIComponents personaUIComponents; - - /** - * Creates a callback to handle new persona creation. - * - * @param personaUIComponents UI Components. - */ - PersonaCreateCallbackImpl(PersonaUIComponents personaUIComponents) { - this.personaUIComponents = personaUIComponents; - } - - @Override - public void callback(Persona persona) { - JButton personaButton = personaUIComponents.getPersonaActionButton(); - if (persona != null) { - // update the persona name label with newly created persona, - // and change the button to a "View" button - personaUIComponents.getPersonaNameLabel().setText(persona.getName()); - personaUIComponents.getPersonaActionButton().setText(Bundle.ContactArtifactViewer_persona_button_view()); - - // replace action listener with a View button listener - for (ActionListener act : personaButton.getActionListeners()) { - personaButton.removeActionListener(act); - } - personaButton.addActionListener(new ViewPersonaButtonListener(persona)); - - } - - personaButton.getParent().revalidate(); - personaButton.getParent().repaint(); - } - } - - /** - * Callback method for the view mode of the PersonaDetailsDialog - */ - class PersonaViewCallbackImpl implements PersonaDetailsDialogCallback { - - @Override - public void callback(Persona persona) { - // nothing to do - } - } - - - // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JLabel contactImage; - private javax.swing.JLabel contactNameLabel; - private javax.swing.JLabel emailsLabel; - private javax.swing.JPanel emailsPanel; - private javax.swing.JPanel namePanel; - private javax.swing.JPanel otherAttrsPanel; - private javax.swing.JLabel othersLabel; - private javax.swing.JLabel personasLabel; - private javax.swing.JPanel personasPanel; - private javax.swing.JPanel phoneNumbersPanel; - private javax.swing.JLabel phonesLabel; - // End of variables declaration//GEN-END:variables -} diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/HtmlPanel.java b/Core/src/org/sleuthkit/autopsy/contentviewers/HtmlPanel.java index 7a9de37fa3..81607ac9e2 100755 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/HtmlPanel.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/HtmlPanel.java @@ -42,7 +42,7 @@ import org.w3c.dom.events.EventTarget; * A file content viewer for HTML files. */ @SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives -final class HtmlPanel extends javax.swing.JPanel { +public final class HtmlPanel extends javax.swing.JPanel { private static final Logger logger = Logger.getLogger(HtmlPanel.class.getName()); private static final long serialVersionUID = 1L; @@ -54,7 +54,7 @@ final class HtmlPanel extends javax.swing.JPanel { /** * Creates new form HtmlViewerPanel */ - HtmlPanel() { + public HtmlPanel() { initComponents(); Platform.runLater(() -> { webView = new WebView(); @@ -83,7 +83,7 @@ final class HtmlPanel extends javax.swing.JPanel { * * @param htmlText The HTML text to be applied to the text pane. */ - void setHtmlText(String htmlText) { + public void setHtmlText(String htmlText) { this.htmlText = htmlText; refresh(); } @@ -91,7 +91,7 @@ final class HtmlPanel extends javax.swing.JPanel { /** * Clear the HTML in the text pane and disable the show/hide button. */ - void reset() { + public void reset() { Platform.runLater(() -> { webView.getEngine().loadContent("", TEXT_TYPE); }); diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/MediaViewImagePanel.java b/Core/src/org/sleuthkit/autopsy/contentviewers/MediaViewImagePanel.java index e5793e9c3e..957b887c75 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/MediaViewImagePanel.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/MediaViewImagePanel.java @@ -131,6 +131,8 @@ class MediaViewImagePanel extends JPanel implements MediaFileViewer.MediaViewPan private double zoomRatio; private double rotation; // Can be 0, 90, 180, and 270. + private boolean autoResize = true; // Auto resize when the user changes the size + // of the content viewer unless the user has used the zoom buttons. private static final double[] ZOOM_STEPS = { 0.0625, 0.125, 0.25, 0.375, 0.5, 0.75, 1, 1.5, 2, 2.5, 3, 4, 5, 6, 8, 10}; @@ -197,7 +199,7 @@ class MediaViewImagePanel extends JPanel implements MediaFileViewer.MediaViewPan imageTaggingOptions.add(exportTagsMenuItem); imageTaggingOptions.setPopupSize(300, 150); - + //Disable image tagging for non-windows users or upon failure to load OpenCV. if (!PlatformUtil.isWindowsOS() || !OpenCvLoader.openCvIsLoaded()) { tagsMenu.setEnabled(false); @@ -266,8 +268,8 @@ class MediaViewImagePanel extends JPanel implements MediaFileViewer.MediaViewPan /** * Handle tags menu item enabling and disabling given the state of the - * content viewer. For example, when the tags group is empty (no tags on image), - * disable delete menu item, hide menu item, and export menu item. + * content viewer. For example, when the tags group is empty (no tags on + * image), disable delete menu item, hide menu item, and export menu item. */ private void subscribeTagMenuItemsToStateChanges() { pcs.addPropertyChangeListener((event) -> { @@ -394,6 +396,7 @@ class MediaViewImagePanel extends JPanel implements MediaFileViewer.MediaViewPan } try { + autoResize = true; Image fxImage = readImageTask.get(); masterGroup.getChildren().clear(); tagsGroup.getChildren().clear(); @@ -464,7 +467,9 @@ class MediaViewImagePanel extends JPanel implements MediaFileViewer.MediaViewPan * current file. * * @param contentTags + * * @return + * * @throws TskCoreException * @throws NoCurrentCaseException */ @@ -488,7 +493,9 @@ class MediaViewImagePanel extends JPanel implements MediaFileViewer.MediaViewPan * appropriate type. * * @param contentTags + * * @return + * * @throws TskCoreException * @throws NoCurrentCaseException */ @@ -685,16 +692,21 @@ class MediaViewImagePanel extends JPanel implements MediaFileViewer.MediaViewPan }// //GEN-END:initComponents private void rotateLeftButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rotateLeftButtonActionPerformed + autoResize = false; + rotation = (rotation + 270) % 360; updateView(); }//GEN-LAST:event_rotateLeftButtonActionPerformed private void rotateRightButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_rotateRightButtonActionPerformed + autoResize = false; + rotation = (rotation + 90) % 360; updateView(); }//GEN-LAST:event_rotateRightButtonActionPerformed private void zoomInButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_zoomInButtonActionPerformed + autoResize = false; // Find the next zoom step. for (int i = 0; i < ZOOM_STEPS.length; i++) { if (zoomRatio < ZOOM_STEPS[i]) { @@ -706,6 +718,7 @@ class MediaViewImagePanel extends JPanel implements MediaFileViewer.MediaViewPan }//GEN-LAST:event_zoomInButtonActionPerformed private void zoomOutButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_zoomOutButtonActionPerformed + autoResize = false; // Find the next zoom step. for (int i = ZOOM_STEPS.length - 1; i >= 0; i--) { if (zoomRatio > ZOOM_STEPS[i]) { @@ -717,11 +730,16 @@ class MediaViewImagePanel extends JPanel implements MediaFileViewer.MediaViewPan }//GEN-LAST:event_zoomOutButtonActionPerformed private void zoomResetButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_zoomResetButtonActionPerformed + autoResize = true; resetView(); }//GEN-LAST:event_zoomResetButtonActionPerformed private void formComponentResized(java.awt.event.ComponentEvent evt) {//GEN-FIRST:event_formComponentResized - updateView(); + if (autoResize) { + resetView(); + } else { + updateView(); + } }//GEN-LAST:event_formComponentResized /** @@ -801,6 +819,7 @@ class MediaViewImagePanel extends JPanel implements MediaFileViewer.MediaViewPan * Creates an ImageTag instance from the ContentViewerTag. * * @param contentViewerTag + * * @return */ private ImageTag buildImageTag(ContentViewerTag contentViewerTag) { @@ -883,17 +902,17 @@ class MediaViewImagePanel extends JPanel implements MediaFileViewer.MediaViewPan List tags = Case.getCurrentCase().getServices() .getTagsManager().getContentTagsByContent(file); List> contentViewerTags = getContentViewerTags(tags); - + //Pull out image tag regions Collection regions = contentViewerTags.stream() .map(cvTag -> cvTag.getDetails()).collect(Collectors.toList()); - + //Apply tags to image and write to file BufferedImage taggedImage = ImageTagsUtil.getImageWithTags(file, regions); Path output = Paths.get(exportChooser.getSelectedFile().getPath(), FilenameUtils.getBaseName(file.getName()) + "-with_tags.png"); //NON-NLS ImageIO.write(taggedImage, "png", output.toFile()); - + JOptionPane.showMessageDialog(null, Bundle.MediaViewImagePanel_successfulExport()); } catch (Exception ex) { //Runtime exceptions may spill out of ImageTagsUtil from JavaFX. //This ensures we (devs and users) have something when it doesn't work. diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/TranslatablePanel.java b/Core/src/org/sleuthkit/autopsy/contentviewers/TranslatablePanel.java index 4f2508be28..3db616bf82 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/TranslatablePanel.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/TranslatablePanel.java @@ -37,14 +37,14 @@ import org.sleuthkit.autopsy.texttranslation.ui.TranslateTextTask; /** * This is a panel for translation with a subcomponent that allows for translation. */ -class TranslatablePanel extends JPanel { +public class TranslatablePanel extends JPanel { /** * This is an exception that can occur during the normal operation of the translatable * panel. For instance, this exception can be thrown if it is not possible to set the child * content to the provided content string. */ - class TranslatablePanelException extends Exception { + public class TranslatablePanelException extends Exception { public static final long serialVersionUID = 1L; TranslatablePanelException(String message) { @@ -61,7 +61,7 @@ class TranslatablePanel extends JPanel { * This describes a child component to be placed as a child of this panel. The child received * from {@link #getRootComponent() getRootComponent() } will listen for content updates from setContent(). */ - interface ContentComponent { + public interface ContentComponent { /** * This method gets root component of the translation panel. * @return the root component to insert into the translatable panel @@ -191,7 +191,7 @@ class TranslatablePanel extends JPanel { @Messages({"TranslatablePanel.comboBoxOption.originalText=Original Text", "TranslatablePanel.comboBoxOption.translatedText=Translated Text"}) - TranslatablePanel(ContentComponent contentComponent) { + public TranslatablePanel(ContentComponent contentComponent) { this( contentComponent, Bundle.TranslatablePanel_comboBoxOption_originalText(), @@ -263,7 +263,7 @@ class TranslatablePanel extends JPanel { * This resets the component to an empty state and sets the translation bar visibility * based on whether there is a provider. */ - final void reset() { + public final void reset() { setContent(null, null); } @@ -272,7 +272,7 @@ class TranslatablePanel extends JPanel { * @param content the content for the panel * @param contentDescriptor the content descriptor to be used in error messages */ - void setContent(String content, String contentDescriptor) { + public void setContent(String content, String contentDescriptor) { cancelPendingTranslation(); setTranslationEnabled(); this.translateComboBox.setSelectedIndex(0); diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/AccountPersonaSearcherData.java b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/AccountPersonaSearcherData.java similarity index 97% rename from Core/src/org/sleuthkit/autopsy/contentviewers/AccountPersonaSearcherData.java rename to Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/AccountPersonaSearcherData.java index 4b8092adaf..4dc4a9b5d9 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/AccountPersonaSearcherData.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/AccountPersonaSearcherData.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.contentviewers; +package org.sleuthkit.autopsy.contentviewers.artifactviewers; import javax.swing.JButton; import javax.swing.JLabel; diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/ArtifactContentViewer.java b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/ArtifactContentViewer.java similarity index 96% rename from Core/src/org/sleuthkit/autopsy/contentviewers/ArtifactContentViewer.java rename to Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/ArtifactContentViewer.java index 985ca96879..a71edd30b4 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/ArtifactContentViewer.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/ArtifactContentViewer.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.contentviewers; +package org.sleuthkit.autopsy.contentviewers.artifactviewers; import java.awt.Component; import org.sleuthkit.datamodel.BlackboardArtifact; diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties new file mode 100644 index 0000000000..03e30a6923 --- /dev/null +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties @@ -0,0 +1,34 @@ +# Copyright 2020 Basis Technology Corp. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an "AS +# IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either +# express or implied. See the License for the specific language +# governing permissions and limitations under the License. +# + +DefaultArtifactContentViewer.copyMenuItem.text=Copy +DefaultArtifactContentViewer.selectAllMenuItem.text=Select All +MessageArtifactViewer.ccLabel.text=CC: +MessageArtifactViewer.rtfbodyScrollPane.TabConstraints.tabTitle=RTF +MessageArtifactViewer.toText.text=to list goes here +MessageArtifactViewer.toLabel.text=To: +MessageArtifactViewer.htmlPane.TabConstraints.tabTitle=HTML +MessageArtifactViewer.fromText.text=from address goes here +MessageArtifactViewer.datetimeText.text=date goes here +MessageArtifactViewer.headersScrollPane.TabConstraints.tabTitle=Headers +MessageArtifactViewer.fromLabel.text=From: +MessageArtifactViewer.accountsTab.TabConstraints.tabTitle=Accounts +MessageArtifactViewer.directionText.text=direction +MessageArtifactViewer.subjectText.text=subject goes here +MessageArtifactViewer.viewInNewWindowButton.text=View in New Window +MessageArtifactViewer.subjectLabel.text=Subject: +MessageArtifactViewer.attachmentsPanel.TabConstraints.tabTitle=Attachments +MessageArtifactViewer.ccText.text=cc list goes here +MessageArtifactViewer.textbodyScrollPane.TabConstraints.tabTitle=Text diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties-MERGED new file mode 100644 index 0000000000..c69da11d54 --- /dev/null +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle.properties-MERGED @@ -0,0 +1,85 @@ +# Copyright 2020 Basis Technology Corp. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an "AS +# IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either +# express or implied. See the License for the specific language +# governing permissions and limitations under the License. +# + +CalllogArtifactViewer_cr_disabled_message=Enable Central Repository to view, create and edit personas. +CallLogArtifactViewer_heading_metadata=Metadata +CallLogArtifactViewer_heading_others=Other Attributes +CallLogArtifactViewer_heading_parties=Parties +CallLogArtifactViewer_heading_Source=Source +CallLogArtifactViewer_label_datasource=Data Source +CallLogArtifactViewer_label_date=Date +CallLogArtifactViewer_label_direction=Direction +CallLogArtifactViewer_label_duration=Duration +CallLogArtifactViewer_label_from=From +CallLogArtifactViewer_label_to=To +CallLogArtifactViewer_suffix_local=(Local) +CallLogArtifactViewer_value_unknown=Unknown +CommunicationArtifactViewerHelper_menuitem_copy=Copy +CommunicationArtifactViewerHelper_persona_button_create=Create +CommunicationArtifactViewerHelper_persona_button_view=View +CommunicationArtifactViewerHelper_persona_label=Persona: +CommunicationArtifactViewerHelper_persona_searching=Searching... +CommunicationArtifactViewerHelper_persona_unknown=Unknown +ContactArtifactViewer.contactImage.text= +ContactArtifactViewer_contactname_unknown=Unknown +ContactArtifactViewer_cr_disabled_message=Enable Central Repository to view, create and edit personas. +ContactArtifactViewer_emails_header=Email +ContactArtifactViewer_found_all_accounts_label=All accounts found. +ContactArtifactViewer_heading_Source=Source +ContactArtifactViewer_label_datasource=Data Source +ContactArtifactViewer_missing_account_label=Missing contact account +ContactArtifactViewer_others_header=Other +ContactArtifactViewer_persona_account_justification=Account found in Contact artifact +ContactArtifactViewer_persona_button_new=Create +ContactArtifactViewer_persona_button_view=View +ContactArtifactViewer_persona_header=Persona +ContactArtifactViewer_persona_label=Persona +ContactArtifactViewer_persona_match_num=Match +ContactArtifactViewer_persona_no_match=No matches found +ContactArtifactViewer_persona_searching=Searching... +ContactArtifactViewer_persona_unknown=Unknown +ContactArtifactViewer_phones_header=Phone +ContactArtifactViewer_plural_suffix=s +DataContentViewerArtifact.failedToGetAttributes.message=Failed to get some or all attributes from case database +DataContentViewerArtifact.failedToGetSourcePath.message=Failed to get source file path from case database +DefaultArtifactContentViewer.attrsTableHeader.sources=Source(s) +DefaultArtifactContentViewer.attrsTableHeader.type=Type +DefaultArtifactContentViewer.attrsTableHeader.value=Value +DefaultArtifactContentViewer.copyMenuItem.text=Copy +DefaultArtifactContentViewer.selectAllMenuItem.text=Select All +MessageAccountPanel_button_create_label=Create +MessageAccountPanel_button_view_label=View +MessageAccountPanel_persona_label=Persona: +MessageAccountPanel_unknown_label=Unknown +MessageArtifactViewer.AttachmentPanel.title=Attachments +MessageArtifactViewer.ccLabel.text=CC: +MessageArtifactViewer.rtfbodyScrollPane.TabConstraints.tabTitle=RTF +MessageArtifactViewer.toText.text=to list goes here +MessageArtifactViewer.toLabel.text=To: +MessageArtifactViewer.htmlPane.TabConstraints.tabTitle=HTML +MessageArtifactViewer.fromText.text=from address goes here +MessageArtifactViewer.datetimeText.text=date goes here +MessageArtifactViewer.headersScrollPane.TabConstraints.tabTitle=Headers +MessageArtifactViewer.fromLabel.text=From: +MessageArtifactViewer.accountsTab.TabConstraints.tabTitle=Accounts +MessageArtifactViewer.directionText.text=direction +MessageArtifactViewer.subjectText.text=subject goes here +MessageArtifactViewer.viewInNewWindowButton.text=View in New Window +MessageArtifactViewer.subjectLabel.text=Subject: +MessageArtifactViewer.attachmentsPanel.TabConstraints.tabTitle=Attachments +MessageArtifactViewer.ccText.text=cc list goes here +MessageArtifactViewer.textbodyScrollPane.TabConstraints.tabTitle=Text +# {0} - Persona count +PersonaDisplayTask_persona_count_suffix=(1 of {0}) diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle_ja.properties new file mode 100644 index 0000000000..60b2362764 --- /dev/null +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/Bundle_ja.properties @@ -0,0 +1,19 @@ + +DefaultArtifactContentViewer.selectAllMenuItem.text=\u3059\u3079\u3066\u3092\u9078\u629e + +DefaultArtifactContentViewer.copyMenuItem.text=\u30b3\u30d4\u30fc +MessageArtifactViewer.rtfbodyScrollPane.TabConstraints.tabTitle=RTF +MessageArtifactViewer.toText.text=\u5b9b\u5148\u306eTO\u30ea\u30b9\u30c8\u3092\u3053\u3053\u306b\u8868\u793a +MessageArtifactViewer.toLabel.text=\u5b9b\u5148: +MessageArtifactViewer.htmlPane.TabConstraints.tabTitle=HTML +MessageArtifactViewer.fromText.text=\u9001\u4fe1\u5143\u30a2\u30c9\u30ec\u30b9\u3092\u3053\u3053\u306b\u8868\u793a +MessageArtifactViewer.datetimeText.text=\u65e5\u4ed8\u3092\u3053\u3053\u306b\u8868\u793a +MessageArtifactViewer.headersScrollPane.TabConstraints.tabTitle=\u30d8\u30c3\u30c0\u30fc +MessageArtifactViewer.fromLabel.text=\u5dee\u51fa\u4eba: +MessageArtifactViewer.directionText.text=\u9001\u53d7\u4fe1\u306e\u7a2e\u5225 +MessageArtifactViewer.subjectText.text=\u4ef6\u540d\u3092\u3053\u3053\u306b\u8868\u793a +MessageArtifactViewer.viewInNewWindowButton.text=\u65b0\u3057\u3044\u30a6\u30a3\u30f3\u30c9\u30a6\u3067\u8868\u793a +MessageArtifactViewer.subjectLabel.text=\u4ef6\u540d: +MessageArtifactViewer.attachmentsPanel.TabConstraints.tabTitle=\u6dfb\u4ed8\u30d5\u30a1\u30a4\u30eb +MessageArtifactViewer.ccText.text=\u5b9b\u5148\u306eCC\u30ea\u30b9\u30c8\u3092\u3053\u3053\u306b\u8868\u793a +MessageArtifactViewer.ccLabel.text=CC: diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/CallLogArtifactViewer.form b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/CallLogArtifactViewer.form similarity index 100% rename from Core/src/org/sleuthkit/autopsy/contentviewers/CallLogArtifactViewer.form rename to Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/CallLogArtifactViewer.form diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/CallLogArtifactViewer.java b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/CallLogArtifactViewer.java similarity index 84% rename from Core/src/org/sleuthkit/autopsy/contentviewers/CallLogArtifactViewer.java rename to Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/CallLogArtifactViewer.java index 99b662f52a..cdac130944 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/CallLogArtifactViewer.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/CallLogArtifactViewer.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.contentviewers; +package org.sleuthkit.autopsy.contentviewers.artifactviewers; import java.awt.Component; import java.awt.GridBagConstraints; @@ -27,7 +27,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.Set; import java.util.logging.Level; import javax.swing.JScrollPane; @@ -35,6 +34,7 @@ import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.openide.util.NbBundle; import org.openide.util.lookup.ServiceProvider; +import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepository; import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.datamodel.BlackboardArtifact; import org.sleuthkit.datamodel.BlackboardAttribute; @@ -66,8 +66,8 @@ public class CallLogArtifactViewer extends javax.swing.JPanel implements Artifac private GridBagLayout m_gridBagLayout = new GridBagLayout(); private GridBagConstraints m_constraints = new GridBagConstraints(); - - private final List personaSearchtasks = new ArrayList<>(); + + private PersonaAccountFetcher currentAccountFetcher = null; /** * Creates new form CallLogArtifactViewer. @@ -92,6 +92,10 @@ public class CallLogArtifactViewer extends javax.swing.JPanel implements Artifac public void setArtifact(BlackboardArtifact artifact) { resetComponent(); + if (artifact == null) { + return; + } + CallLogViewData callLogViewData = null; try { callLogViewData = getCallLogViewData(artifact); @@ -101,11 +105,16 @@ public class CallLogArtifactViewer extends javax.swing.JPanel implements Artifac // update the view with the call log data if (callLogViewData != null) { - updateView(callLogViewData); + List personaSearchDataList = updateView(callLogViewData); + if(!personaSearchDataList.isEmpty()) { + currentAccountFetcher = new PersonaAccountFetcher(artifact, personaSearchDataList, this); + currentAccountFetcher.execute(); + } else { + currentAccountFetcher = null; + } } // repaint this.revalidate(); - } /** @@ -281,6 +290,8 @@ public class CallLogArtifactViewer extends javax.swing.JPanel implements Artifac * Update the viewer with the call log data. * * @param callLogViewData Call log data to update the view with. + * + * @return List of AccountPersonaSearcherData objects. */ @NbBundle.Messages({ "CallLogArtifactViewer_heading_parties=Parties", @@ -288,10 +299,11 @@ public class CallLogArtifactViewer extends javax.swing.JPanel implements Artifac "CallLogArtifactViewer_label_from=From", "CallLogArtifactViewer_label_to=To" }) - private void updateView(CallLogViewData callLogViewData) { + private List updateView(CallLogViewData callLogViewData) { CommunicationArtifactViewerHelper.addHeader(this, m_gridBagLayout, this.m_constraints, Bundle.CallLogArtifactViewer_heading_parties()); + List dataList = new ArrayList<>(); // Display From address CommunicationArtifactViewerHelper.addKey(this, m_gridBagLayout, this.m_constraints, Bundle.CallLogArtifactViewer_label_from()); @@ -301,10 +313,7 @@ public class CallLogArtifactViewer extends javax.swing.JPanel implements Artifac CommunicationArtifactViewerHelper.addValue(this, m_gridBagLayout, this.m_constraints, accountDisplayString); // show persona - Optional task = CommunicationArtifactViewerHelper.addPersonaRow(this, m_gridBagLayout, this.m_constraints, callLogViewData.getFromAccount()); - if (task.isPresent()) { - personaSearchtasks.add(task.get()); - } + dataList.addAll( CommunicationArtifactViewerHelper.addPersonaRow(this, m_gridBagLayout, this.m_constraints, callLogViewData.getFromAccount())); } else { CommunicationArtifactViewerHelper.addValue(this, m_gridBagLayout, this.m_constraints, Bundle.CallLogArtifactViewer_value_unknown()); } @@ -315,10 +324,8 @@ public class CallLogArtifactViewer extends javax.swing.JPanel implements Artifac String accountDisplayString = getAccountDisplayString(callLogViewData.getToAccount(), callLogViewData); CommunicationArtifactViewerHelper.addValue(this, m_gridBagLayout, this.m_constraints, accountDisplayString); - Optional task = CommunicationArtifactViewerHelper.addPersonaRow(this, m_gridBagLayout, this.m_constraints, callLogViewData.getToAccount()); - if (task.isPresent()) { - personaSearchtasks.add(task.get()); - } + dataList.addAll( CommunicationArtifactViewerHelper.addPersonaRow(this, m_gridBagLayout, this.m_constraints, callLogViewData.getToAccount())); + } else { CommunicationArtifactViewerHelper.addValue(this, m_gridBagLayout, this.m_constraints, Bundle.CallLogArtifactViewer_value_unknown()); } @@ -328,20 +335,26 @@ public class CallLogArtifactViewer extends javax.swing.JPanel implements Artifac CommunicationArtifactViewerHelper.addKey(this, m_gridBagLayout, this.m_constraints, Bundle.CallLogArtifactViewer_label_to()); CommunicationArtifactViewerHelper.addValue(this, m_gridBagLayout, this.m_constraints, otherParty); - Optional task = CommunicationArtifactViewerHelper.addPersonaRow(this, m_gridBagLayout, this.m_constraints, otherParty); - if (task.isPresent()) { - personaSearchtasks.add(task.get()); - } + dataList.addAll( CommunicationArtifactViewerHelper.addPersonaRow(this, m_gridBagLayout, this.m_constraints, otherParty)); } updateMetadataView(callLogViewData); + + updateOtherAttributesView(callLogViewData); + updateSourceView(callLogViewData); + if (CentralRepository.isEnabled() == false) { + showCRDisabledMessage(); + } + CommunicationArtifactViewerHelper.addPageEndGlue(this, m_gridBagLayout, this.m_constraints); this.setLayout(m_gridBagLayout); this.revalidate(); this.repaint(); + + return dataList; } /** @@ -392,6 +405,37 @@ public class CallLogArtifactViewer extends javax.swing.JPanel implements Artifac CommunicationArtifactViewerHelper.addValue(this, m_gridBagLayout, this.m_constraints, callLogViewData.getDataSourceName()); } + /** + * Update the other attributes section. + * + * @param callLogViewData Call log data. + */ + @NbBundle.Messages({ + "CallLogArtifactViewer_heading_others=Other Attributes" + }) + private void updateOtherAttributesView(CallLogViewData callLogViewData) { + + if (callLogViewData.getOtherAttributes().isEmpty()) { + return; + } + CommunicationArtifactViewerHelper.addHeader(this, m_gridBagLayout, this.m_constraints, Bundle.CallLogArtifactViewer_heading_others()); + + for (Map.Entry entry : callLogViewData.getOtherAttributes().entrySet()) { + CommunicationArtifactViewerHelper.addKey(this, m_gridBagLayout, this.m_constraints, entry.getKey()); + CommunicationArtifactViewerHelper.addValue(this, m_gridBagLayout, this.m_constraints, entry.getValue()); + } + } + + @NbBundle.Messages({ + "CalllogArtifactViewer_cr_disabled_message=Enable Central Repository to view, create and edit personas." + }) + private void showCRDisabledMessage() { + CommunicationArtifactViewerHelper.addBlankLine(this, m_gridBagLayout, m_constraints); + m_constraints.gridy++; + CommunicationArtifactViewerHelper.addMessageRow(this, m_gridBagLayout, m_constraints, Bundle.ContactArtifactViewer_cr_disabled_message()); + m_constraints.gridy++; + } + /** * Returns display string for a account. Checks if the given account is the * local account, if it is known. If it is, it appends a "(Local)" suffix to @@ -419,7 +463,9 @@ public class CallLogArtifactViewer extends javax.swing.JPanel implements Artifac @Override public boolean isSupported(BlackboardArtifact artifact) { - return artifact.getArtifactTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_CALLLOG.getTypeID(); + + return (artifact != null) + && (artifact.getArtifactTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_CALLLOG.getTypeID()); } /** @@ -428,8 +474,10 @@ public class CallLogArtifactViewer extends javax.swing.JPanel implements Artifac private void resetComponent() { // cancel any outstanding persona searching threads. - personaSearchtasks.forEach(task -> task.cancel(Boolean.TRUE)); - personaSearchtasks.clear(); + if(currentAccountFetcher != null && !currentAccountFetcher.isDone()) { + currentAccountFetcher.cancel(true); + currentAccountFetcher = null; + } // clear the panel this.removeAll(); @@ -441,9 +489,9 @@ public class CallLogArtifactViewer extends javax.swing.JPanel implements Artifac m_constraints.anchor = GridBagConstraints.FIRST_LINE_START; m_constraints.gridy = 0; m_constraints.gridx = 0; - m_constraints.weighty = 0.05; - m_constraints.weightx = 0.05; - m_constraints.insets = new java.awt.Insets(0, 0, 0, 0); + m_constraints.weighty = 0.0; + m_constraints.weightx = 0.0; // keep components fixed horizontally. + m_constraints.insets = new java.awt.Insets(0, CommunicationArtifactViewerHelper.LEFT_INSET, 0, 0); m_constraints.fill = GridBagConstraints.NONE; } diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/CallLogViewData.java b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/CallLogViewData.java similarity index 98% rename from Core/src/org/sleuthkit/autopsy/contentviewers/CallLogViewData.java rename to Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/CallLogViewData.java index ef7c8c7c54..dabba1b0ca 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/CallLogViewData.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/CallLogViewData.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.contentviewers; +package org.sleuthkit.autopsy.contentviewers.artifactviewers; import java.util.ArrayList; import java.util.Collection; diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/CommunicationArtifactViewerHelper.java b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/CommunicationArtifactViewerHelper.java similarity index 65% rename from Core/src/org/sleuthkit/autopsy/contentviewers/CommunicationArtifactViewerHelper.java rename to Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/CommunicationArtifactViewerHelper.java index bb37885786..2ae186e044 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/CommunicationArtifactViewerHelper.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/CommunicationArtifactViewerHelper.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.contentviewers; +package org.sleuthkit.autopsy.contentviewers.artifactviewers; import java.awt.Dimension; import java.awt.Font; @@ -27,12 +27,14 @@ import java.awt.Toolkit; import java.awt.datatransfer.StringSelection; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.util.ArrayList; +import java.util.List; import javax.swing.JLabel; import javax.swing.JMenuItem; +import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.JPopupMenu; import javax.swing.SwingUtilities; -import java.util.Optional; import org.openide.util.NbBundle; import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepository; @@ -41,20 +43,20 @@ import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepository; * A class to help display a communication artifact in a panel using a * gridbaglayout. */ -public final class CommunicationArtifactViewerHelper { +final class CommunicationArtifactViewerHelper { // Number of columns in the gridbag layout. private final static int MAX_COLS = 4; - private final static int LEFT_INDENT = 12; - + final static int LEFT_INSET = 12; + /** * Empty private constructor */ private CommunicationArtifactViewerHelper() { } - + /** * Adds a new heading to the panel. * @@ -62,8 +64,15 @@ public final class CommunicationArtifactViewerHelper { * @param gridbagLayout Layout to use. * @param constraints Constrains to use. * @param headerString Heading string to display. + * + * @return JLabel Heading label added. */ - static void addHeader(JPanel panel, GridBagLayout gridbagLayout, GridBagConstraints constraints, String headerString) { + static JLabel addHeader(JPanel panel, GridBagLayout gridbagLayout, GridBagConstraints constraints, String headerString) { + + Insets savedInsets = constraints.insets; + + // create label for heading + javax.swing.JLabel headingLabel = new javax.swing.JLabel(); // add a blank line before the start of new section, unless it's // the first section @@ -75,9 +84,9 @@ public final class CommunicationArtifactViewerHelper { // let the header span all of the row constraints.gridwidth = MAX_COLS; + constraints.insets = new Insets(0, 0, 0, 0); // No inset for header - // create label for heading - javax.swing.JLabel headingLabel = new javax.swing.JLabel(); + // set text headingLabel.setText(headerString); // make it large and bold @@ -92,6 +101,28 @@ public final class CommunicationArtifactViewerHelper { // add line end glue addLineEndGlue(panel, gridbagLayout, constraints); + + //restore insets + constraints.insets = savedInsets; + + return headingLabel; + } + + /** + * Adds the given component to the panel. + * + * Caller must know what it's doing and set up all the constraints properly. + * + * @param panel Panel to update. + * @param gridbagLayout Layout to use. + * @param constraints Constrains to use. + * @param component Component to add. + */ + static void addComponent(JPanel panel, GridBagLayout gridbagLayout, GridBagConstraints constraints, JComponent component) { + + // add to panel + gridbagLayout.setConstraints(component, constraints); + panel.add(component); } /** @@ -102,7 +133,7 @@ public final class CommunicationArtifactViewerHelper { * @param gridbagLayout Layout to use. * @param constraints Constrains to use. */ - private static void addLineEndGlue(JPanel panel, GridBagLayout gridbagLayout, GridBagConstraints constraints) { + static void addLineEndGlue(JPanel panel, GridBagLayout gridbagLayout, GridBagConstraints constraints) { // Place the filler just past the last column. constraints.gridx = MAX_COLS; @@ -155,7 +186,7 @@ public final class CommunicationArtifactViewerHelper { * @param gridbagLayout Layout to use. * @param constraints Constrains to use. */ - private static void addBlankLine(JPanel panel, GridBagLayout gridbagLayout, GridBagConstraints constraints) { + static void addBlankLine(JPanel panel, GridBagLayout gridbagLayout, GridBagConstraints constraints) { constraints.gridy++; constraints.gridx = 0; @@ -167,54 +198,85 @@ public final class CommunicationArtifactViewerHelper { } /** - * Adds a label/key to the panel. + * Adds a label/key to the panel at col 0. * * @param panel Panel to update. * @param gridbagLayout Layout to use. * @param constraints Constrains to use. * @param keyString Key name to display. + * + * @return Label added. */ - static void addKey(JPanel panel, GridBagLayout gridbagLayout, GridBagConstraints constraints, String keyString) { + static JLabel addKey(JPanel panel, GridBagLayout gridbagLayout, GridBagConstraints constraints, String keyString) { + return addKeyAtCol(panel, gridbagLayout, constraints, keyString, 0); + } + + /** + * Adds a label/key to the panel at specified column. + * + * @param panel Panel to update. + * @param gridbagLayout Layout to use. + * @param constraints Constrains to use. + * @param keyString Key name to display. + * @param gridx column index, must be less than MAX_COLS - 1. + * + * @return Label added. + */ + static JLabel addKeyAtCol(JPanel panel, GridBagLayout gridbagLayout, GridBagConstraints constraints, String keyString, int gridx) { + + // create label + javax.swing.JLabel keyLabel = new javax.swing.JLabel(); constraints.gridy++; - constraints.gridx = 0; + constraints.gridx = gridx < MAX_COLS - 1 ? gridx : MAX_COLS - 2; - Insets savedInsets = constraints.insets; - - // Set inset to indent in - constraints.insets = new java.awt.Insets(0, LEFT_INDENT, 0, 0); - - // create label, - javax.swing.JLabel keyLabel = new javax.swing.JLabel(); + // set text keyLabel.setText(keyString + ": "); // add to panel gridbagLayout.setConstraints(keyLabel, constraints); panel.add(keyLabel); - // restore inset - constraints.insets = savedInsets; + return keyLabel; } /** - * Adds a value string to the panel. + * Adds a value string to the panel at col 1. * * @param panel Panel to update. * @param gridbagLayout Layout to use. * @param constraints Constrains to use. * @param keyString Value string to display. + * + * @return Label added. */ - static void addValue(JPanel panel, GridBagLayout gridbagLayout, GridBagConstraints constraints, String valueString) { + static JLabel addValue(JPanel panel, GridBagLayout gridbagLayout, GridBagConstraints constraints, String valueString) { + return addValueAtCol(panel, gridbagLayout, constraints, valueString, 1); + } - constraints.gridx = 1; + /** + * Adds a value string to the panel at specified column. + * + * @param panel Panel to update. + * @param gridbagLayout Layout to use. + * @param constraints Constrains to use. + * @param keyString Value string to display. + * @param gridx Column index, must be less than MAX_COLS; + * + * @return Label added. + */ + static JLabel addValueAtCol(JPanel panel, GridBagLayout gridbagLayout, GridBagConstraints constraints, String valueString, int gridx) { + // create label, + javax.swing.JLabel valueField = new javax.swing.JLabel(); + + constraints.gridx = gridx < MAX_COLS ? gridx : MAX_COLS - 1; int savedGridwidth = constraints.gridwidth; // let the value span 2 cols constraints.gridwidth = 2; - // create label, - javax.swing.JLabel valueField = new javax.swing.JLabel(); + // set text valueField.setText(valueString); // attach a right click menu with Copy option @@ -234,6 +296,63 @@ public final class CommunicationArtifactViewerHelper { // end the line addLineEndGlue(panel, gridbagLayout, constraints); + + return valueField; + } + + /** + * Displays a message string, starting at column 0, and spanning the entire + * row. + * + * @param panel Panel to show. + * @param gridbagLayout Layout to use. + * @param constraints Constraints to use. + * + * @param messageString Message to display. + * + * @return Label for message added. + */ + static JLabel addMessageRow(JPanel panel, GridBagLayout gridbagLayout, GridBagConstraints constraints, String messageString) { + return addMessageRow(panel, gridbagLayout, constraints, messageString, 0); + } + + /** + * Displays a message string, starting at specified column, and spanning the + * entire row. + * + * @param panel Panel to show. + * @param gridbagLayout Layout to use. + * @param constraints Constraints to use. + * + * @param messageString Message to display. + * + * @return Label for message added. + */ + static JLabel addMessageRow(JPanel panel, GridBagLayout gridbagLayout, GridBagConstraints constraints, String messageString, int gridx) { + + // create label + javax.swing.JLabel messageLabel = new javax.swing.JLabel(); + + constraints.gridy++; + constraints.gridx = gridx < MAX_COLS - 1 ? gridx : MAX_COLS - 2; + + int savedGridwidth = constraints.gridwidth; + + constraints.gridwidth = 3; + + // set text + messageLabel.setText(messageString); + + // add to panel + gridbagLayout.setConstraints(messageLabel, constraints); + panel.add(messageLabel); + + addLineEndGlue(panel, gridbagLayout, constraints); + + // restore constraints + constraints.gridwidth = savedGridwidth; + + return messageLabel; } /** @@ -250,8 +369,7 @@ public final class CommunicationArtifactViewerHelper { * @param constraints Constrains to use. * @param accountIdentifier Account identifier to search the persona. * - * @return Optional PersonaSearchAndDisplayTask started to search for - * persona. + * @return List of AccountPersonaSearcherData objects. */ @NbBundle.Messages({ "CommunicationArtifactViewerHelper_persona_label=Persona: ", @@ -260,17 +378,17 @@ public final class CommunicationArtifactViewerHelper { "CommunicationArtifactViewerHelper_persona_button_view=View", "CommunicationArtifactViewerHelper_persona_button_create=Create" }) - static Optional addPersonaRow(JPanel panel, GridBagLayout gridbagLayout, GridBagConstraints constraints, String accountIdentifier) { - - PersonaSearchAndDisplayTask personaTask = null; + + static List addPersonaRow(JPanel panel, GridBagLayout gridbagLayout, GridBagConstraints constraints, String accountIdentifier) { + List dataList = new ArrayList<>(); constraints.gridy++; constraints.gridx = 1; Insets savedInsets = constraints.insets; - // Indent in - constraints.insets = new java.awt.Insets(0, LEFT_INDENT, 0, 0); + // extra Indent in + constraints.insets = new java.awt.Insets(0, 2 * LEFT_INSET, 0, 0); // create label javax.swing.JLabel personaLabel = new javax.swing.JLabel(); @@ -293,23 +411,22 @@ public final class CommunicationArtifactViewerHelper { // Place a button as place holder. It will be enabled when persona is available. javax.swing.JButton personaButton = new javax.swing.JButton(); personaButton.setText(Bundle.CommunicationArtifactViewerHelper_persona_button_view()); + personaButton.setMargin(new Insets(0, 5, 0, 5)); personaButton.setEnabled(false); - gridbagLayout.setConstraints(personaButton, constraints); panel.add(personaButton); if (CentralRepository.isEnabled()) { // kick off a task to find the persona for this account - personaTask = new PersonaSearchAndDisplayTask(panel, new AccountPersonaSearcherData(accountIdentifier, personaLabel, personaButton)); - personaTask.execute(); + dataList.add(new AccountPersonaSearcherData(accountIdentifier, personaLabel, personaButton)); } else { personaLabel.setEnabled(false); } addLineEndGlue(panel, gridbagLayout, constraints); - return Optional.ofNullable(personaTask); + return dataList; } /** diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/ContactArtifactViewer.form b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/ContactArtifactViewer.form new file mode 100644 index 0000000000..806a0e3de5 --- /dev/null +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/ContactArtifactViewer.form @@ -0,0 +1,21 @@ + + +
+ + + + + + + + + + + + + + + + + + diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/ContactArtifactViewer.java b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/ContactArtifactViewer.java new file mode 100644 index 0000000000..734a7ec180 --- /dev/null +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/ContactArtifactViewer.java @@ -0,0 +1,867 @@ +/* + * Autopsy Forensic Browser + * + * Copyright 2020 Basis Technology Corp. + * Contact: carrier sleuthkit org + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.sleuthkit.autopsy.contentviewers.artifactviewers; + +import java.awt.Component; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.awt.event.ActionListener; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CancellationException; +import java.util.concurrent.ExecutionException; +import java.util.logging.Level; +import java.util.stream.Collectors; +import javax.imageio.ImageIO; +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JLabel; +import javax.swing.JScrollPane; +import javax.swing.SwingWorker; +import org.apache.commons.lang.StringUtils; +import org.openide.util.NbBundle; +import org.openide.util.lookup.ServiceProvider; +import org.sleuthkit.autopsy.casemodule.Case; +import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoAccount; +import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoException; +import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepository; +import org.sleuthkit.autopsy.centralrepository.datamodel.Persona; +import org.sleuthkit.autopsy.centralrepository.datamodel.PersonaAccount; +import org.sleuthkit.autopsy.centralrepository.persona.PersonaDetailsDialog; +import org.sleuthkit.autopsy.centralrepository.persona.PersonaDetailsDialogCallback; +import org.sleuthkit.autopsy.centralrepository.persona.PersonaDetailsMode; +import org.sleuthkit.autopsy.centralrepository.persona.PersonaDetailsPanel; +import org.sleuthkit.autopsy.coreutils.Logger; +import org.sleuthkit.datamodel.AbstractFile; +import org.sleuthkit.datamodel.Account; +import org.sleuthkit.datamodel.BlackboardArtifact; +import org.sleuthkit.datamodel.BlackboardAttribute; +import org.sleuthkit.datamodel.CommunicationsManager; +import org.sleuthkit.datamodel.Content; +import org.sleuthkit.datamodel.TskCoreException; + +/** + * This class displays the TSK_CONTACT artifact. + */ +@ServiceProvider(service = ArtifactContentViewer.class) +public class ContactArtifactViewer extends javax.swing.JPanel implements ArtifactContentViewer { + + private final static Logger logger = Logger.getLogger(ContactArtifactViewer.class.getName()); + private static final long serialVersionUID = 1L; + + private GridBagLayout m_gridBagLayout = new GridBagLayout(); + private GridBagConstraints m_constraints = new GridBagConstraints(); + + private JLabel personaSearchStatusLabel; + + private BlackboardArtifact contactArtifact; + private String contactName; + private String datasourceName; + + private List phoneNumList = new ArrayList<>(); + private List emailList = new ArrayList<>(); + private List nameList = new ArrayList<>(); + private List otherList = new ArrayList<>(); + private List accountAttributesList = new ArrayList<>(); + + private final static String DEFAULT_IMAGE_PATH = "/org/sleuthkit/autopsy/images/defaultContact.png"; + private final ImageIcon defaultImage; + + // A list of unique accounts matching the attributes of the contact artifact. + private final List contactUniqueAccountsList = new ArrayList<>(); + + // A list of all unique personas and their account, found by searching on the + // account identifier attributes of the Contact artifact. + private final Map> contactUniquePersonasMap = new HashMap<>(); + + private ContactPersonaSearcherTask personaSearchTask; + + /** + * Creates new form ContactArtifactViewer + */ + public ContactArtifactViewer() { + initComponents(); + + defaultImage = new ImageIcon(ContactArtifactViewer.class.getResource(DEFAULT_IMAGE_PATH)); + } + + /** + * This method is called from within the constructor to initialize the form. + * WARNING: Do NOT modify this code. The content of this method is always + * regenerated by the Form Editor. + */ + @SuppressWarnings("unchecked") + // //GEN-BEGIN:initComponents + private void initComponents() { + + setToolTipText(""); // NOI18N + setLayout(new java.awt.GridBagLayout()); + }// //GEN-END:initComponents + + @Override + public void setArtifact(BlackboardArtifact artifact) { + // Reset the panel. + resetComponent(); + + if (artifact == null) { + return; + } + + try { + extractArtifactData(artifact); + } catch (TskCoreException ex) { + logger.log(Level.SEVERE, String.format("Error getting attributes for artifact (artifact_id=%d, obj_id=%d)", artifact.getArtifactID(), artifact.getObjectID()), ex); + return; + } + + updateView(); + + this.setLayout(this.m_gridBagLayout); + this.revalidate(); + this.repaint(); + } + + @Override + public Component getComponent() { + // Slap a vertical scrollbar on the panel. + return new JScrollPane(this, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + } + + @Override + public boolean isSupported(BlackboardArtifact artifact) { + return (artifact != null) + && (artifact.getArtifactTypeID() == BlackboardArtifact.ARTIFACT_TYPE.TSK_CONTACT.getTypeID()); + } + + /** + * Extracts data from the artifact to be displayed in the panel. + * + * @param artifact Artifact to show. + * @throws TskCoreException + */ + private void extractArtifactData(BlackboardArtifact artifact) throws TskCoreException { + + this.contactArtifact = artifact; + + phoneNumList = new ArrayList<>(); + emailList = new ArrayList<>(); + nameList = new ArrayList<>(); + otherList = new ArrayList<>(); + accountAttributesList = new ArrayList<>(); + + // Get all the attributes and group them by the section panels they go in + for (BlackboardAttribute bba : contactArtifact.getAttributes()) { + if (bba.getAttributeType().getTypeName().startsWith("TSK_PHONE")) { + phoneNumList.add(bba); + accountAttributesList.add(bba); + } else if (bba.getAttributeType().getTypeName().startsWith("TSK_EMAIL")) { + emailList.add(bba); + accountAttributesList.add(bba); + } else if (bba.getAttributeType().getTypeName().startsWith("TSK_NAME")) { + nameList.add(bba); + } else { + otherList.add(bba); + if (bba.getAttributeType().getTypeName().equalsIgnoreCase("TSK_ID")) { + accountAttributesList.add(bba); + } + } + } + + datasourceName = contactArtifact.getDataSource().getName(); + } + + /** + * Updates the view with the data extracted from the artifact. + */ + private void updateView() { + + // Update contact name, image, phone numbers + updateContactDetails(); + + // update artifact source panel + updateSource(); + + // show a empty Personas panel and kick off a serch for personas + initiatePersonasSearch(); + + } + + /** + * Updates the view with contact's details. + */ + @NbBundle.Messages({ + "ContactArtifactViewer_phones_header=Phone", + "ContactArtifactViewer_emails_header=Email", + "ContactArtifactViewer_others_header=Other",}) + private void updateContactDetails() { + + // update image and name. + updateContactImage(m_gridBagLayout, m_constraints); + updateContactName(m_gridBagLayout, m_constraints); + + // update contact attributes sections + updateContactMethodSection(phoneNumList, Bundle.ContactArtifactViewer_phones_header(), m_gridBagLayout, m_constraints); + updateContactMethodSection(emailList, Bundle.ContactArtifactViewer_emails_header(), m_gridBagLayout, m_constraints); + updateContactMethodSection(otherList, Bundle.ContactArtifactViewer_others_header(), m_gridBagLayout, m_constraints); + } + + /** + * Updates the contact image in the view. + * + * @param contactPanelLayout Panel layout. + * @param contactPanelConstraints Layout constraints. + * + */ + @NbBundle.Messages({ + "ContactArtifactViewer.contactImage.text=",}) + private void updateContactImage(GridBagLayout contactPanelLayout, GridBagConstraints contactPanelConstraints) { + // place the image on the top right corner + Insets savedInsets = contactPanelConstraints.insets; + contactPanelConstraints.gridy = 0; + contactPanelConstraints.gridx = 0; + contactPanelConstraints.insets = new Insets(0, 0, 0, 0); + + javax.swing.JLabel contactImage = new javax.swing.JLabel(); + contactImage.setIcon(getImageFromArtifact(contactArtifact)); + contactImage.setText(Bundle.ContactArtifactViewer_contactImage_text()); + + // add image to top left corner of the page. + CommunicationArtifactViewerHelper.addComponent(this, contactPanelLayout, contactPanelConstraints, contactImage); + CommunicationArtifactViewerHelper.addLineEndGlue(this, contactPanelLayout, contactPanelConstraints); + contactPanelConstraints.gridy++; + + contactPanelConstraints.insets = savedInsets; + } + + /** + * Updates the contact name in the view. + * + * @param contactPanelLayout Panel layout. + * @param contactPanelConstraints Layout constraints. + * + */ + @NbBundle.Messages({ + "ContactArtifactViewer_contactname_unknown=Unknown",}) + private void updateContactName(GridBagLayout contactPanelLayout, GridBagConstraints contactPanelConstraints) { + + boolean foundName = false; + for (BlackboardAttribute bba : this.nameList) { + if (StringUtils.isEmpty(bba.getValueString()) == false) { + contactName = bba.getDisplayString(); + + CommunicationArtifactViewerHelper.addHeader(this, contactPanelLayout, contactPanelConstraints, contactName); + foundName = true; + break; + } + } + if (foundName == false) { + CommunicationArtifactViewerHelper.addHeader(this, contactPanelLayout, contactPanelConstraints, Bundle.ContactArtifactViewer_contactname_unknown()); + } + } + + /** + * Updates the view by displaying the given list of attributes in the given + * section panel. + * + * @param sectionAttributesList List of attributes to display. + * @param sectionHeader Section name label. + * @param contactPanelLayout Panel layout. + * @param contactPanelConstraints Layout constraints. + * + */ + @NbBundle.Messages({ + "ContactArtifactViewer_plural_suffix=s",}) + private void updateContactMethodSection(List sectionAttributesList, String sectionHeader, GridBagLayout contactPanelLayout, GridBagConstraints contactPanelConstraints) { + + // If there are no attributes for this section, do nothing + if (sectionAttributesList.isEmpty()) { + return; + } + + String sectionHeaderString = sectionHeader; + if (sectionAttributesList.size() > 1) { + sectionHeaderString = sectionHeaderString.concat(Bundle.ContactArtifactViewer_plural_suffix()); + } + CommunicationArtifactViewerHelper.addHeader(this, contactPanelLayout, contactPanelConstraints, sectionHeaderString); + for (BlackboardAttribute bba : sectionAttributesList) { + CommunicationArtifactViewerHelper.addKey(this, contactPanelLayout, contactPanelConstraints, bba.getAttributeType().getDisplayName()); + CommunicationArtifactViewerHelper.addValue(this, contactPanelLayout, contactPanelConstraints, bba.getDisplayString()); + } + } + + /** + * Updates the source section. + */ + @NbBundle.Messages({ + "ContactArtifactViewer_heading_Source=Source", + "ContactArtifactViewer_label_datasource=Data Source",}) + private void updateSource() { + CommunicationArtifactViewerHelper.addHeader(this, this.m_gridBagLayout, m_constraints, Bundle.ContactArtifactViewer_heading_Source()); + CommunicationArtifactViewerHelper.addKey(this, m_gridBagLayout, m_constraints, Bundle.ContactArtifactViewer_label_datasource()); + CommunicationArtifactViewerHelper.addValue(this, m_gridBagLayout, m_constraints, datasourceName); + } + + /** + * Initiates a search for Personas for the accounts associated with the + * Contact. + * + */ + @NbBundle.Messages({ + "ContactArtifactViewer_persona_header=Persona", + "ContactArtifactViewer_persona_searching=Searching...", + "ContactArtifactViewer_cr_disabled_message=Enable Central Repository to view, create and edit personas.", + "ContactArtifactViewer_persona_unknown=Unknown" + }) + private void initiatePersonasSearch() { + + // add a section header + JLabel personaHeader = CommunicationArtifactViewerHelper.addHeader(this, m_gridBagLayout, m_constraints, Bundle.ContactArtifactViewer_persona_header()); + + m_constraints.gridy++; + + // add a status label + String personaStatusLabelText = CentralRepository.isEnabled() + ? Bundle.ContactArtifactViewer_persona_searching() + : Bundle.ContactArtifactViewer_persona_unknown(); + + this.personaSearchStatusLabel = new javax.swing.JLabel(); + personaSearchStatusLabel.setText(personaStatusLabelText); + + m_constraints.gridx = 0; + + CommunicationArtifactViewerHelper.addComponent(this, m_gridBagLayout, m_constraints, personaSearchStatusLabel); + + if (CentralRepository.isEnabled()) { + // Kick off a background task to serach for personas for the contact + personaSearchTask = new ContactPersonaSearcherTask(contactArtifact); + personaSearchTask.execute(); + } else { + personaHeader.setEnabled(false); + personaSearchStatusLabel.setEnabled(false); + + CommunicationArtifactViewerHelper.addBlankLine(this, m_gridBagLayout, m_constraints); + m_constraints.gridy++; + CommunicationArtifactViewerHelper.addMessageRow(this, m_gridBagLayout, m_constraints, Bundle.ContactArtifactViewer_cr_disabled_message()); + m_constraints.gridy++; + + CommunicationArtifactViewerHelper.addPageEndGlue(this, m_gridBagLayout, this.m_constraints); + } + + } + + /** + * Updates the Persona panel with the gathered persona information. + */ + private void updatePersonas() { + + // Remove the "Searching....." label + this.remove(personaSearchStatusLabel); + + m_constraints.gridx = 0; + if (contactUniquePersonasMap.isEmpty()) { + // No persona found - show a button to create one. + showPersona(null, 0, Collections.emptyList(), this.m_gridBagLayout, this.m_constraints); + } else { + int matchCounter = 0; + for (Map.Entry> entry : contactUniquePersonasMap.entrySet()) { + List missingAccounts = new ArrayList<>(); + ArrayList personaAccounts = entry.getValue(); + matchCounter++; + + // create a list of accounts missing from this persona + for (CentralRepoAccount account : contactUniqueAccountsList) { + if (personaAccounts.contains(account) == false) { + missingAccounts.add(account); + } + } + + showPersona(entry.getKey(), matchCounter, missingAccounts, m_gridBagLayout, m_constraints); + m_constraints.gridy += 2; + } + } + + // add veritcal glue at the end + CommunicationArtifactViewerHelper.addPageEndGlue(this, m_gridBagLayout, this.m_constraints); + + // redraw the panel + this.setLayout(this.m_gridBagLayout); + this.revalidate(); + this.repaint(); + } + + /** + * Displays the given persona in the persona panel. + * + * @param persona Persona to display. + * @param matchNumber Number of matches. + * @param missingAccountsList List of contact accounts this persona may be + * missing. + * @param gridBagLayout Layout to use. + * @param constraints layout constraints. + * + * @throws CentralRepoException + */ + @NbBundle.Messages({ + "ContactArtifactViewer_persona_label=Persona ", + "ContactArtifactViewer_persona_no_match=No matches found", + "ContactArtifactViewer_persona_button_view=View", + "ContactArtifactViewer_persona_button_new=Create", + "ContactArtifactViewer_persona_match_num=Match ", + "ContactArtifactViewer_missing_account_label=Missing contact account", + "ContactArtifactViewer_found_all_accounts_label=All accounts found." + }) + private void showPersona(Persona persona, int matchNumber, List missingAccountsList, GridBagLayout gridBagLayout, GridBagConstraints constraints) { + + // save the original insets + Insets savedInsets = constraints.insets; + + // some label are indented 2x to appear indented w.r.t column above + Insets extraIndentInsets = new java.awt.Insets(0, 2 * CommunicationArtifactViewerHelper.LEFT_INSET, 0, 0); + + // Add a Match X label in col 0. + constraints.gridx = 0; + javax.swing.JLabel matchNumberLabel = CommunicationArtifactViewerHelper.addKey(this, gridBagLayout, constraints, String.format("%s %d", Bundle.ContactArtifactViewer_persona_match_num(), matchNumber)); + + javax.swing.JLabel personaNameLabel = new javax.swing.JLabel(); + javax.swing.JButton personaButton = new javax.swing.JButton(); + + String personaName; + String personaButtonText; + ActionListener personaButtonListener; + if (persona != null) { + personaName = persona.getName(); + personaButtonText = Bundle.ContactArtifactViewer_persona_button_view(); + personaButtonListener = new ViewPersonaButtonListener(this, persona); + } else { + matchNumberLabel.setVisible(false); + personaName = Bundle.ContactArtifactViewer_persona_no_match(); + personaButtonText = Bundle.ContactArtifactViewer_persona_button_new(); + personaButtonListener = new CreatePersonaButtonListener(this, new PersonaUIComponents(personaNameLabel, personaButton)); + } + + //constraints.gridwidth = 1; // TBD: this may not be needed if we use single panel + constraints.gridx++; + personaNameLabel.setText(personaName); + gridBagLayout.setConstraints(personaNameLabel, constraints); + CommunicationArtifactViewerHelper.addComponent(this, gridBagLayout, constraints, personaNameLabel); + //personasPanel.add(personaNameLabel); + + // Add a Persona action button + constraints.gridx++; + //constraints.gridwidth = 1; + personaButton.setText(personaButtonText); + personaButton.addActionListener(personaButtonListener); + + // Shirnk the button height. + personaButton.setMargin(new Insets(0, 5, 0, 5)); + gridBagLayout.setConstraints(personaButton, constraints); + CommunicationArtifactViewerHelper.addComponent(this, gridBagLayout, constraints, personaButton); + CommunicationArtifactViewerHelper.addLineEndGlue(this, gridBagLayout, constraints); + + constraints.insets = savedInsets; + + // if we have a persona, indicate if any of the contact's accounts are missing from it. + if (persona != null) { + if (missingAccountsList.isEmpty()) { + constraints.gridy++; + constraints.gridx = 1; + //constraints.insets = labelInsets; + + javax.swing.JLabel accountsStatus = new javax.swing.JLabel(Bundle.ContactArtifactViewer_found_all_accounts_label()); + constraints.insets = extraIndentInsets; + CommunicationArtifactViewerHelper.addComponent(this, gridBagLayout, constraints, accountsStatus); + constraints.insets = savedInsets; + + CommunicationArtifactViewerHelper.addLineEndGlue(this, gridBagLayout, constraints); + } else { + // show missing accounts. + for (CentralRepoAccount missingAccount : missingAccountsList) { + //constraints.weightx = 0; + constraints.gridx = 0; + constraints.gridy++; + + // this needs an extra indent + constraints.insets = extraIndentInsets; + CommunicationArtifactViewerHelper.addKeyAtCol(this, gridBagLayout, constraints, Bundle.ContactArtifactViewer_missing_account_label(), 1); + constraints.insets = savedInsets; + + CommunicationArtifactViewerHelper.addValueAtCol(this, gridBagLayout, constraints, missingAccount.getIdentifier(), 2); + } + } + } + + // restore insets + constraints.insets = savedInsets; + } + + /** + * Resets all artifact specific state. + */ + private void resetComponent() { + + contactArtifact = null; + contactName = null; + datasourceName = null; + + contactUniqueAccountsList.clear(); + contactUniquePersonasMap.clear(); + + phoneNumList.clear(); + emailList.clear(); + nameList.clear(); + otherList.clear(); + accountAttributesList.clear(); + + if (personaSearchTask != null) { + personaSearchTask.cancel(Boolean.TRUE); + personaSearchTask = null; + } + + // clear the panel + this.removeAll(); + this.setLayout(null); + + m_gridBagLayout = new GridBagLayout(); + m_constraints = new GridBagConstraints(); + + m_constraints.anchor = GridBagConstraints.FIRST_LINE_START; + m_constraints.gridy = 0; + m_constraints.gridx = 0; + m_constraints.weighty = 0.0; + m_constraints.weightx = 0.0; // keep components fixed horizontally. + m_constraints.insets = new java.awt.Insets(0, CommunicationArtifactViewerHelper.LEFT_INSET, 0, 0); + m_constraints.fill = GridBagConstraints.NONE; + + } + + /** + * Gets an image from a TSK_CONTACT artifact. + * + * @param artifact + * + * @return Image from a TSK_CONTACT artifact or default image if none was + * found or the artifact is not a TSK_CONTACT + */ + private ImageIcon getImageFromArtifact(BlackboardArtifact artifact) { + ImageIcon imageIcon = defaultImage; + + if (artifact == null) { + return imageIcon; + } + + BlackboardArtifact.ARTIFACT_TYPE artifactType = BlackboardArtifact.ARTIFACT_TYPE.fromID(artifact.getArtifactTypeID()); + if (artifactType != BlackboardArtifact.ARTIFACT_TYPE.TSK_CONTACT) { + return imageIcon; + } + + try { + for (Content content : artifact.getChildren()) { + if (content instanceof AbstractFile) { + AbstractFile file = (AbstractFile) content; + + try { + BufferedImage image = ImageIO.read(new File(file.getLocalAbsPath())); + imageIcon = new ImageIcon(image); + break; + } catch (IOException ex) { + // ImageIO.read will throw an IOException if file is not an image + // therefore we don't need to report this exception just try + // the next file. + } + } + } + } catch (TskCoreException ex) { + logger.log(Level.WARNING, String.format("Unable to load image for contact: %d", artifact.getId()), ex); + } + + return imageIcon; + } + + /** + * Thread to search for a personas for all account identifier attributes for + * a contact. + */ + private class ContactPersonaSearcherTask extends SwingWorker>, Void> { + + private final BlackboardArtifact artifact; + private final List uniqueAccountsList = new ArrayList<>(); + + /** + * Creates a persona searcher task. + * + * @param accountAttributesList List of attributes that may map to + * accounts. + */ + ContactPersonaSearcherTask(BlackboardArtifact artifact) { + this.artifact = artifact; + } + + @Override + protected Map> doInBackground() throws Exception { + + Map> uniquePersonas = new HashMap<>(); + + CommunicationsManager commManager = Case.getCurrentCase().getSleuthkitCase().getCommunicationsManager(); + List contactAccountsList = commManager.getAccountsRelatedToArtifact(artifact); + + for (Account account : contactAccountsList) { + if (isCancelled()) { + return new HashMap<>(); + } + + Collection personaAccounts = PersonaAccount.getPersonaAccountsForAccount(account); + if (personaAccounts != null && !personaAccounts.isEmpty()) { + + // look for unique accounts + Collection accountCandidates + = personaAccounts + .stream() + .map(PersonaAccount::getAccount) + .collect(Collectors.toList()); + for (CentralRepoAccount crAccount : accountCandidates) { + if (uniqueAccountsList.contains(crAccount) == false) { + uniqueAccountsList.add(crAccount); + } + } + + // get personas for the account + Collection personas + = personaAccounts + .stream() + .map(PersonaAccount::getPersona) + .collect(Collectors.toList()); + + // make a list of unique personas, along with all their accounts + for (Persona persona : personas) { + if (uniquePersonas.containsKey(persona) == false) { + Collection accounts = persona.getPersonaAccounts() + .stream() + .map(PersonaAccount::getAccount) + .collect(Collectors.toList()); + + ArrayList personaAccountsList = new ArrayList<>(accounts); + uniquePersonas.put(persona, personaAccountsList); + } + } + } + } + + return uniquePersonas; + } + + @Override + protected void done() { + + Map> personasMap; + try { + personasMap = super.get(); + + if (this.isCancelled()) { + return; + } + + contactUniquePersonasMap.clear(); + contactUniquePersonasMap.putAll(personasMap); + contactUniqueAccountsList.clear(); + contactUniqueAccountsList.addAll(uniqueAccountsList); + + updatePersonas(); + + } catch (CancellationException ex) { + logger.log(Level.INFO, "Persona searching was canceled."); //NON-NLS + } catch (InterruptedException ex) { + logger.log(Level.INFO, "Persona searching was interrupted."); //NON-NLS + } catch (ExecutionException ex) { + logger.log(Level.SEVERE, "Fatal error during Persona search.", ex); //NON-NLS + } + + } + } + + /** + * A wrapper class that bags the UI components that need to be updated when + * a persona search task or a create dialog returns. + */ + private class PersonaUIComponents { + + private final JLabel personaNameLabel; + private final JButton personaActionButton; + + /** + * Constructor. + * + * @param personaNameLabel Persona name label. + * @param personaActionButton Persona action button. + */ + PersonaUIComponents(JLabel personaNameLabel, JButton personaActionButton) { + this.personaNameLabel = personaNameLabel; + this.personaActionButton = personaActionButton; + } + + /** + * Returns persona name label. + * + * @return Persona name label. + */ + public JLabel getPersonaNameLabel() { + return personaNameLabel; + } + + /** + * Returns persona action button. + * + * @return Persona action button. + */ + public JButton getPersonaActionButton() { + return personaActionButton; + } + } + + /** + * Action listener for Create persona button. + */ + private class CreatePersonaButtonListener implements ActionListener { + + private final Component parentComponent; + private final PersonaUIComponents personaUIComponents; + + /** + * Constructs a listener for Create persona button.. + * + * @param personaUIComponents UI components. + */ + CreatePersonaButtonListener(Component parentComponent, PersonaUIComponents personaUIComponents) { + this.personaUIComponents = personaUIComponents; + this.parentComponent = parentComponent; + } + + @NbBundle.Messages({ + "ContactArtifactViewer_persona_account_justification=Account found in Contact artifact" + }) + + @Override + public void actionPerformed(java.awt.event.ActionEvent evt) { + // Launch the Persona Create dialog - do not display immediately + PersonaDetailsDialog createPersonaDialog = new PersonaDetailsDialog(parentComponent, + PersonaDetailsMode.CREATE, null, new PersonaCreateCallbackImpl(parentComponent, personaUIComponents), false); + + // Pre populate the persona name and accounts if we have them. + PersonaDetailsPanel personaPanel = createPersonaDialog.getDetailsPanel(); + + if (contactName != null) { + personaPanel.setPersonaName(contactName); + } + + // pass the list of accounts to the dialog + for (CentralRepoAccount account : contactUniqueAccountsList) { + personaPanel.addAccount(account, Bundle.ContactArtifactViewer_persona_account_justification(), Persona.Confidence.HIGH); + } + + // display the dialog now + createPersonaDialog.display(); + } + } + + /** + * Action listener for View persona button. + */ + private class ViewPersonaButtonListener implements ActionListener { + + private final Persona persona; + private final Component parentComponent; + + /** + * Creates listener for View persona button. + * + * @param persona + */ + ViewPersonaButtonListener(Component parentComponent, Persona persona) { + this.persona = persona; + this.parentComponent = parentComponent; + } + + @Override + public void actionPerformed(java.awt.event.ActionEvent evt) { + new PersonaDetailsDialog(parentComponent, + PersonaDetailsMode.VIEW, persona, new PersonaViewCallbackImpl()); + } + } + + /** + * Callback method for the create mode of the PersonaDetailsDialog + */ + class PersonaCreateCallbackImpl implements PersonaDetailsDialogCallback { + + private final Component parentComponent; + private final PersonaUIComponents personaUIComponents; + + /** + * Creates a callback to handle new persona creation. + * + * @param personaUIComponents UI Components. + */ + PersonaCreateCallbackImpl(Component parentComponent, PersonaUIComponents personaUIComponents) { + this.parentComponent = parentComponent; + this.personaUIComponents = personaUIComponents; + } + + @Override + public void callback(Persona persona) { + JButton personaButton = personaUIComponents.getPersonaActionButton(); + if (persona != null) { + // update the persona name label with newly created persona, + // and change the button to a "View" button + personaUIComponents.getPersonaNameLabel().setText(persona.getName()); + personaUIComponents.getPersonaActionButton().setText(Bundle.ContactArtifactViewer_persona_button_view()); + + // replace action listener with a View button listener + for (ActionListener act : personaButton.getActionListeners()) { + personaButton.removeActionListener(act); + } + personaButton.addActionListener(new ViewPersonaButtonListener(parentComponent, persona)); + + } + + personaButton.getParent().revalidate(); + personaButton.getParent().repaint(); + } + } + + /** + * Callback method for the view mode of the PersonaDetailsDialog + */ + class PersonaViewCallbackImpl implements PersonaDetailsDialogCallback { + + @Override + public void callback(Persona persona) { + // nothing to do + } + } + + // Variables declaration - do not modify//GEN-BEGIN:variables + // End of variables declaration//GEN-END:variables +} diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/DefaultArtifactContentViewer.form b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/DefaultArtifactContentViewer.form similarity index 89% rename from Core/src/org/sleuthkit/autopsy/contentviewers/DefaultArtifactContentViewer.form rename to Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/DefaultArtifactContentViewer.form index eb1f729611..a6aa7f13ce 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/DefaultArtifactContentViewer.form +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/DefaultArtifactContentViewer.form @@ -11,14 +11,14 @@ - + - + diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/DefaultArtifactContentViewer.java b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/DefaultArtifactContentViewer.java similarity index 99% rename from Core/src/org/sleuthkit/autopsy/contentviewers/DefaultArtifactContentViewer.java rename to Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/DefaultArtifactContentViewer.java index d77ca887d8..8c0c89a865 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/DefaultArtifactContentViewer.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/DefaultArtifactContentViewer.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.contentviewers; +package org.sleuthkit.autopsy.contentviewers.artifactviewers; import java.awt.Component; import java.awt.Cursor; @@ -54,6 +54,7 @@ import com.google.gson.JsonArray; import java.util.Locale; import java.util.Map; import javax.swing.SwingUtilities; +//import org.sleuthkit.autopsy.contentviewers.Bundle; /** * This class displays a Blackboard artifact as a table listing all it's diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/MessageAccountPanel.java b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/MessageAccountPanel.java similarity index 99% rename from Core/src/org/sleuthkit/autopsy/contentviewers/MessageAccountPanel.java rename to Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/MessageAccountPanel.java index 027fe2f7bc..61d14f19a0 100755 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/MessageAccountPanel.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/MessageAccountPanel.java @@ -17,7 +17,7 @@ * limitations under the License. */ -package org.sleuthkit.autopsy.contentviewers; +package org.sleuthkit.autopsy.contentviewers.artifactviewers; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/MessageArtifactViewer.form b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/MessageArtifactViewer.form similarity index 86% rename from Core/src/org/sleuthkit/autopsy/contentviewers/MessageArtifactViewer.form rename to Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/MessageArtifactViewer.form index f1a6ce5d4d..e2a7ccc7da 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/MessageArtifactViewer.form +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/MessageArtifactViewer.form @@ -120,7 +120,7 @@ - + @@ -128,28 +128,28 @@ - + - + - + - + @@ -160,14 +160,14 @@ - + - + @@ -177,14 +177,14 @@ - + - + @@ -195,7 +195,7 @@ - + @@ -214,7 +214,7 @@ - + @@ -238,7 +238,7 @@ - + @@ -254,7 +254,7 @@ - + @@ -274,7 +274,7 @@ - + @@ -311,7 +311,7 @@ - + @@ -329,7 +329,7 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/MessageArtifactViewer.java b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/MessageArtifactViewer.java similarity index 99% rename from Core/src/org/sleuthkit/autopsy/contentviewers/MessageArtifactViewer.java rename to Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/MessageArtifactViewer.java index 33a2518747..f8257afb64 100644 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/MessageArtifactViewer.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/MessageArtifactViewer.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.contentviewers; +package org.sleuthkit.autopsy.contentviewers.artifactviewers; import org.sleuthkit.autopsy.datamodel.AttachmentNode; import java.awt.Color; @@ -41,7 +41,9 @@ import org.openide.nodes.Node; import org.openide.util.NbBundle; import org.openide.util.lookup.ServiceProvider; import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepository; +import org.sleuthkit.autopsy.contentviewers.TranslatablePanel; import org.sleuthkit.autopsy.contentviewers.TranslatablePanel.TranslatablePanelException; +import org.sleuthkit.autopsy.contentviewers.Utilities; import org.sleuthkit.autopsy.corecomponents.AutoWrappingJTextPane; import org.sleuthkit.autopsy.corecomponents.DataResultPanel; import org.sleuthkit.autopsy.corecomponents.TableFilterNode; diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/PersonaSearchAndDisplayTask.java b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/PersonaAccountFetcher.java old mode 100644 new mode 100755 similarity index 50% rename from Core/src/org/sleuthkit/autopsy/contentviewers/PersonaSearchAndDisplayTask.java rename to Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/PersonaAccountFetcher.java index f42fea1002..2ffef0ce3e --- a/Core/src/org/sleuthkit/autopsy/contentviewers/PersonaSearchAndDisplayTask.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/artifactviewers/PersonaAccountFetcher.java @@ -1,4 +1,4 @@ -/** +/* * Autopsy Forensic Browser * * Copyright 2020 Basis Technology Corp. @@ -16,122 +16,150 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.sleuthkit.autopsy.contentviewers; +package org.sleuthkit.autopsy.contentviewers.artifactviewers; import java.awt.Component; import java.awt.event.ActionListener; import java.util.ArrayList; import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; import java.util.logging.Level; -import java.util.stream.Collectors; import javax.swing.JButton; import javax.swing.SwingWorker; -import org.openide.util.NbBundle; -import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoAccount; -import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepository; +import org.openide.util.NbBundle.Messages; +import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.centralrepository.datamodel.Persona; import org.sleuthkit.autopsy.centralrepository.datamodel.PersonaAccount; import org.sleuthkit.autopsy.centralrepository.persona.PersonaDetailsDialog; import org.sleuthkit.autopsy.centralrepository.persona.PersonaDetailsDialogCallback; import org.sleuthkit.autopsy.centralrepository.persona.PersonaDetailsMode; import org.sleuthkit.autopsy.coreutils.Logger; +import org.sleuthkit.datamodel.Account; +import org.sleuthkit.datamodel.BlackboardArtifact; +import org.sleuthkit.datamodel.CommunicationsManager; /** - * Background task to search for a persona for a given account. - * - * When the search is complete, it updates the UI components - * for the persona appropriately. - * - */ + * SwingWorker for fetching and updating Persona controls. + */ +class PersonaAccountFetcher extends SwingWorker>, Void> { - @NbBundle.Messages({ + private final static Logger logger = Logger.getLogger(PersonaAccountFetcher.class.getName()); + + private final BlackboardArtifact artifact; + private final List personaSearchDataList; + private final Component parentComponent; + + /** + * Construct the SwingWorker. + * + * @param artifact The artifact to search account for. + * @param personaSearchDataList List of PersonaSerarcherData objects. + * @param parentComponent The parent panel. + */ + PersonaAccountFetcher(BlackboardArtifact artifact, List personaSearchDataList, Component parentComponent) { + this.artifact = artifact; + this.personaSearchDataList = personaSearchDataList; + this.parentComponent = parentComponent; + } + + @Override + protected Map> doInBackground() throws Exception { + Map> accountMap = new HashMap<>(); + + CommunicationsManager commManager = Case.getCurrentCase().getSleuthkitCase().getCommunicationsManager(); + + List relatedAccountList = commManager.getAccountsRelatedToArtifact(artifact); + + for (Account account : relatedAccountList) { + + if (isCancelled()) { + return new HashMap<>(); + } + + Collection personaAccountList = PersonaAccount.getPersonaAccountsForAccount(account); + Collection personaList = new ArrayList<>(); + for (PersonaAccount pAccount : personaAccountList) { + personaList.add(pAccount.getPersona()); + } + + accountMap.put(account.getTypeSpecificID(), personaList); + } + + return accountMap; + } + + @Override + protected void done() { + if (isCancelled()) { + return; + } + + try { + Map> accountMap = get(); + + for (AccountPersonaSearcherData searcherData : personaSearchDataList) { + Collection persona = accountMap.get(searcherData.getAccountIdentifer()); + updatePersonaControls(searcherData, persona); + } + + } catch (CancellationException ex) { + logger.log(Level.INFO, "Persona searching was canceled."); //NON-NLS + } catch (InterruptedException ex) { + logger.log(Level.INFO, "Persona searching was interrupted."); //NON-NLS + } catch (ExecutionException ex) { + logger.log(Level.SEVERE, "Fatal error during Persona search.", ex); //NON-NLS + } + + parentComponent.repaint(); + } + + @Messages({ "# {0} - Persona count", "PersonaDisplayTask_persona_count_suffix=(1 of {0})" }) -class PersonaSearchAndDisplayTask extends SwingWorker, Void> { - private final static Logger logger = Logger.getLogger(PersonaSearchAndDisplayTask.class.getName()); - - private final Component parentComponent; - private final AccountPersonaSearcherData personaSearcherData; + /** + * Update the Persona gui controls. + * + * @param personaSearcherData The data objects with persona controls + * @param personas Collection of persona objects + */ + private void updatePersonaControls(AccountPersonaSearcherData personaSearcherData, Collection personas) { + //Update the Persona label and button based on the search result + String personaLabelText = Bundle.CommunicationArtifactViewerHelper_persona_label(); + String personaButtonText; + ActionListener buttonActionListener; - PersonaSearchAndDisplayTask(Component parentComponent, AccountPersonaSearcherData personaSearcherData) { - this.parentComponent = parentComponent; - this.personaSearcherData = personaSearcherData; - } + if (personas == null || personas.isEmpty()) { + // No persona found + personaLabelText += Bundle.CommunicationArtifactViewerHelper_persona_unknown(); - @Override - protected Collection doInBackground() throws Exception { - - Collection personas = new ArrayList<>(); - - if (CentralRepository.isEnabled()) { - Collection accountCandidates - = CentralRepoAccount.getAccountsWithIdentifier(personaSearcherData.getAccountIdentifer()); - - if (accountCandidates.isEmpty() == false) { - CentralRepoAccount account = accountCandidates.iterator().next(); - - // get personas for the account - Collection personaAccountsList = PersonaAccount.getPersonaAccountsForAccount(account.getId()); - personas = personaAccountsList.stream().map(PersonaAccount::getPersona) - .collect(Collectors.toList()); - } + // show a 'Create' button + personaButtonText = Bundle.CommunicationArtifactViewerHelper_persona_button_create(); + buttonActionListener = new CreatePersonaButtonListener(parentComponent, personaSearcherData); + } else { + Persona persona = personas.iterator().next(); + personaLabelText += persona.getName(); + if (personas.size() > 1) { + personaLabelText += Bundle.PersonaDisplayTask_persona_count_suffix(Integer.toString(personas.size())); } - return personas; + // Show a 'View' button + personaButtonText = Bundle.CommunicationArtifactViewerHelper_persona_button_view(); + buttonActionListener = new ViewPersonaButtonListener(parentComponent, persona); } - @Override - protected void done() { - Collection personas; - try { - personas = super.get(); + personaSearcherData.getPersonaNameLabel().setText(personaLabelText); + personaSearcherData.getPersonaActionButton().setText(personaButtonText); + personaSearcherData.getPersonaActionButton().setEnabled(true); - if (this.isCancelled()) { - return; - } + // set button action + personaSearcherData.getPersonaActionButton().addActionListener(buttonActionListener); + } - //Update the Persona label and button based on the search result - String personaLabelText = Bundle.CommunicationArtifactViewerHelper_persona_label(); - String personaButtonText; - ActionListener buttonActionListener; - - if (personas.isEmpty()) { - // No persona found - personaLabelText += Bundle.CommunicationArtifactViewerHelper_persona_unknown(); - - // show a 'Create' button - personaButtonText = Bundle.CommunicationArtifactViewerHelper_persona_button_create(); - buttonActionListener = new CreatePersonaButtonListener(parentComponent, personaSearcherData); - } else { - Persona persona = personas.iterator().next(); - personaLabelText += persona.getName(); - if (personas.size() > 1) { - personaLabelText += Bundle.PersonaDisplayTask_persona_count_suffix(Integer.toString(personas.size())); - } - // Show a 'View' button - personaButtonText = Bundle.CommunicationArtifactViewerHelper_persona_button_view(); - buttonActionListener = new ViewPersonaButtonListener(parentComponent, persona); - } - - personaSearcherData.getPersonaNameLabel().setText(personaLabelText); - personaSearcherData.getPersonaActionButton().setText(personaButtonText); - personaSearcherData.getPersonaActionButton().setEnabled(true); - - // set button action - personaSearcherData.getPersonaActionButton().addActionListener(buttonActionListener); - } catch (CancellationException ex) { - logger.log(Level.INFO, "Persona searching was canceled."); //NON-NLS - } catch (InterruptedException ex) { - logger.log(Level.INFO, "Persona searching was interrupted."); //NON-NLS - } catch (ExecutionException ex) { - logger.log(Level.SEVERE, "Fatal error during Persona search.", ex); //NON-NLS - } - - } - /** * Action listener for Create persona button. */ @@ -177,7 +205,7 @@ class PersonaSearchAndDisplayTask extends SwingWorker, Void> * Callback method for the create mode of the PersonaDetailsDialog */ class PersonaCreateCallbackImpl implements PersonaDetailsDialogCallback { - + private final Component parentComponent; private final AccountPersonaSearcherData personaSearcherData; @@ -217,4 +245,5 @@ class PersonaSearchAndDisplayTask extends SwingWorker, Void> // nothing to do } } + } diff --git a/Core/src/org/sleuthkit/autopsy/core/Installer.java b/Core/src/org/sleuthkit/autopsy/core/Installer.java index 2d2357374a..3bc6d6a911 100644 --- a/Core/src/org/sleuthkit/autopsy/core/Installer.java +++ b/Core/src/org/sleuthkit/autopsy/core/Installer.java @@ -33,6 +33,8 @@ import java.util.logging.Handler; import java.util.logging.Level; import javafx.application.Platform; import javafx.embed.swing.JFXPanel; +import net.sf.sevenzipjbinding.SevenZip; +import net.sf.sevenzipjbinding.SevenZipNativeInitializationException; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.openide.modules.InstalledFileLocator; @@ -336,8 +338,8 @@ public class Installer extends ModuleInstall { } /** - * Make a folder in the config directory for object detection classifiers if one does not - * exist. + * Make a folder in the config directory for object detection classifiers if + * one does not exist. */ private static void ensureClassifierFolderExists() { File objectDetectionClassifierDir = new File(PlatformUtil.getObjectDetectionClassifierPath()); @@ -381,6 +383,7 @@ public class Installer extends ModuleInstall { ensureClassifierFolderExists(); ensureOcrLanguagePacksFolderExists(); initJavaFx(); + initializeSevenZip(); for (ModuleInstall mi : packageInstallers) { try { mi.restored(); @@ -393,8 +396,21 @@ public class Installer extends ModuleInstall { logger.log(Level.INFO, "Autopsy Core restore completed"); //NON-NLS preloadJython(); } - - + + /** + * Initializes 7zip-java bindings. We are performing initialization once + * because we encountered issues related to file locking when initialization + * was performed closer to where the bindings are used. See JIRA-6528. + */ + private void initializeSevenZip() { + try { + SevenZip.initSevenZipFromPlatformJAR(); + logger.log(Level.INFO, "7zip-java bindings loaded"); //NON-NLS + } catch (SevenZipNativeInitializationException e) { + logger.log(Level.SEVERE, "Error loading 7zip-java bindings", e); //NON-NLS + } + } + /** * Runs an initial load of the Jython modules to speed up subsequent loads. */ @@ -403,13 +419,12 @@ public class Installer extends ModuleInstall { try { JythonModuleLoader.getIngestModuleFactories(); JythonModuleLoader.getGeneralReportModules(); - } - catch (Exception ex) { + } catch (Exception ex) { // This is a firewall exception to ensure that any possible exception caused // by this initial load of the Jython modules are caught and logged. logger.log(Level.SEVERE, "There was an error while doing an initial load of python plugins.", ex); } - + }; new Thread(loader).start(); } diff --git a/Core/src/org/sleuthkit/autopsy/core/ServicesMonitor.java b/Core/src/org/sleuthkit/autopsy/core/ServicesMonitor.java index 861c17ac9a..ec91e09a89 100644 --- a/Core/src/org/sleuthkit/autopsy/core/ServicesMonitor.java +++ b/Core/src/org/sleuthkit/autopsy/core/ServicesMonitor.java @@ -1,7 +1,7 @@ /* * Autopsy Forensic Browser * - * Copyright 2013-2015 Basis Technology Corp. + * Copyright 2013-2020 Basis Technology Corp. * Contact: carrier sleuthkit org * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -42,65 +42,29 @@ import org.sleuthkit.datamodel.SleuthkitCase; import org.sleuthkit.datamodel.TskCoreException; /** - * This class periodically checks availability of collaboration resources - - * remote database, remote keyword search server, messaging service - and - * reports status updates to the user in case of a gap in service. + * Monitors the status of services and publishes events and user notifications + * when the status of a service changes. The database server, keyword search + * server, and messaging service are considered to be core services in a + * collaborative, multi-user case environment. Additional services can provide + * current status by calling the setServiceStatus() method. */ public class ServicesMonitor { - private AutopsyEventPublisher eventPublisher; - private static final Logger logger = Logger.getLogger(ServicesMonitor.class.getName()); - private final ScheduledThreadPoolExecutor periodicTasksExecutor; - - private static final String PERIODIC_TASK_THREAD_NAME = "services-monitor-periodic-task-%d"; //NON-NLS - private static final int NUMBER_OF_PERIODIC_TASK_THREADS = 1; - private static final long CRASH_DETECTION_INTERVAL_MINUTES = 15; - - private static final Set servicesList = Stream.of(ServicesMonitor.Service.values()) - .map(Service::toString) - .collect(Collectors.toSet()); - /** - * The service monitor maintains a mapping of each service to it's last - * status update. - */ - private final ConcurrentHashMap statusByService; - - /** - * Call constructor on start-up so that the first check of services is done - * as soon as possible. - */ - private static ServicesMonitor instance = new ServicesMonitor(); - - /** - * List of services that are being monitored. The service names should be - * representative of the service functionality and readable as they get - * logged when service outage occurs. + * An enumeration of the core services in a collaborative, multi-user case + * environment. The display names provided here can be used to identify the + * service status events published for these services and to directly query + * the ServicesMonitor for the current status of these services. */ public enum Service { - - /** - * Property change event fired when remote case database service status - * changes. New value is set to updated ServiceStatus, old value is - * null. - */ REMOTE_CASE_DATABASE(NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.remoteCaseDatabase.displayName.text")), - /** - * Property change event fired when remote keyword search service status - * changes. New value is set to updated ServiceStatus, old value is - * null. - */ REMOTE_KEYWORD_SEARCH(NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.remoteKeywordSearch.displayName.text")), - /** - * Property change event fired when messaging service status changes. - * New value is set to updated ServiceStatus, old value is null. - */ MESSAGING(NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.messaging.displayName.text")); private final String displayName; - private Service(String name) { - this.displayName = name; + private Service(String displayName) { + this.displayName = displayName; } public String getDisplayName() { @@ -109,121 +73,249 @@ public class ServicesMonitor { }; /** - * List of possible service statuses. + * An enumeration of the standard service statuses. */ public enum ServiceStatus { - - /** - * Service is currently up. - */ UP, - /** - * Service is currently down. - */ DOWN }; + private static final Logger logger = Logger.getLogger(ServicesMonitor.class.getName()); + private static final String PERIODIC_TASK_THREAD_NAME = "services-monitor-periodic-task-%d"; //NON-NLS + private static final int NUMBER_OF_PERIODIC_TASK_THREADS = 1; + private static final long CRASH_DETECTION_INTERVAL_MINUTES = 15; + private static final Set coreServices = Stream.of(ServicesMonitor.Service.values()).map(Service::toString).collect(Collectors.toSet()); + private static ServicesMonitor servicesMonitor = new ServicesMonitor(); + private final ScheduledThreadPoolExecutor periodicTasksExecutor; + private final ConcurrentHashMap statusByService; + private final AutopsyEventPublisher eventPublisher; + + /** + * Gets the services monitor that monitors the status of services and + * publishes events and user notifications when the status of a service + * changes. + * + * @return The services monitor singleton. + */ public synchronized static ServicesMonitor getInstance() { - if (instance == null) { - instance = new ServicesMonitor(); + if (servicesMonitor == null) { + servicesMonitor = new ServicesMonitor(); } - return instance; - } - - private ServicesMonitor() { - - this.eventPublisher = new AutopsyEventPublisher(); - this.statusByService = new ConcurrentHashMap<>(); - - // First check is triggered immediately on current thread. - checkAllServices(); - - /** - * Start periodic task that check the availability of key collaboration - * services. - */ - periodicTasksExecutor = new ScheduledThreadPoolExecutor(NUMBER_OF_PERIODIC_TASK_THREADS, new ThreadFactoryBuilder().setNameFormat(PERIODIC_TASK_THREAD_NAME).build()); - periodicTasksExecutor.scheduleWithFixedDelay(new CrashDetectionTask(), CRASH_DETECTION_INTERVAL_MINUTES, CRASH_DETECTION_INTERVAL_MINUTES, TimeUnit.MINUTES); + return servicesMonitor; } /** - * Updates service status and publishes the service status update if it is - * different from previous status. Event is published locally. Logs status + * Constructs a services monitor that monitors the status of services and + * publishes events and user notifications when the status of a service * changes. + */ + private ServicesMonitor() { + eventPublisher = new AutopsyEventPublisher(); + statusByService = new ConcurrentHashMap<>(); + + /* + * The first service statuses check is performed immediately in the + * current thread. + */ + checkAllServices(); + + /** + * Start a periodic task to do ongoing service status checks. + */ + periodicTasksExecutor = new ScheduledThreadPoolExecutor(NUMBER_OF_PERIODIC_TASK_THREADS, new ThreadFactoryBuilder().setNameFormat(PERIODIC_TASK_THREAD_NAME).build()); + periodicTasksExecutor.scheduleWithFixedDelay(new ServicesMonitoringTask(), CRASH_DETECTION_INTERVAL_MINUTES, CRASH_DETECTION_INTERVAL_MINUTES, TimeUnit.MINUTES); + } + + /** + * Records the status of a service and publishes a service status event if + * the current status is different from the previously reported status. * * @param service Name of the service. - * @param status Updated status for the service. - * @param details Details of the event. + * @param status Current status of the service. + * @param details Additional status details. * */ public void setServiceStatus(String service, String status, String details) { - // if the status update is for an existing service who's status hasn't changed - do nothing. if (statusByService.containsKey(service) && status.equals(statusByService.get(service))) { return; } - // new service or status has changed - identify service's display name + statusByService.put(service, status); + String serviceDisplayName; try { serviceDisplayName = ServicesMonitor.Service.valueOf(service).getDisplayName(); } catch (IllegalArgumentException ignore) { - // custom service that is not listed in ServicesMonitor.Service enum. Use service name as display name. serviceDisplayName = service; } if (status.equals(ServiceStatus.UP.toString())) { logger.log(Level.INFO, "Connection to {0} is up", serviceDisplayName); //NON-NLS - MessageNotifyUtil.Notify.info(NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.restoredService.notify.title"), + MessageNotifyUtil.Notify.info( + NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.restoredService.notify.title"), NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.restoredService.notify.msg", serviceDisplayName)); } else if (status.equals(ServiceStatus.DOWN.toString())) { logger.log(Level.SEVERE, "Failed to connect to {0}. Reason: {1}", new Object[]{serviceDisplayName, details}); //NON-NLS - MessageNotifyUtil.Notify.error(NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.failedService.notify.title"), + MessageNotifyUtil.Notify.error( + NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.failedService.notify.title"), NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.failedService.notify.msg", serviceDisplayName)); } else { - logger.log(Level.INFO, "Status for {0} is {1}", new Object[]{serviceDisplayName, status}); //NON-NLS - MessageNotifyUtil.Notify.info(NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.statusChange.notify.title"), - NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.statusChange.notify.msg", new Object[]{serviceDisplayName, status})); + logger.log(Level.INFO, "Status for {0} is {1} ({2})", new Object[]{serviceDisplayName, status}); //NON-NLS + MessageNotifyUtil.Notify.info( + NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.statusChange.notify.title"), + NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.statusChange.notify.msg", new Object[]{serviceDisplayName, status, details})); } - // update and publish new status - statusByService.put(service, status); eventPublisher.publishLocally(new ServiceEvent(service, status, details)); } /** - * Get last status update for a service. + * Get last recorded status for a service. * * @param service Name of the service. * * @return ServiceStatus Status for the service. * - * @throws ServicesMonitorException If service name is null or service - * doesn't exist. + * @throws ServicesMonitorException If the service name is unknown to the + * services monitor. */ public String getServiceStatus(String service) throws ServicesMonitorException { - if (service == null) { + if (service == null || service.isEmpty()) { throw new ServicesMonitorException(NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.nullServiceName.excepton.txt")); } - // if request is for one of our "core" services - perform an on demand check - // to make sure we have the latest status. - if (servicesList.contains(service)) { + /* + * If the request is for a core service, perform an "on demand" check to + * get the current status. + */ + if (coreServices.contains(service)) { checkServiceStatus(service); } String status = statusByService.get(service); if (status == null) { - // no such service throw new ServicesMonitorException(NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.unknownServiceName.excepton.txt", service)); } return status; } /** - * Performs service availability status check. + * Adds a subscriber to service status events for the core services. * - * @param service Name of the service. + * @param subscriber The subscriber to add. + */ + public void addSubscriber(PropertyChangeListener subscriber) { + eventPublisher.addSubscriber(coreServices, subscriber); + } + + /** + * Adds a subscriber to service status events for a subset of the services + * known to the services monitor. + * + * @param services The services the subscriber is interested in. + * @param subscriber The subscriber to add. + */ + public void addSubscriber(Set services, PropertyChangeListener subscriber) { + eventPublisher.addSubscriber(services, subscriber); + } + + /** + * Adds a subscriber to service status events for a specific service known + * to the services monitor. + * + * @param service The service the subscriber is interested in. + * @param subscriber The subscriber to add. + */ + public void addSubscriber(String service, PropertyChangeListener subscriber) { + eventPublisher.addSubscriber(service, subscriber); + } + + /** + * Removes a subscriber to service status events for the core services. + * + * @param subscriber The subscriber to remove. + */ + public void removeSubscriber(PropertyChangeListener subscriber) { + eventPublisher.removeSubscriber(coreServices, subscriber); + } + + /** + * Removes a subscriber to service status events for a subset of the + * services known to the services monitor. + * + * @param services The services the subscriber is no longer interested in. + * @param subscriber The subscriber to remove. + */ + public void removeSubscriber(Set services, PropertyChangeListener subscriber) { + eventPublisher.removeSubscriber(services, subscriber); + } + + /** + * Adds a subscriber to service status events for a specific service known + * to the services monitor. + * + * @param service The service the subscriber is no longer interested in. + * @param subscriber The subscriber to remove. + */ + public void removeSubscriber(String service, PropertyChangeListener subscriber) { + eventPublisher.removeSubscriber(service, subscriber); + } + + /** + * Checks the status of the core services in a collaborative, multi-user + * case environment: the database server, the keyword search server and the + * messaging service. Publishes a service event and user notification if the + * status of a service has changed since the last check. + */ + private void checkAllServices() { + if (!UserPreferences.getIsMultiUserModeEnabled()) { + return; + } + + for (String service : coreServices) { + checkServiceStatus(service); + } + } + + /** + * A task that checks the status of the core services in a collaborative, + * multi-user case environment: the database server, the keyword search + * server and the messaging service. Publishes a service event and user + * notification if the status of a service has changed since the last check. + */ + private final class ServicesMonitoringTask implements Runnable { + + @Override + public void run() { + try { + checkAllServices(); + } catch (Exception ex) { // Exception firewall + logger.log(Level.SEVERE, "An error occurred during services monitoring", ex); //NON-NLS + } + } + } + + /** + * Exception thrown if an error occurs during a service status query. + */ + public class ServicesMonitorException extends Exception { + + private static final long serialVersionUID = 1L; + + public ServicesMonitorException(String message) { + super(message); + } + + public ServicesMonitorException(String message, Throwable cause) { + super(message, cause); + } + } + + /** + * Performs a core service availability status check. + * + * @param service Name of the service to check. */ private void checkServiceStatus(String service) { if (service.equals(Service.REMOTE_CASE_DATABASE.toString())) { @@ -236,7 +328,7 @@ public class ServicesMonitor { } /** - * Performs case database service availability status check. + * Performs a database server availability status check. */ private void checkDatabaseConnectionStatus() { CaseDbConnectionInfo info; @@ -256,7 +348,7 @@ public class ServicesMonitor { } /** - * Performs keyword search service availability status check. + * Performs a keyword search service availability status check. */ private void checkKeywordSearchServerConnectionStatus() { KeywordSearchService kwsService = Lookup.getDefault().lookup(KeywordSearchService.class); @@ -303,113 +395,4 @@ public class ServicesMonitor { } } - /** - * Adds an event subscriber to this publisher. Subscriber will be subscribed - * to all events from this publisher. - * - * @param subscriber The subscriber to add. - */ - public void addSubscriber(PropertyChangeListener subscriber) { - eventPublisher.addSubscriber(servicesList, subscriber); - } - - /** - * Adds an event subscriber to this publisher. - * - * @param eventNames The events the subscriber is interested in. - * @param subscriber The subscriber to add. - */ - public void addSubscriber(Set eventNames, PropertyChangeListener subscriber) { - eventPublisher.addSubscriber(eventNames, subscriber); - } - - /** - * Adds an event subscriber to this publisher. - * - * @param eventName The event the subscriber is interested in. - * @param subscriber The subscriber to add. - */ - public void addSubscriber(String eventName, PropertyChangeListener subscriber) { - eventPublisher.addSubscriber(eventName, subscriber); - } - - /** - * Removes an event subscriber from this publisher. - * - * @param eventNames The events the subscriber is no longer interested in. - * @param subscriber The subscriber to remove. - */ - public void removeSubscriber(Set eventNames, PropertyChangeListener subscriber) { - eventPublisher.removeSubscriber(eventNames, subscriber); - } - - /** - * Removes an event subscriber from this publisher. - * - * @param eventName The event the subscriber is no longer interested in. - * @param subscriber The subscriber to remove. - */ - public void removeSubscriber(String eventName, PropertyChangeListener subscriber) { - eventPublisher.removeSubscriber(eventName, subscriber); - } - - /** - * Removes an event subscriber to this publisher. Subscriber will be removed - * from all event notifications from this publisher. - * - * @param subscriber The subscriber to remove. - */ - public void removeSubscriber(PropertyChangeListener subscriber) { - eventPublisher.removeSubscriber(servicesList, subscriber); - } - - /** - * Verifies connectivity to all services. - */ - private void checkAllServices() { - if (!UserPreferences.getIsMultiUserModeEnabled()) { - return; - } - - for (String service : servicesList) { - checkServiceStatus(service); - } - } - - /** - * A Runnable task that periodically checks the availability of - * collaboration resources (remote database, remote keyword search service, - * message broker) and reports status to the user in case of a gap in - * service. - */ - private final class CrashDetectionTask implements Runnable { - - /** - * Monitor the availability of collaboration resources - */ - @Override - public void run() { - try { - checkAllServices(); - } catch (Exception ex) { - logger.log(Level.SEVERE, "Unexpected exception in CrashDetectionTask", ex); //NON-NLS - } - } - } - - /** - * Exception thrown when service status query results in an error. - */ - public class ServicesMonitorException extends Exception { - - private static final long serialVersionUID = 1L; - - public ServicesMonitorException(String message) { - super(message); - } - - public ServicesMonitorException(String message, Throwable cause) { - super(message, cause); - } - } } diff --git a/Core/src/org/sleuthkit/autopsy/core/layer.xml b/Core/src/org/sleuthkit/autopsy/core/layer.xml index 2b54236d77..288c25ff3a 100644 --- a/Core/src/org/sleuthkit/autopsy/core/layer.xml +++ b/Core/src/org/sleuthkit/autopsy/core/layer.xml @@ -450,6 +450,7 @@ + diff --git a/Core/src/org/sleuthkit/autopsy/core/personasWsmode.xml b/Core/src/org/sleuthkit/autopsy/core/personasWsmode.xml new file mode 100644 index 0000000000..2ee8947b65 --- /dev/null +++ b/Core/src/org/sleuthkit/autopsy/core/personasWsmode.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.java index ad2620beef..6ccc70c920 100644 --- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.java +++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataContentViewerArtifact.java @@ -40,8 +40,8 @@ import org.sleuthkit.datamodel.TskCoreException; import org.sleuthkit.datamodel.TskException; import java.util.Collections; import java.util.HashSet; -import org.sleuthkit.autopsy.contentviewers.ArtifactContentViewer; -import org.sleuthkit.autopsy.contentviewers.DefaultArtifactContentViewer; +import org.sleuthkit.autopsy.contentviewers.artifactviewers.ArtifactContentViewer; +import org.sleuthkit.autopsy.contentviewers.artifactviewers.DefaultArtifactContentViewer; /** * Instances of this class display the BlackboardArtifacts associated with the diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java index db7acfc739..8d9943ffc4 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java @@ -63,7 +63,6 @@ import org.sleuthkit.datamodel.TskCoreException; public class ExtractedContent implements AutopsyVisitableItem { private static final Set INGEST_JOB_EVENTS_OF_INTEREST = EnumSet.of(IngestManager.IngestJobEvent.COMPLETED, IngestManager.IngestJobEvent.CANCELLED); - private static final Set INGEST_MODULE_EVENTS_OF_INTEREST = EnumSet.of(IngestManager.IngestModuleEvent.DATA_ADDED); public static final String NAME = NbBundle.getMessage(RootNode.class, "ExtractedContentNode.name.text"); private final long filteringDSObjId; // 0 if not filtering/grouping by data source private SleuthkitCase skCase; // set to null after case has been closed @@ -145,12 +144,19 @@ public class ExtractedContent implements AutopsyVisitableItem { * This area has all of the blackboard artifacts that are not displayed in a * more specific form elsewhere in the tree. */ - private class TypeFactory extends ChildFactory.Detachable { + private class TypeFactory extends ChildFactory.Detachable implements RefreshThrottler.Refresher { private final ArrayList doNotShow = new ArrayList<>(); // maps the artifact type to its child node private final HashMap typeNodeList = new HashMap<>(); + /** + * RefreshThrottler is used to limit the number of refreshes performed + * when CONTENT_CHANGED and DATA_ADDED ingest module events are + * received. + */ + private final RefreshThrottler refreshThrottler = new RefreshThrottler(this); + @SuppressWarnings("deprecation") TypeFactory() { super(); @@ -173,27 +179,11 @@ public class ExtractedContent implements AutopsyVisitableItem { private final PropertyChangeListener pcl = (PropertyChangeEvent evt) -> { String eventType = evt.getPropertyName(); - if (eventType.equals(IngestManager.IngestModuleEvent.DATA_ADDED.toString())) { - /** - * This is a stop gap measure until a different way of handling - * the closing of cases is worked out. Currently, remote events - * may be received for a case that is already closed. - */ - try { - Case.getCurrentCaseThrows(); - /** - * Due to some unresolved issues with how cases are closed, - * it is possible for the event to have a null oldValue if - * the event is a remote event. - */ - final ModuleDataEvent event = (ModuleDataEvent) evt.getOldValue(); - if (null != event && !(this.doNotShow.contains(event.getBlackboardArtifactType()))) { - refresh(true); - } - } catch (NoCurrentCaseException notUsed) { - /** - * Case is closed, do nothing. - */ + if (eventType.equals(Case.Events.CURRENT_CASE.toString())) { + // case was closed. Remove listeners so that we don't get called with a stale case handle + if (evt.getNewValue() == null) { + removeNotify(); + skCase = null; } } else if (eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString()) || eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString())) { @@ -204,32 +194,26 @@ public class ExtractedContent implements AutopsyVisitableItem { */ try { Case.getCurrentCaseThrows(); - refresh(true); + refresh(false); } catch (NoCurrentCaseException notUsed) { /** * Case is closed, do nothing. */ } - } else if (eventType.equals(Case.Events.CURRENT_CASE.toString())) { - // case was closed. Remove listeners so that we don't get called with a stale case handle - if (evt.getNewValue() == null) { - removeNotify(); - skCase = null; - } } }; @Override protected void addNotify() { + refreshThrottler.registerForIngestModuleEvents(); IngestManager.getInstance().addIngestJobEventListener(INGEST_JOB_EVENTS_OF_INTEREST, pcl); - IngestManager.getInstance().addIngestModuleEventListener(INGEST_MODULE_EVENTS_OF_INTEREST, pcl); Case.addEventTypeSubscriber(EnumSet.of(Case.Events.CURRENT_CASE), pcl); } @Override protected void removeNotify() { + refreshThrottler.unregisterEventListener(); IngestManager.getInstance().removeIngestJobEventListener(pcl); - IngestManager.getInstance().removeIngestModuleEventListener(pcl); Case.removeEventTypeSubscriber(EnumSet.of(Case.Events.CURRENT_CASE), pcl); typeNodeList.clear(); } @@ -273,6 +257,40 @@ public class ExtractedContent implements AutopsyVisitableItem { typeNodeList.put(key, node); return node; } + + @Override + public void refresh() { + refresh(false); + } + + @Override + public boolean isRefreshRequired(PropertyChangeEvent evt) { + String eventType = evt.getPropertyName(); + if (eventType.equals(IngestManager.IngestModuleEvent.DATA_ADDED.toString())) { + /** + * This is a stop gap measure until a different way of handling + * the closing of cases is worked out. Currently, remote events + * may be received for a case that is already closed. + */ + try { + Case.getCurrentCaseThrows(); + /** + * Due to some unresolved issues with how cases are closed, + * it is possible for the event to have a null oldValue if + * the event is a remote event. + */ + final ModuleDataEvent event = (ModuleDataEvent) evt.getOldValue(); + if (null != event && !(this.doNotShow.contains(event.getBlackboardArtifactType()))) { + return true; + } + } catch (NoCurrentCaseException notUsed) { + /** + * Case is closed, do nothing. + */ + } + } + return false; + } } /** @@ -355,73 +373,53 @@ public class ExtractedContent implements AutopsyVisitableItem { /** * Creates children for a given artifact type */ - private class ArtifactFactory extends BaseChildFactory { + private class ArtifactFactory extends BaseChildFactory implements RefreshThrottler.Refresher { - private BlackboardArtifact.Type type; + private final BlackboardArtifact.Type type; + + /** + * RefreshThrottler is used to limit the number of refreshes performed + * when CONTENT_CHANGED and DATA_ADDED ingest module events are + * received. + */ + private final RefreshThrottler refreshThrottler = new RefreshThrottler(this); ArtifactFactory(BlackboardArtifact.Type type) { super(type.getTypeName()); this.type = type; } - private final PropertyChangeListener pcl = new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - String eventType = evt.getPropertyName(); - if (eventType.equals(IngestManager.IngestModuleEvent.DATA_ADDED.toString())) { + private final PropertyChangeListener pcl = (PropertyChangeEvent evt) -> { + String eventType = evt.getPropertyName(); + if (eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString()) + || eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString())) { + /** + * Checking for a current case is a stop gap measure until a + * different way of handling the closing of cases is worked out. + * Currently, remote events may be received for a case that is + * already closed. + */ + try { + Case.getCurrentCaseThrows(); + refresh(false); + } catch (NoCurrentCaseException notUsed) { /** - * Checking for a current case is a stop gap measure until a - * different way of handling the closing of cases is worked - * out. Currently, remote events may be received for a case - * that is already closed. + * Case is closed, do nothing. */ - try { - Case.getCurrentCaseThrows(); - /** - * Even with the check above, it is still possible that - * the case will be closed in a different thread before - * this code executes. If that happens, it is possible - * for the event to have a null oldValue. - */ - final ModuleDataEvent event = (ModuleDataEvent) evt.getOldValue(); - if (null != event && event.getBlackboardArtifactType().equals(type)) { - refresh(true); - } - } catch (NoCurrentCaseException notUsed) { - /** - * Case is closed, do nothing. - */ - } - } else if (eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString()) - || eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString())) { - /** - * Checking for a current case is a stop gap measure until a - * different way of handling the closing of cases is worked - * out. Currently, remote events may be received for a case - * that is already closed. - */ - try { - Case.getCurrentCaseThrows(); - refresh(true); - } catch (NoCurrentCaseException notUsed) { - /** - * Case is closed, do nothing. - */ - } } } }; @Override protected void onAdd() { + refreshThrottler.registerForIngestModuleEvents(); IngestManager.getInstance().addIngestJobEventListener(INGEST_JOB_EVENTS_OF_INTEREST, pcl); - IngestManager.getInstance().addIngestModuleEventListener(INGEST_MODULE_EVENTS_OF_INTEREST, pcl); } @Override protected void onRemove() { + refreshThrottler.unregisterEventListener(); IngestManager.getInstance().removeIngestJobEventListener(pcl); - IngestManager.getInstance().removeIngestModuleEventListener(pcl); } @Override @@ -451,5 +449,43 @@ public class ExtractedContent implements AutopsyVisitableItem { } return Collections.emptyList(); } + + @Override + public void refresh() { + refresh(false); + } + + @Override + public boolean isRefreshRequired(PropertyChangeEvent evt) { + String eventType = evt.getPropertyName(); + if (eventType.equals(IngestManager.IngestModuleEvent.DATA_ADDED.toString())) { + + /** + * Checking for a current case is a stop gap measure until a + * different way of handling the closing of cases is worked out. + * Currently, remote events may be received for a case that is + * already closed. + */ + try { + Case.getCurrentCaseThrows(); + /** + * Even with the check above, it is still possible that the + * case will be closed in a different thread before this + * code executes. If that happens, it is possible for the + * event to have a null oldValue. + */ + final ModuleDataEvent event = (ModuleDataEvent) evt.getOldValue(); + if (null != event && event.getBlackboardArtifactType().equals(type)) { + return true; + } + + } catch (NoCurrentCaseException notUsed) { + /** + * Case is closed, do nothing. + */ + } + } + return false; + } } } diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesByExtension.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesByExtension.java index 83b05019ca..566545eecd 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesByExtension.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesByExtension.java @@ -82,39 +82,26 @@ public final class FileTypesByExtension implements AutopsyVisitableItem { * Listens for case and ingest invest. Updates observers when events are * fired. FileType and FileTypes nodes are all listening to this. */ - private class FileTypesByExtObservable extends Observable { + private class FileTypesByExtObservable extends Observable implements RefreshThrottler.Refresher { private final PropertyChangeListener pcl; private final Set CASE_EVENTS_OF_INTEREST; + /** + * RefreshThrottler is used to limit the number of refreshes performed + * when CONTENT_CHANGED and DATA_ADDED ingest module events are + * received. + */ + private final RefreshThrottler refreshThrottler = new RefreshThrottler(this); private FileTypesByExtObservable() { super(); this.CASE_EVENTS_OF_INTEREST = EnumSet.of(Case.Events.DATA_SOURCE_ADDED, Case.Events.CURRENT_CASE); this.pcl = (PropertyChangeEvent evt) -> { String eventType = evt.getPropertyName(); - if (eventType.equals(IngestManager.IngestModuleEvent.CONTENT_CHANGED.toString()) - || eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString()) + if (eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString()) || eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString()) || eventType.equals(Case.Events.DATA_SOURCE_ADDED.toString())) { - /** - * If a new file has been added but does not have an extension - * there is nothing to do. - */ - if (eventType.equals(IngestManager.IngestModuleEvent.CONTENT_CHANGED.toString())) { - if ((evt.getOldValue() instanceof ModuleContentEvent) == false) { - return; - } - ModuleContentEvent moduleContentEvent = (ModuleContentEvent) evt.getOldValue(); - if ((moduleContentEvent.getSource() instanceof AbstractFile) == false) { - return; - } - AbstractFile abstractFile = (AbstractFile) moduleContentEvent.getSource(); - if (abstractFile.getNameExtension().isEmpty()) { - return; - } - } - /** * Checking for a current case is a stop gap measure until a * different way of handling the closing of cases is worked @@ -139,14 +126,14 @@ public final class FileTypesByExtension implements AutopsyVisitableItem { }; IngestManager.getInstance().addIngestJobEventListener(INGEST_JOB_EVENTS_OF_INTEREST, pcl); - IngestManager.getInstance().addIngestModuleEventListener(INGEST_MODULE_EVENTS_OF_INTEREST, pcl); + refreshThrottler.registerForIngestModuleEvents(); Case.addEventTypeSubscriber(CASE_EVENTS_OF_INTEREST, pcl); } private void removeListeners() { deleteObservers(); IngestManager.getInstance().removeIngestJobEventListener(pcl); - IngestManager.getInstance().removeIngestModuleEventListener(pcl); + refreshThrottler.unregisterEventListener(); Case.removeEventTypeSubscriber(CASE_EVENTS_OF_INTEREST, pcl); } @@ -154,7 +141,52 @@ public final class FileTypesByExtension implements AutopsyVisitableItem { setChanged(); notifyObservers(); } + + @Override + public void refresh() { + typesRoot.updateShowCounts(); + update(); + } + + @Override + public boolean isRefreshRequired(PropertyChangeEvent evt) { + String eventType = evt.getPropertyName(); + if (eventType.equals(IngestManager.IngestModuleEvent.CONTENT_CHANGED.toString())) { + + /** + * Checking for a current case is a stop gap measure until a + * different way of handling the closing of cases is worked out. + * Currently, remote events may be received for a case that is + * already closed. + */ + try { + Case.getCurrentCaseThrows(); + /** + * If a new file has been added but does not have an + * extension there is nothing to do. + */ + if ((evt.getOldValue() instanceof ModuleContentEvent) == false) { + return false; + } + ModuleContentEvent moduleContentEvent = (ModuleContentEvent) evt.getOldValue(); + if ((moduleContentEvent.getSource() instanceof AbstractFile) == false) { + return false; + } + AbstractFile abstractFile = (AbstractFile) moduleContentEvent.getSource(); + if (!abstractFile.getNameExtension().isEmpty()) { + return true; + } + } catch (NoCurrentCaseException ex) { + /** + * Case is closed, no refresh needed. + */ + return false; + } + } + return false; + } } + private static final String FNAME = NbBundle.getMessage(FileTypesByExtNode.class, "FileTypesByExtNode.fname.text"); /** diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesByMimeType.java b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesByMimeType.java index f1baac477a..370b4f2809 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesByMimeType.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/FileTypesByMimeType.java @@ -83,13 +83,19 @@ public final class FileTypesByMimeType extends Observable implements AutopsyVisi private static final Set CASE_EVENTS_OF_INTEREST = EnumSet.of(Case.Events.DATA_SOURCE_ADDED, Case.Events.CURRENT_CASE); + /** + * RefreshThrottler is used to limit the number of refreshes performed when + * CONTENT_CHANGED and DATA_ADDED ingest module events are received. + */ + private final RefreshThrottler refreshThrottler; + /** * Create the base expression used as the where clause in the queries for * files by mime type. Filters out certain kinds of files and directories, * and known/slack files based on user preferences. * * @return The base expression to be used in the where clause of queries for - * files by mime type. + * files by mime type. */ private String createBaseWhereExpr() { return "(dir_type = " + TskData.TSK_FS_NAME_TYPE_ENUM.REG.getValue() + ")" @@ -108,6 +114,7 @@ public final class FileTypesByMimeType extends Observable implements AutopsyVisi private void removeListeners() { deleteObservers(); IngestManager.getInstance().removeIngestJobEventListener(pcl); + refreshThrottler.unregisterEventListener(); Case.removeEventTypeSubscriber(CASE_EVENTS_OF_INTEREST, pcl); } @@ -155,32 +162,20 @@ public final class FileTypesByMimeType extends Observable implements AutopsyVisi this.typesRoot = typesRoot; this.pcl = (PropertyChangeEvent evt) -> { String eventType = evt.getPropertyName(); - if (eventType.equals(IngestManager.IngestModuleEvent.CONTENT_CHANGED.toString()) - || eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString()) + if (eventType.equals(IngestManager.IngestJobEvent.COMPLETED.toString()) || eventType.equals(IngestManager.IngestJobEvent.CANCELLED.toString()) || eventType.equals(Case.Events.DATA_SOURCE_ADDED.toString())) { - /** - * Checking for a current case is a stop gap measure until a - * different way of handling the closing of cases is worked out. - * Currently, remote events may be received for a case that is - * already closed. - */ - try { - Case.getCurrentCaseThrows(); - typesRoot.updateShowCounts(); - populateHashMap(); - } catch (NoCurrentCaseException notUsed) { - /** - * Case is closed, do nothing. - */ - } + + refreshMimeTypes(); } else if (eventType.equals(Case.Events.CURRENT_CASE.toString())) { if (evt.getNewValue() == null) { removeListeners(); } } }; + refreshThrottler = new RefreshThrottler(new FileTypesByMimeTypeRefresher()); IngestManager.getInstance().addIngestJobEventListener(INGEST_JOB_EVENTS_OF_INTEREST, pcl); + refreshThrottler.registerForIngestModuleEvents(); Case.addEventTypeSubscriber(CASE_EVENTS_OF_INTEREST, pcl); populateHashMap(); } @@ -201,7 +196,7 @@ public final class FileTypesByMimeType extends Observable implements AutopsyVisi * @param node the Node which you wish to check. * * @return True if originNode is an instance of ByMimeTypeNode and is empty, - * false otherwise. + * false otherwise. */ public static boolean isEmptyMimeTypeNode(Node node) { boolean isEmptyMimeNode = false; @@ -212,6 +207,41 @@ public final class FileTypesByMimeType extends Observable implements AutopsyVisi } + private void refreshMimeTypes() { + /** + * Checking for a current case is a stop gap measure until a different + * way of handling the closing of cases is worked out. Currently, remote + * events may be received for a case that is already closed. + */ + try { + Case.getCurrentCaseThrows(); + typesRoot.updateShowCounts(); + populateHashMap(); + } catch (NoCurrentCaseException notUsed) { + /** + * Case is closed, do nothing. + */ + } + } + + /** + * Responsible for updating the 'By Mime Type' view in the UI. See + * RefreshThrottler for more details. + */ + private class FileTypesByMimeTypeRefresher implements RefreshThrottler.Refresher { + + @Override + public void refresh() { + refreshMimeTypes(); + } + + @Override + public boolean isRefreshRequired(PropertyChangeEvent evt) { + return true; + } + + } + /** * Class which represents the root node of the "By MIME Type" tree, will * have children of each media type present in the database or no children diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/RefreshThrottler.java b/Core/src/org/sleuthkit/autopsy/datamodel/RefreshThrottler.java new file mode 100644 index 0000000000..a8d3ed5581 --- /dev/null +++ b/Core/src/org/sleuthkit/autopsy/datamodel/RefreshThrottler.java @@ -0,0 +1,125 @@ +/* + * Autopsy Forensic Browser + * + * Copyright 2011-2020 Basis Technology Corp. + * Contact: carrier sleuthkit org + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.sleuthkit.autopsy.datamodel; + +import com.google.common.util.concurrent.ThreadFactoryBuilder; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.util.EnumSet; +import java.util.Set; +import java.util.concurrent.ScheduledThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; +import org.sleuthkit.autopsy.ingest.IngestManager; + +/** + * Utility class that can be used by UI nodes to reduce the number of + * potentially expensive UI refresh events when DATA_ADDED and CONTENT_CHANGED + * ingest manager events are received. + */ +class RefreshThrottler { + + /** + * The Refresher interface needs to be implemented by ChildFactory instances + * that wish to take advantage of throttled refresh functionality. + */ + interface Refresher { + + /** + * The RefreshThrottler calls this method when the RefreshTask runs. + * + */ + void refresh(); + + /** + * Determine whether the given event should result in a refresh. + * + * @param evt + * + * @return true if event should trigger a refresh, otherwise false. + */ + boolean isRefreshRequired(PropertyChangeEvent evt); + } + + static ScheduledThreadPoolExecutor refreshExecutor = new ScheduledThreadPoolExecutor(1, new ThreadFactoryBuilder().setNameFormat("Node Refresh Thread").build()); + // Keep a thread safe reference to the current refresh task (if any) + private final AtomicReference refreshTaskRef; + + // The factory instance that will be called when a refresh is due. + private final Refresher refresher; + + private static final long MIN_SECONDS_BETWEEN_REFRESH = 5; + + private static final Set INGEST_MODULE_EVENTS_OF_INTEREST = EnumSet.of(IngestManager.IngestModuleEvent.DATA_ADDED, IngestManager.IngestModuleEvent.CONTENT_CHANGED); + + /** + * A RefreshTask is scheduled to run when an event arrives and there isn't + * one already scheduled. + */ + private final class RefreshTask implements Runnable { + + @Override + public void run() { + // Call refresh on the factory + refresher.refresh(); + // Clear the refresh task reference + refreshTaskRef.set(null); + } + } + + /** + * PropertyChangeListener that reacts to DATA_ADDED and CONTENT_CHANGED + * events and schedules a refresh task if one is not already scheduled. + */ + private final PropertyChangeListener pcl; + + RefreshThrottler(Refresher r) { + this.refreshTaskRef = new AtomicReference<>(null); + refresher = r; + + pcl = (PropertyChangeEvent evt) -> { + String eventType = evt.getPropertyName(); + if (eventType.equals(IngestManager.IngestModuleEvent.DATA_ADDED.toString()) + || eventType.equals(IngestManager.IngestModuleEvent.CONTENT_CHANGED.toString())) { + if (!refresher.isRefreshRequired(evt)) { + return; + } + + RefreshTask task = new RefreshTask(); + if (refreshTaskRef.compareAndSet(null, task)) { + refreshExecutor.schedule(task, MIN_SECONDS_BETWEEN_REFRESH, TimeUnit.SECONDS); + } + } + }; + } + + /** + * Set up listener for ingest module events of interest. + */ + void registerForIngestModuleEvents() { + IngestManager.getInstance().addIngestModuleEventListener(INGEST_MODULE_EVENTS_OF_INTEREST, pcl); + } + + /** + * Remove ingest module event listener. + */ + void unregisterEventListener() { + IngestManager.getInstance().removeIngestModuleEventListener(pcl); + } +} diff --git a/Core/src/org/sleuthkit/autopsy/discovery/AbstractFiltersPanel.java b/Core/src/org/sleuthkit/autopsy/discovery/AbstractFiltersPanel.java index 7bcd1c8243..2f718c3aa5 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/AbstractFiltersPanel.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/AbstractFiltersPanel.java @@ -101,7 +101,7 @@ abstract class AbstractFiltersPanel extends JPanel implements ActionListener, Li constraints.weightx = LABEL_WEIGHT; constraints.weighty = LABEL_WEIGHT; constraints.gridwidth = LABEL_WIDTH; - addToGridBagLayout(filterPanel.getCheckbox(), null, column); + addToGridBagLayout(filterPanel.getCheckbox(), filterPanel.getAdditionalLabel(), column); if (filterPanel.hasPanel()) { constraints.gridx += constraints.gridwidth; constraints.fill = GridBagConstraints.BOTH; diff --git a/Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties b/Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties index 52c989c8e7..795018f1ac 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties @@ -101,3 +101,6 @@ DocumentFilterPanel.documentsFiltersSplitPane.border.title=Step 2: Filter which ImageFilterPanel.imageFiltersSplitPane.border.title=Step 2: Filter which images to show VideoFilterPanel.videoFiltersSplitPane.border.title=Step 2: Filter which videos to show DiscoveryDialog.step1Label.text=Step 1: Choose result type +ResultsSplitPaneDivider.hideButton.text= +ResultsSplitPaneDivider.showButton.text= +ResultsSplitPaneDivider.detailsLabel.text=Details Area diff --git a/Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED index 0779798a6e..b687a1d9fb 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/discovery/Bundle.properties-MERGED @@ -11,7 +11,7 @@ DiscoveryTopComponent.name=\ Discovery DiscoveryTopComponent.newSearch.text=New Search DiscoveryTopComponent.searchCancelled.text=Search has been cancelled. # {0} - search -DiscoveryTopComponent.searchComplete.text=Results for {0} +DiscoveryTopComponent.searchComplete.text=Results with {0} # {0} - searchType DiscoveryTopComponent.searchInProgress.text=Performing search for results of type {0}. Please wait. DiscoveryUiUtility.bytes.text=bytes @@ -57,18 +57,24 @@ FileSearch.InterestingItemGroupKey.noSets=None FileSearch.KeywordListGroupKey.noKeywords=None FileSearch.NoGroupingGroupKey.allFiles=All Files FileSearch.ObjectDetectedGroupKey.noSets=None -FileSearchData.FileSize.LARGE_IMAGE.displayName=Large: 1-50MB -FileSearchData.FileSize.LARGE_VIDEO.displayName=Large: 1-5GB -FileSearchData.FileSize.MEDIUM_IMAGE.displayName=Medium: 100KB-1MB -FileSearchData.FileSize.MEDIUM_VIDEO.displayName=Medium: 100MB-1GB -FileSearchData.FileSize.SMALL_IMAGE.displayName=Small: 16-100KB -FileSearchData.FileSize.SMALL_VIDEO.displayName=Small: 500KB-100MB -FileSearchData.FileSize.XLARGE_IMAGE.displayName=XLarge: 50-200MB -FileSearchData.FileSize.XLARGE_VIDEO.displayName=XLarge: 5-10GB -FileSearchData.FileSize.XSMALL_IMAGE.displayName=XSmall: 0-16KB -FileSearchData.FileSize.XSMALL_VIDEO.displayName=XSmall: 0-500KB -FileSearchData.FileSize.XXLARGE_IMAGE.displayName=XXLarge: 200MB+ -FileSearchData.FileSize.XXLARGE_VIDEO.displayName=XXLarge: 10GB+ +FileSearchData.FileSize.100kbto1mb=: 100KB-1MB +FileSearchData.FileSize.100mbto1gb=: 100MB-1GB +FileSearchData.FileSize.10PlusGb=: 10GB+ +FileSearchData.FileSize.16kbto100kb=: 16-100KB +FileSearchData.FileSize.1gbto5gb=: 1-5GB +FileSearchData.FileSize.1mbto50mb=: 1-50MB +FileSearchData.FileSize.200PlusMb=: 200MB+ +FileSearchData.FileSize.500kbto100mb=: 500KB-100MB +FileSearchData.FileSize.50mbto200mb=: 50-200MB +FileSearchData.FileSize.5gbto10gb=: 5-10GB +FileSearchData.FileSize.LARGE.displayName=Large +FileSearchData.FileSize.MEDIUM.displayName=Medium +FileSearchData.FileSize.SMALL.displayName=Small +FileSearchData.FileSize.upTo16kb=: 0-16KB +FileSearchData.FileSize.upTo500kb=: 0-500KB +FileSearchData.FileSize.XLARGE.displayName=XLarge +FileSearchData.FileSize.XSMALL.displayName=XSmall +FileSearchData.FileSize.XXLARGE.displayName=XXLarge FileSearchData.FileType.Audio.displayName=Audio FileSearchData.FileType.Documents.displayName=Documents FileSearchData.FileType.Executables.displayName=Executables @@ -106,45 +112,44 @@ FileSearchFiltering.concatenateSetNamesForDisplay.comma=, # {1} - Data source ID FileSearchFiltering.DataSourceFilter.datasource={0}({1}) # {0} - filters -FileSearchFiltering.DataSourceFilter.desc=Files in data source(s): {0} -FileSearchFiltering.DataSourceFilter.or=\ or +FileSearchFiltering.DataSourceFilter.desc=Data source(s): {0} +FileSearchFiltering.DataSourceFilter.or=, # {0} - filters -FileSearchFiltering.FileTypeFilter.desc=Files with type: {0} -FileSearchFiltering.FileTypeFilter.or=\ or +FileSearchFiltering.FileTypeFilter.desc=Type: {0} +FileSearchFiltering.FileTypeFilter.or=, # {0} - filters -FileSearchFiltering.FrequencyFilter.desc=Files with frequency: {0} -FileSearchFiltering.FrequencyFilter.or=\ or +FileSearchFiltering.FrequencyFilter.desc=Past occurrences: {0} +FileSearchFiltering.FrequencyFilter.or=, # {0} - filters -FileSearchFiltering.HashSetFilter.desc=Files with hash set hits in set(s): {0} +FileSearchFiltering.HashSetFilter.desc=Hash set hits in set(s): {0} # {0} - filters -FileSearchFiltering.InterestingItemSetFilter.desc=Files with interesting item hits in set(s): {0} +FileSearchFiltering.InterestingItemSetFilter.desc=Interesting item hits in set(s): {0} # {0} - filters -FileSearchFiltering.KeywordListFilter.desc=Files with keywords in list(s): {0} -FileSearchFiltering.KnownFilter.desc=Files which are not known +FileSearchFiltering.KeywordListFilter.desc=Keywords in list(s): {0} +FileSearchFiltering.KnownFilter.desc=which are not known # {0} - filters -FileSearchFiltering.ObjectDetectionFilter.desc=Files with objects detected in set(s): {0} +FileSearchFiltering.ObjectDetectionFilter.desc=Objects detected in set(s): {0} # {0} - filters -FileSearchFiltering.ParentFilter.desc=Files with paths matching: {0} +FileSearchFiltering.ParentFilter.desc=Paths matching: {0} FileSearchFiltering.ParentFilter.exact=(exact match) -FileSearchFiltering.ParentFilter.or=\ or +FileSearchFiltering.ParentFilter.excluded=(excluded) +FileSearchFiltering.ParentFilter.included=(included) +FileSearchFiltering.ParentFilter.or=, FileSearchFiltering.ParentFilter.substring=(substring) FileSearchFiltering.ParentSearchTerm.excludeString=\ (exclude) FileSearchFiltering.ParentSearchTerm.fullString=\ (exact) FileSearchFiltering.ParentSearchTerm.includeString=\ (include) FileSearchFiltering.ParentSearchTerm.subString=\ (substring) -FileSearchFiltering.PreviouslyNotableFilter.desc=Files that were previously marked as notable +FileSearchFiltering.PreviouslyNotableFilter.desc=that were previously marked as notable # {0} - filters -FileSearchFiltering.ScoreFilter.desc=Files with score(s) of : {0} +FileSearchFiltering.ScoreFilter.desc=Score(s) of : {0} # {0} - filters -FileSearchFiltering.SizeFilter.desc=Files with size in range(s): {0} -FileSearchFiltering.SizeFilter.or=\ or -# {0} - Minimum bytes -# {1} - Maximum bytes -FileSearchFiltering.SizeFilter.range=({0} to {1}) +FileSearchFiltering.SizeFilter.desc=Size(s): {0} +FileSearchFiltering.SizeFilter.or=, # {0} - tag names -FileSearchFiltering.TagsFilter.desc=Files that have been tagged {0} -FileSearchFiltering.TagsFilter.or=\ or -FileSearchFiltering.UserCreatedFilter.desc=Files that contain EXIF data +FileSearchFiltering.TagsFilter.desc=Tagged {0} +FileSearchFiltering.TagsFilter.or=, +FileSearchFiltering.UserCreatedFilter.desc=that contain EXIF data FileSearchPanel.sortingPanel.border.title=Grouping FileSearchPanel.addButton.text=Add FileSearchPanel.substringRadioButton.text=Substring @@ -186,7 +191,7 @@ GroupsListPanel.noResults.title.text=No results found ImageThumbnailPanel.isDeleted.text=All instances of file are deleted. # {0} - otherInstanceCount ImageThumbnailPanel.nameLabel.more.text=\ and {0} more -OpenDiscoveryAction.resultsIncomplete.text=Results may be incomplete +OpenDiscoveryAction.resultsIncomplete.text=Discovery results may be incomplete ResultFile.score.interestingResult.description=At least one instance of the file has an interesting result associated with it. ResultFile.score.notableFile.description=At least one instance of the file was recognized as notable. ResultFile.score.notableTaggedFile.description=At least one instance of the file is tagged with a notable tag. @@ -259,6 +264,9 @@ DocumentFilterPanel.documentsFiltersSplitPane.border.title=Step 2: Filter which ImageFilterPanel.imageFiltersSplitPane.border.title=Step 2: Filter which images to show VideoFilterPanel.videoFiltersSplitPane.border.title=Step 2: Filter which videos to show DiscoveryDialog.step1Label.text=Step 1: Choose result type +ResultsSplitPaneDivider.hideButton.text= +ResultsSplitPaneDivider.showButton.text= +ResultsSplitPaneDivider.detailsLabel.text=Details Area VideoThumbnailPanel.bytes.text=bytes VideoThumbnailPanel.deleted.text=All instances of file are deleted. VideoThumbnailPanel.gigaBytes.text=GB diff --git a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.form b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.form index d19a7dda96..19116a24fe 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.form +++ b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.form @@ -43,23 +43,25 @@ - - - - - - - - + + + + + + + + + + + - diff --git a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.java b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.java index 948dbd4bee..33f69712f0 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryDialog.java @@ -275,19 +275,21 @@ final class DiscoveryDialog extends javax.swing.JDialog { toolBarPanelLayout.setHorizontalGroup( toolBarPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(toolBarPanelLayout.createSequentialGroup() - .addContainerGap(196, Short.MAX_VALUE) - .addGroup(toolBarPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addGroup(javax.swing.GroupLayout.Alignment.LEADING, toolBarPanelLayout.createSequentialGroup() - .addComponent(filler1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(step1Label, javax.swing.GroupLayout.PREFERRED_SIZE, 243, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addContainerGap() + .addGroup(toolBarPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(toolBarPanelLayout.createSequentialGroup() + .addGap(10, 10, 10) .addComponent(imagesButton, javax.swing.GroupLayout.PREFERRED_SIZE, 110, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(videosButton, javax.swing.GroupLayout.PREFERRED_SIZE, 110, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(documentsButton))) - .addContainerGap(196, Short.MAX_VALUE)) + .addComponent(documentsButton) + .addContainerGap(370, Short.MAX_VALUE)) + .addGroup(toolBarPanelLayout.createSequentialGroup() + .addComponent(step1Label, javax.swing.GroupLayout.PREFERRED_SIZE, 243, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(filler1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addContainerGap(391, Short.MAX_VALUE)))) ); toolBarPanelLayout.setVerticalGroup( toolBarPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) diff --git a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryTopComponent.form b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryTopComponent.form index 4e62b44cb9..4a1f471190 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryTopComponent.form +++ b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryTopComponent.form @@ -41,7 +41,7 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryTopComponent.java b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryTopComponent.java index 30341184ad..607459325d 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryTopComponent.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryTopComponent.java @@ -19,11 +19,14 @@ package org.sleuthkit.autopsy.discovery; import com.google.common.eventbus.Subscribe; +import java.awt.BorderLayout; import java.awt.Color; import java.awt.Graphics; import java.util.List; import java.util.stream.Collectors; import javax.swing.JSplitPane; +import javax.swing.plaf.basic.BasicSplitPaneDivider; +import javax.swing.plaf.basic.BasicSplitPaneUI; import org.openide.util.NbBundle; import org.openide.util.NbBundle.Messages; import org.openide.windows.Mode; @@ -67,6 +70,34 @@ public final class DiscoveryTopComponent extends TopComponent { mainSplitPane.setLeftComponent(groupListPanel); rightSplitPane.setTopComponent(resultsPanel); rightSplitPane.setBottomComponent(detailsPanel); + //set color of divider + rightSplitPane.setUI(new BasicSplitPaneUI() { + @Override + public BasicSplitPaneDivider createDefaultDivider() { + return new BasicSplitPaneDividerImpl(this); + + } + }); + } + + /** + * Private class for replacing the divider for the results split pane. + */ + private final class BasicSplitPaneDividerImpl extends BasicSplitPaneDivider { + + /** + * Construct a new BasicSplitPaneDividerImpl. + * + * @param ui The component which contains the split pane this divider is + * in. + */ + BasicSplitPaneDividerImpl(BasicSplitPaneUI ui) { + super(ui); + this.setLayout(new BorderLayout()); + this.add(new ResultsSplitPaneDivider()); + } + + private static final long serialVersionUID = 1L; } /** @@ -129,7 +160,7 @@ public final class DiscoveryTopComponent extends TopComponent { mainSplitPane.setDividerLocation(250); mainSplitPane.setPreferredSize(new java.awt.Dimension(1100, 700)); - rightSplitPane.setDividerSize(15); + rightSplitPane.setDividerSize(35); rightSplitPane.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT); rightSplitPane.setResizeWeight(1.0); rightSplitPane.setPreferredSize(new java.awt.Dimension(800, 700)); @@ -249,11 +280,11 @@ public final class DiscoveryTopComponent extends TopComponent { @Subscribe @Messages({"DiscoveryTopComponent.newSearch.text=New Search", "# {0} - search", - "DiscoveryTopComponent.searchComplete.text=Results for {0}"}) + "DiscoveryTopComponent.searchComplete.text=Results with {0}"}) void handleSearchCompleteEvent(DiscoveryEventUtils.SearchCompleteEvent searchCompleteEvent) { newSearchButton.setText(Bundle.DiscoveryTopComponent_newSearch_text()); progressMessageTextArea.setForeground(Color.black); - progressMessageTextArea.setText(Bundle.DiscoveryTopComponent_searchComplete_text(searchCompleteEvent.getFilters().stream().map(FileFilter::getDesc).collect(Collectors.joining(", ")))); + progressMessageTextArea.setText(Bundle.DiscoveryTopComponent_searchComplete_text(searchCompleteEvent.getFilters().stream().map(FileFilter::getDesc).collect(Collectors.joining("; ")))); progressMessageTextArea.setCaretPosition(0); } @@ -269,6 +300,7 @@ public final class DiscoveryTopComponent extends TopComponent { newSearchButton.setText(Bundle.DiscoveryTopComponent_newSearch_text()); progressMessageTextArea.setForeground(Color.red); progressMessageTextArea.setText(Bundle.DiscoveryTopComponent_searchCancelled_text()); + } /** diff --git a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryUiUtils.java b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryUiUtils.java index 3890751dc7..55392f54f2 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryUiUtils.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/DiscoveryUiUtils.java @@ -19,6 +19,7 @@ package org.sleuthkit.autopsy.discovery; import java.awt.Component; +import java.awt.Dimension; import java.awt.Point; import java.util.ArrayList; import java.util.Collections; @@ -29,6 +30,8 @@ import java.util.logging.Level; import javax.swing.ImageIcon; import javax.swing.JComponent; import javax.swing.JOptionPane; +import javax.swing.JScrollPane; +import javax.swing.JTextPane; import org.openide.util.ImageUtilities; import org.openide.util.NbBundle; import org.sleuthkit.autopsy.casemodule.Case; @@ -224,7 +227,16 @@ final class DiscoveryUiUtils { message += dsmodulesWrapper.getMessage(); } if (!message.isEmpty()) { - JOptionPane.showMessageDialog(dialog, message, Bundle.OpenDiscoveryAction_resultsIncomplete_text(), JOptionPane.INFORMATION_MESSAGE); + JScrollPane messageScrollPane = new JScrollPane(); + JTextPane messageTextPane = new JTextPane(); + messageTextPane.setText(message); + messageTextPane.setVisible(true); + messageTextPane.setEditable(false); + messageTextPane.setCaretPosition(0); + messageScrollPane.setMaximumSize(new Dimension(600, 100)); + messageScrollPane.setPreferredSize(new Dimension(600, 100)); + messageScrollPane.setViewportView(messageTextPane); + JOptionPane.showMessageDialog(dialog, messageScrollPane, Bundle.OpenDiscoveryAction_resultsIncomplete_text(), JOptionPane.PLAIN_MESSAGE); } } catch (NoCurrentCaseException | TskCoreException ex) { logger.log(Level.WARNING, "Exception while determining which modules have been run for Discovery", ex); diff --git a/Core/src/org/sleuthkit/autopsy/discovery/DocumentFilterPanel.java b/Core/src/org/sleuthkit/autopsy/discovery/DocumentFilterPanel.java index 9756045387..216a3c12b3 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/DocumentFilterPanel.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/DocumentFilterPanel.java @@ -45,7 +45,6 @@ final class DocumentFilterPanel extends AbstractFiltersPanel { addFilter(new PastOccurrencesFilterPanel(), true, pastOccurrencesIndices, 0); addFilter(new HashSetFilterPanel(), false, null, 1); addFilter(new InterestingItemsFilterPanel(), false, null, 1); - addFilter(new ObjectDetectedFilterPanel(), false, null, 1); addFilter(new ParentFolderFilterPanel(), false, null, 1); addPanelsToScrollPane(documentsFiltersSplitPane); } diff --git a/Core/src/org/sleuthkit/autopsy/discovery/FileSearchData.java b/Core/src/org/sleuthkit/autopsy/discovery/FileSearchData.java index 40df3ee905..81bb2ca641 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/FileSearchData.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/FileSearchData.java @@ -126,39 +126,46 @@ final class FileSearchData { * Enum representing the file size */ @NbBundle.Messages({ - "FileSearchData.FileSize.XXLARGE_IMAGE.displayName=XXLarge: 200MB+", - "FileSearchData.FileSize.XLARGE_IMAGE.displayName=XLarge: 50-200MB", - "FileSearchData.FileSize.LARGE_IMAGE.displayName=Large: 1-50MB", - "FileSearchData.FileSize.MEDIUM_IMAGE.displayName=Medium: 100KB-1MB", - "FileSearchData.FileSize.SMALL_IMAGE.displayName=Small: 16-100KB", - "FileSearchData.FileSize.XSMALL_IMAGE.displayName=XSmall: 0-16KB", - "FileSearchData.FileSize.XXLARGE_VIDEO.displayName=XXLarge: 10GB+", - "FileSearchData.FileSize.XLARGE_VIDEO.displayName=XLarge: 5-10GB", - "FileSearchData.FileSize.LARGE_VIDEO.displayName=Large: 1-5GB", - "FileSearchData.FileSize.MEDIUM_VIDEO.displayName=Medium: 100MB-1GB", - "FileSearchData.FileSize.SMALL_VIDEO.displayName=Small: 500KB-100MB", - "FileSearchData.FileSize.XSMALL_VIDEO.displayName=XSmall: 0-500KB",}) + "FileSearchData.FileSize.XXLARGE.displayName=XXLarge", + "FileSearchData.FileSize.XLARGE.displayName=XLarge", + "FileSearchData.FileSize.LARGE.displayName=Large", + "FileSearchData.FileSize.MEDIUM.displayName=Medium", + "FileSearchData.FileSize.SMALL.displayName=Small", + "FileSearchData.FileSize.XSMALL.displayName=XSmall", + "FileSearchData.FileSize.10PlusGb=: 10GB+", + "FileSearchData.FileSize.5gbto10gb=: 5-10GB", + "FileSearchData.FileSize.1gbto5gb=: 1-5GB", + "FileSearchData.FileSize.100mbto1gb=: 100MB-1GB", + "FileSearchData.FileSize.200PlusMb=: 200MB+", + "FileSearchData.FileSize.50mbto200mb=: 50-200MB", + "FileSearchData.FileSize.500kbto100mb=: 500KB-100MB", + "FileSearchData.FileSize.1mbto50mb=: 1-50MB", + "FileSearchData.FileSize.100kbto1mb=: 100KB-1MB", + "FileSearchData.FileSize.16kbto100kb=: 16-100KB", + "FileSearchData.FileSize.upTo500kb=: 0-500KB", + "FileSearchData.FileSize.upTo16kb=: 0-16KB",}) enum FileSize { - XXLARGE_VIDEO(0, 10000 * BYTES_PER_MB, -1, Bundle.FileSearchData_FileSize_XXLARGE_VIDEO_displayName()), - XLARGE_VIDEO(1, 5000 * BYTES_PER_MB, 10000 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_XLARGE_VIDEO_displayName()), - LARGE_VIDEO(2, 1000 * BYTES_PER_MB, 5000 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_LARGE_VIDEO_displayName()), - MEDIUM_VIDEO(3, 100 * BYTES_PER_MB, 1000 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_MEDIUM_VIDEO_displayName()), - SMALL_VIDEO(4, 500000, 100 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_SMALL_VIDEO_displayName()), - XSMALL_VIDEO(5, 0, 500000, Bundle.FileSearchData_FileSize_XSMALL_VIDEO_displayName()), - XXLARGE_IMAGE(6, 200 * BYTES_PER_MB, -1, Bundle.FileSearchData_FileSize_XXLARGE_IMAGE_displayName()), - XLARGE_IMAGE(7, 50 * BYTES_PER_MB, 200 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_XLARGE_IMAGE_displayName()), - LARGE_IMAGE(8, 1 * BYTES_PER_MB, 50 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_LARGE_IMAGE_displayName()), - MEDIUM_IMAGE(9, 100000, 1 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_MEDIUM_IMAGE_displayName()), - SMALL_IMAGE(10, 16000, 100000, Bundle.FileSearchData_FileSize_SMALL_IMAGE_displayName()), - XSMALL_IMAGE(11, 0, 16000, Bundle.FileSearchData_FileSize_XSMALL_IMAGE_displayName()); + XXLARGE_VIDEO(0, 10000 * BYTES_PER_MB, -1, Bundle.FileSearchData_FileSize_XXLARGE_displayName(), Bundle.FileSearchData_FileSize_10PlusGb()), + XLARGE_VIDEO(1, 5000 * BYTES_PER_MB, 10000 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_XLARGE_displayName(), Bundle.FileSearchData_FileSize_5gbto10gb()), + LARGE_VIDEO(2, 1000 * BYTES_PER_MB, 5000 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_LARGE_displayName(), Bundle.FileSearchData_FileSize_1gbto5gb()), + MEDIUM_VIDEO(3, 100 * BYTES_PER_MB, 1000 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_MEDIUM_displayName(), Bundle.FileSearchData_FileSize_100mbto1gb()), + SMALL_VIDEO(4, 500000, 100 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_SMALL_displayName(), Bundle.FileSearchData_FileSize_500kbto100mb()), + XSMALL_VIDEO(5, 0, 500000, Bundle.FileSearchData_FileSize_XSMALL_displayName(), Bundle.FileSearchData_FileSize_upTo500kb()), + XXLARGE_IMAGE(6, 200 * BYTES_PER_MB, -1, Bundle.FileSearchData_FileSize_XXLARGE_displayName(), Bundle.FileSearchData_FileSize_200PlusMb()), + XLARGE_IMAGE(7, 50 * BYTES_PER_MB, 200 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_XLARGE_displayName(), Bundle.FileSearchData_FileSize_50mbto200mb()), + LARGE_IMAGE(8, 1 * BYTES_PER_MB, 50 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_LARGE_displayName(), Bundle.FileSearchData_FileSize_1mbto50mb()), + MEDIUM_IMAGE(9, 100000, 1 * BYTES_PER_MB, Bundle.FileSearchData_FileSize_MEDIUM_displayName(), Bundle.FileSearchData_FileSize_100kbto1mb()), + SMALL_IMAGE(10, 16000, 100000, Bundle.FileSearchData_FileSize_SMALL_displayName(), Bundle.FileSearchData_FileSize_16kbto100kb()), + XSMALL_IMAGE(11, 0, 16000, Bundle.FileSearchData_FileSize_XSMALL_displayName(), Bundle.FileSearchData_FileSize_upTo16kb()); private final int ranking; // Must be unique for each value private final long minBytes; // Note that the size must be strictly greater than this to match private final long maxBytes; - private final String displayName; + private final String sizeGroup; + private final String displaySize; final static long NO_MAXIMUM = -1; - FileSize(int ranking, long minB, long maxB, String displayName) { + FileSize(int ranking, long minB, long maxB, String displayName, String displaySize) { this.ranking = ranking; this.minBytes = minB; if (maxB >= 0) { @@ -166,7 +173,8 @@ final class FileSearchData { } else { this.maxBytes = NO_MAXIMUM; } - this.displayName = displayName; + this.sizeGroup = displayName; + this.displaySize = displaySize; } /** @@ -246,7 +254,11 @@ final class FileSearchData { @Override public String toString() { - return displayName; + return sizeGroup + displaySize; + } + + String getSizeGroup(){ + return sizeGroup; } /** diff --git a/Core/src/org/sleuthkit/autopsy/discovery/FileSearchFiltering.java b/Core/src/org/sleuthkit/autopsy/discovery/FileSearchFiltering.java index 326bc7c15c..adf301537a 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/FileSearchFiltering.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/FileSearchFiltering.java @@ -207,11 +207,8 @@ class FileSearchFiltering { @NbBundle.Messages({ "# {0} - filters", - "FileSearchFiltering.SizeFilter.desc=Files with size in range(s): {0}", - "FileSearchFiltering.SizeFilter.or= or ", - "# {0} - Minimum bytes", - "# {1} - Maximum bytes", - "FileSearchFiltering.SizeFilter.range=({0} to {1})",}) + "FileSearchFiltering.SizeFilter.desc=Size(s): {0}", + "FileSearchFiltering.SizeFilter.or=, "}) @Override String getDesc() { String desc = ""; // NON-NLS @@ -219,7 +216,7 @@ class FileSearchFiltering { if (!desc.isEmpty()) { desc += Bundle.FileSearchFiltering_SizeFilter_or(); } - desc += Bundle.FileSearchFiltering_SizeFilter_range(size.getMinBytes(), size.getMaxBytes()); + desc += size.getSizeGroup(); } desc = Bundle.FileSearchFiltering_SizeFilter_desc(desc); return desc; @@ -364,10 +361,12 @@ class FileSearchFiltering { @NbBundle.Messages({ "# {0} - filters", - "FileSearchFiltering.ParentFilter.desc=Files with paths matching: {0}", - "FileSearchFiltering.ParentFilter.or= or ", + "FileSearchFiltering.ParentFilter.desc=Paths matching: {0}", + "FileSearchFiltering.ParentFilter.or=, ", "FileSearchFiltering.ParentFilter.exact=(exact match)", - "FileSearchFiltering.ParentFilter.substring=(substring)",}) + "FileSearchFiltering.ParentFilter.substring=(substring)", + "FileSearchFiltering.ParentFilter.included=(included)", + "FileSearchFiltering.ParentFilter.excluded=(excluded)"}) @Override String getDesc() { String desc = ""; // NON-NLS @@ -380,6 +379,11 @@ class FileSearchFiltering { } else { desc += searchTerm.getSearchStr() + Bundle.FileSearchFiltering_ParentFilter_substring(); } + if (searchTerm.isIncluded()) { + desc += Bundle.FileSearchFiltering_ParentFilter_included(); + } else { + desc += Bundle.FileSearchFiltering_ParentFilter_excluded(); + } } desc = Bundle.FileSearchFiltering_ParentFilter_desc(desc); return desc; @@ -417,8 +421,8 @@ class FileSearchFiltering { @NbBundle.Messages({ "# {0} - filters", - "FileSearchFiltering.DataSourceFilter.desc=Files in data source(s): {0}", - "FileSearchFiltering.DataSourceFilter.or= or ", + "FileSearchFiltering.DataSourceFilter.desc=Data source(s): {0}", + "FileSearchFiltering.DataSourceFilter.or=, ", "# {0} - Data source name", "# {1} - Data source ID", "FileSearchFiltering.DataSourceFilter.datasource={0}({1})",}) @@ -466,7 +470,7 @@ class FileSearchFiltering { @NbBundle.Messages({ "# {0} - filters", - "FileSearchFiltering.KeywordListFilter.desc=Files with keywords in list(s): {0}",}) + "FileSearchFiltering.KeywordListFilter.desc=Keywords in list(s): {0}",}) @Override String getDesc() { return Bundle.FileSearchFiltering_KeywordListFilter_desc(concatenateSetNamesForDisplay(listNames)); @@ -516,8 +520,8 @@ class FileSearchFiltering { @NbBundle.Messages({ "# {0} - filters", - "FileSearchFiltering.FileTypeFilter.desc=Files with type: {0}", - "FileSearchFiltering.FileTypeFilter.or= or ",}) + "FileSearchFiltering.FileTypeFilter.desc=Type: {0}", + "FileSearchFiltering.FileTypeFilter.or=, ",}) @Override String getDesc() { String desc = ""; @@ -586,8 +590,8 @@ class FileSearchFiltering { @NbBundle.Messages({ "# {0} - filters", - "FileSearchFiltering.FrequencyFilter.desc=Files with frequency: {0}", - "FileSearchFiltering.FrequencyFilter.or= or ",}) + "FileSearchFiltering.FrequencyFilter.desc=Past occurrences: {0}", + "FileSearchFiltering.FrequencyFilter.or=, ",}) @Override String getDesc() { String desc = ""; // NON-NLS @@ -595,7 +599,7 @@ class FileSearchFiltering { if (!desc.isEmpty()) { desc += Bundle.FileSearchFiltering_FrequencyFilter_or(); } - desc += freq.name(); + desc += freq.toString(); } return Bundle.FileSearchFiltering_FrequencyFilter_desc(desc); } @@ -632,7 +636,7 @@ class FileSearchFiltering { @NbBundle.Messages({ "# {0} - filters", - "FileSearchFiltering.HashSetFilter.desc=Files with hash set hits in set(s): {0}",}) + "FileSearchFiltering.HashSetFilter.desc=Hash set hits in set(s): {0}",}) @Override String getDesc() { return Bundle.FileSearchFiltering_HashSetFilter_desc(concatenateSetNamesForDisplay(setNames)); @@ -670,7 +674,7 @@ class FileSearchFiltering { @NbBundle.Messages({ "# {0} - filters", - "FileSearchFiltering.InterestingItemSetFilter.desc=Files with interesting item hits in set(s): {0}",}) + "FileSearchFiltering.InterestingItemSetFilter.desc=Interesting item hits in set(s): {0}",}) @Override String getDesc() { return Bundle.FileSearchFiltering_InterestingItemSetFilter_desc(concatenateSetNamesForDisplay(setNames)); @@ -708,7 +712,7 @@ class FileSearchFiltering { @NbBundle.Messages({ "# {0} - filters", - "FileSearchFiltering.ObjectDetectionFilter.desc=Files with objects detected in set(s): {0}",}) + "FileSearchFiltering.ObjectDetectionFilter.desc=Objects detected in set(s): {0}",}) @Override String getDesc() { return Bundle.FileSearchFiltering_ObjectDetectionFilter_desc(concatenateSetNamesForDisplay(typeNames)); @@ -784,7 +788,7 @@ class FileSearchFiltering { @NbBundle.Messages({ "# {0} - filters", - "FileSearchFiltering.ScoreFilter.desc=Files with score(s) of : {0}",}) + "FileSearchFiltering.ScoreFilter.desc=Score(s) of : {0}",}) @Override String getDesc() { return Bundle.FileSearchFiltering_ScoreFilter_desc( @@ -826,8 +830,8 @@ class FileSearchFiltering { @NbBundle.Messages({ "# {0} - tag names", - "FileSearchFiltering.TagsFilter.desc=Files that have been tagged {0}", - "FileSearchFiltering.TagsFilter.or= or ",}) + "FileSearchFiltering.TagsFilter.desc=Tagged {0}", + "FileSearchFiltering.TagsFilter.or=, ",}) @Override String getDesc() { String desc = ""; // NON-NLS @@ -862,7 +866,7 @@ class FileSearchFiltering { } @NbBundle.Messages({ - "FileSearchFiltering.UserCreatedFilter.desc=Files that contain EXIF data",}) + "FileSearchFiltering.UserCreatedFilter.desc=that contain EXIF data",}) @Override String getDesc() { return Bundle.FileSearchFiltering_UserCreatedFilter_desc(); @@ -931,7 +935,7 @@ class FileSearchFiltering { } @NbBundle.Messages({ - "FileSearchFiltering.PreviouslyNotableFilter.desc=Files that were previously marked as notable",}) + "FileSearchFiltering.PreviouslyNotableFilter.desc=that were previously marked as notable",}) @Override String getDesc() { return Bundle.FileSearchFiltering_PreviouslyNotableFilter_desc(); @@ -949,7 +953,7 @@ class FileSearchFiltering { } @NbBundle.Messages({ - "FileSearchFiltering.KnownFilter.desc=Files which are not known"}) + "FileSearchFiltering.KnownFilter.desc=which are not known"}) @Override String getDesc() { return Bundle.FileSearchFiltering_KnownFilter_desc(); diff --git a/Core/src/org/sleuthkit/autopsy/discovery/OpenDiscoveryAction.java b/Core/src/org/sleuthkit/autopsy/discovery/OpenDiscoveryAction.java index 9ef7d5dfe6..04530f8ad2 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/OpenDiscoveryAction.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/OpenDiscoveryAction.java @@ -21,6 +21,7 @@ package org.sleuthkit.autopsy.discovery; import java.awt.Component; import javax.swing.ImageIcon; import javax.swing.JButton; +import javax.swing.SwingUtilities; import org.openide.awt.ActionID; import org.openide.awt.ActionReference; import org.openide.awt.ActionReferences; @@ -61,14 +62,16 @@ public final class OpenDiscoveryAction extends CallableSystemAction implements P return Case.isCaseOpen(); } - @NbBundle.Messages({"OpenDiscoveryAction.resultsIncomplete.text=Results may be incomplete"}) + @NbBundle.Messages({"OpenDiscoveryAction.resultsIncomplete.text=Discovery results may be incomplete"}) @Override public void performAction() { - final DiscoveryDialog discDialog = DiscoveryDialog.getDiscoveryDialogInstance(); - discDialog.cancelSearch(); - discDialog.setVisible(true); - DiscoveryUiUtils.displayErrorMessage(discDialog); + SwingUtilities.invokeLater(() -> { + final DiscoveryDialog discDialog = DiscoveryDialog.getDiscoveryDialogInstance(); + discDialog.cancelSearch(); + DiscoveryUiUtils.displayErrorMessage(discDialog); + discDialog.setVisible(true); + }); } /** diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ParentFolderFilterPanel.form b/Core/src/org/sleuthkit/autopsy/discovery/ParentFolderFilterPanel.form index c35bc16cb4..b350ab42b3 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/ParentFolderFilterPanel.form +++ b/Core/src/org/sleuthkit/autopsy/discovery/ParentFolderFilterPanel.form @@ -37,6 +37,18 @@ + + + + + + + + + + + + @@ -143,6 +155,9 @@ + + + @@ -152,6 +167,9 @@ + + + @@ -161,6 +179,9 @@ + + + @@ -169,6 +190,9 @@ + + + diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ParentFolderFilterPanel.java b/Core/src/org/sleuthkit/autopsy/discovery/ParentFolderFilterPanel.java index 3ecb095868..7f10b38692 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/ParentFolderFilterPanel.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/ParentFolderFilterPanel.java @@ -66,6 +66,8 @@ final class ParentFolderFilterPanel extends AbstractDiscoveryFilterPanel { parentCheckbox = new javax.swing.JCheckBox(); parentLabel = new javax.swing.JLabel(); + javax.swing.ButtonGroup includeButtonGroup = new javax.swing.ButtonGroup(); + javax.swing.ButtonGroup pathTypeButtonGroup = new javax.swing.ButtonGroup(); parentScrollPane = new javax.swing.JScrollPane(); parentList = new javax.swing.JList<>(); fullRadioButton = new javax.swing.JRadioButton(); @@ -106,17 +108,21 @@ final class ParentFolderFilterPanel extends AbstractDiscoveryFilterPanel { }); parentScrollPane.setViewportView(parentList); + pathTypeButtonGroup.add(fullRadioButton); fullRadioButton.setSelected(true); org.openide.awt.Mnemonics.setLocalizedText(fullRadioButton, org.openide.util.NbBundle.getMessage(ParentFolderFilterPanel.class, "ParentFolderFilterPanel.fullRadioButton.text_1")); // NOI18N fullRadioButton.setEnabled(false); + includeButtonGroup.add(includeRadioButton); includeRadioButton.setSelected(true); org.openide.awt.Mnemonics.setLocalizedText(includeRadioButton, org.openide.util.NbBundle.getMessage(ParentFolderFilterPanel.class, "ParentFolderFilterPanel.includeRadioButton.text_1")); // NOI18N includeRadioButton.setEnabled(false); + pathTypeButtonGroup.add(substringRadioButton); org.openide.awt.Mnemonics.setLocalizedText(substringRadioButton, org.openide.util.NbBundle.getMessage(ParentFolderFilterPanel.class, "ParentFolderFilterPanel.substringRadioButton.text_1")); // NOI18N substringRadioButton.setEnabled(false); + includeButtonGroup.add(excludeRadioButton); org.openide.awt.Mnemonics.setLocalizedText(excludeRadioButton, org.openide.util.NbBundle.getMessage(ParentFolderFilterPanel.class, "ParentFolderFilterPanel.excludeRadioButton.text_1")); // NOI18N excludeRadioButton.setEnabled(false); @@ -188,7 +194,7 @@ final class ParentFolderFilterPanel extends AbstractDiscoveryFilterPanel { }// //GEN-END:initComponents private void parentCheckboxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_parentCheckboxActionPerformed -// parentFilterSettings(true, true, parentCheckbox.isSelected(), null); + configurePanel(parentCheckbox.isSelected(), null); }//GEN-LAST:event_parentCheckboxActionPerformed private void parentListValueChanged(javax.swing.event.ListSelectionEvent evt) {//GEN-FIRST:event_parentListValueChanged @@ -235,6 +241,7 @@ final class ParentFolderFilterPanel extends AbstractDiscoveryFilterPanel { parentCheckbox.setSelected(selected); if (parentCheckbox.isEnabled() && parentCheckbox.isSelected()) { parentScrollPane.setEnabled(true); + parentLabel.setEnabled(true); includeRadioButton.setEnabled(true); excludeRadioButton.setEnabled(true); fullRadioButton.setEnabled(true); @@ -248,6 +255,7 @@ final class ParentFolderFilterPanel extends AbstractDiscoveryFilterPanel { } } else { parentScrollPane.setEnabled(false); + parentLabel.setEnabled(false); parentList.setEnabled(false); includeRadioButton.setEnabled(false); excludeRadioButton.setEnabled(false); diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ResultsSplitPaneDivider.form b/Core/src/org/sleuthkit/autopsy/discovery/ResultsSplitPaneDivider.form new file mode 100644 index 0000000000..48ae94d8a9 --- /dev/null +++ b/Core/src/org/sleuthkit/autopsy/discovery/ResultsSplitPaneDivider.form @@ -0,0 +1,141 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/Core/src/org/sleuthkit/autopsy/discovery/ResultsSplitPaneDivider.java b/Core/src/org/sleuthkit/autopsy/discovery/ResultsSplitPaneDivider.java new file mode 100644 index 0000000000..0a89f28711 --- /dev/null +++ b/Core/src/org/sleuthkit/autopsy/discovery/ResultsSplitPaneDivider.java @@ -0,0 +1,121 @@ +/* + * Autopsy + * + * Copyright 2020 Basis Technology Corp. + * Contact: carrier sleuthkit org + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.sleuthkit.autopsy.discovery; + +import java.awt.Cursor; + +/** + * Panel for separating the results list from the details area. + */ +final class ResultsSplitPaneDivider extends javax.swing.JPanel { + + private static final long serialVersionUID = 1L; + + /** + * Creates new form LabeledSplitPaneDivider. + */ + ResultsSplitPaneDivider() { + initComponents(); + } + + /** + * This method is called from within the constructor to initialize the form. + * WARNING: Do NOT modify this code. The content of this method is always + * regenerated by the Form Editor. + */ + @SuppressWarnings("unchecked") + // //GEN-BEGIN:initComponents + private void initComponents() { + + javax.swing.JLabel detailsLabel = new javax.swing.JLabel(); + javax.swing.JButton hideButton = new javax.swing.JButton(); + javax.swing.JButton showButton = new javax.swing.JButton(); + javax.swing.Box.Filler filler1 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 32767)); + javax.swing.Box.Filler filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 32767)); + + setBackground(new java.awt.Color(170, 170, 170)); + + org.openide.awt.Mnemonics.setLocalizedText(detailsLabel, org.openide.util.NbBundle.getMessage(ResultsSplitPaneDivider.class, "ResultsSplitPaneDivider.detailsLabel.text")); // NOI18N + detailsLabel.setFocusable(false); + + hideButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/discovery/arrow-down.png"))); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(hideButton, org.openide.util.NbBundle.getMessage(ResultsSplitPaneDivider.class, "ResultsSplitPaneDivider.hideButton.text")); // NOI18N + hideButton.setBorder(null); + hideButton.setFocusable(false); + hideButton.setMargin(new java.awt.Insets(0, 0, 0, 0)); + hideButton.setCursor(Cursor.getDefaultCursor()); + hideButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + hideButtonActionPerformed(evt); + } + }); + + showButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/discovery/arrow-up.png"))); // NOI18N + org.openide.awt.Mnemonics.setLocalizedText(showButton, org.openide.util.NbBundle.getMessage(ResultsSplitPaneDivider.class, "ResultsSplitPaneDivider.showButton.text")); // NOI18N + showButton.setBorder(null); + showButton.setFocusable(false); + showButton.setMargin(new java.awt.Insets(0, 0, 0, 0)); + showButton.setCursor(Cursor.getDefaultCursor()); + showButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + showButtonActionPerformed(evt); + } + }); + + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); + this.setLayout(layout); + layout.setHorizontalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createSequentialGroup() + .addContainerGap() + .addComponent(detailsLabel) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 251, Short.MAX_VALUE) + .addComponent(showButton) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(hideButton) + .addContainerGap()) + .addComponent(filler2, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(filler1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + ); + layout.setVerticalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() + .addComponent(filler2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addGap(0, 0, 0) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(hideButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(showButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(detailsLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGap(0, 0, 0) + .addComponent(filler1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + ); + }// //GEN-END:initComponents + + private void showButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_showButtonActionPerformed + DiscoveryEventUtils.getDiscoveryEventBus().post(new DiscoveryEventUtils.DetailsVisibleEvent(true)); + }//GEN-LAST:event_showButtonActionPerformed + + private void hideButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_hideButtonActionPerformed + DiscoveryEventUtils.getDiscoveryEventBus().post(new DiscoveryEventUtils.DetailsVisibleEvent(false)); + }//GEN-LAST:event_hideButtonActionPerformed + + + // Variables declaration - do not modify//GEN-BEGIN:variables + // End of variables declaration//GEN-END:variables +} diff --git a/Core/src/org/sleuthkit/autopsy/discovery/VideoFilterPanel.form b/Core/src/org/sleuthkit/autopsy/discovery/VideoFilterPanel.form index 259a188967..1a853b425a 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/VideoFilterPanel.form +++ b/Core/src/org/sleuthkit/autopsy/discovery/VideoFilterPanel.form @@ -11,12 +11,17 @@ - +
+ + + + + @@ -32,7 +37,7 @@ - + @@ -45,7 +50,7 @@ - + @@ -54,7 +59,7 @@ - + diff --git a/Core/src/org/sleuthkit/autopsy/discovery/VideoFilterPanel.java b/Core/src/org/sleuthkit/autopsy/discovery/VideoFilterPanel.java index 48522a9474..4f2684339b 100644 --- a/Core/src/org/sleuthkit/autopsy/discovery/VideoFilterPanel.java +++ b/Core/src/org/sleuthkit/autopsy/discovery/VideoFilterPanel.java @@ -66,7 +66,9 @@ final class VideoFilterPanel extends AbstractFiltersPanel { setLayout(new java.awt.BorderLayout()); - videoFiltersPanel.setPreferredSize(new java.awt.Dimension(223, 66)); + videoFiltersScrollPane.setPreferredSize(new java.awt.Dimension(312, 102)); + + videoFiltersPanel.setPreferredSize(new java.awt.Dimension(310, 100)); videoFiltersSplitPane.setBorder(javax.swing.BorderFactory.createTitledBorder(org.openide.util.NbBundle.getMessage(VideoFilterPanel.class, "VideoFilterPanel.videoFiltersSplitPane.border.title"))); // NOI18N videoFiltersSplitPane.setResizeWeight(0.5); @@ -77,14 +79,14 @@ final class VideoFilterPanel extends AbstractFiltersPanel { videoFiltersPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(videoFiltersPanelLayout.createSequentialGroup() .addGap(8, 8, 8) - .addComponent(videoFiltersSplitPane) + .addComponent(videoFiltersSplitPane, javax.swing.GroupLayout.DEFAULT_SIZE, 294, Short.MAX_VALUE) .addGap(8, 8, 8)) ); videoFiltersPanelLayout.setVerticalGroup( videoFiltersPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(videoFiltersPanelLayout.createSequentialGroup() .addGap(8, 8, 8) - .addComponent(videoFiltersSplitPane) + .addComponent(videoFiltersSplitPane, javax.swing.GroupLayout.DEFAULT_SIZE, 84, Short.MAX_VALUE) .addGap(8, 8, 8)) ); diff --git a/Core/src/org/sleuthkit/autopsy/discovery/arrow-down.png b/Core/src/org/sleuthkit/autopsy/discovery/arrow-down.png new file mode 100644 index 0000000000..e934b25655 Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/discovery/arrow-down.png differ diff --git a/Core/src/org/sleuthkit/autopsy/discovery/arrow-up.png b/Core/src/org/sleuthkit/autopsy/discovery/arrow-up.png new file mode 100644 index 0000000000..de7b88bbe2 Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/discovery/arrow-up.png differ diff --git a/Core/src/org/sleuthkit/autopsy/geolocation/MapWaypoint.java b/Core/src/org/sleuthkit/autopsy/geolocation/MapWaypoint.java index 7007c7f025..21799e19fa 100755 --- a/Core/src/org/sleuthkit/autopsy/geolocation/MapWaypoint.java +++ b/Core/src/org/sleuthkit/autopsy/geolocation/MapWaypoint.java @@ -78,7 +78,7 @@ final class MapWaypoint extends KdTree.XYZPoint implements org.jxmapviewer.viewe artifactTypesToColors.put(BlackboardArtifact.ARTIFACT_TYPE.TSK_GPS_SEARCH.getTypeID(), Color.GREEN); artifactTypesToColors.put(BlackboardArtifact.ARTIFACT_TYPE.TSK_GPS_TRACK.getTypeID(), Color.ORANGE); artifactTypesToColors.put(BlackboardArtifact.ARTIFACT_TYPE.TSK_GPS_TRACKPOINT.getTypeID(), Color.ORANGE); - artifactTypesToColors.put(BlackboardArtifact.ARTIFACT_TYPE.TSK_METADATA_EXIF.getTypeID(), Color.CYAN); + artifactTypesToColors.put(BlackboardArtifact.ARTIFACT_TYPE.TSK_METADATA_EXIF.getTypeID(), Color.MAGENTA); } private final Waypoint dataModelWaypoint; diff --git a/Core/src/org/sleuthkit/autopsy/healthmonitor/HealthMonitor.java b/Core/src/org/sleuthkit/autopsy/healthmonitor/HealthMonitor.java index 251fe35572..4e100facb1 100644 --- a/Core/src/org/sleuthkit/autopsy/healthmonitor/HealthMonitor.java +++ b/Core/src/org/sleuthkit/autopsy/healthmonitor/HealthMonitor.java @@ -993,7 +993,7 @@ public final class HealthMonitor implements PropertyChangeListener { } String[] metricNames = {"Disk Reads: Hash calculation", "Database: getImages query", "Solr: Index chunk", "Solr: Connectivity check", - "Correlation Engine: Notable artifact query", "Correlation Engine: Bulk insert"}; // NON-NLS + "Central Repository: Notable artifact query", "Central Repository: Bulk insert"}; // NON-NLS Random rand = new Random(); diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobSettings.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobSettings.java index 28377be688..4b0228c5fe 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestJobSettings.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestJobSettings.java @@ -471,6 +471,9 @@ public final class IngestJobSettings { case "Archive Extractor": //NON-NLS moduleNames.add("Embedded File Extractor"); //NON-NLS break; + case "Correlation Engine": //NON-NLS + moduleNames.add("Central Repository"); //NON-NLS + break; default: moduleNames.add(name); } diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestOptionsPanel.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestOptionsPanel.java index cbfd996473..dd7fef4de8 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestOptionsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestOptionsPanel.java @@ -135,7 +135,7 @@ public class IngestOptionsPanel extends IngestModuleGlobalSettingsPanel implemen tabbedPane.setEnabled(!ingestIsRunning); settingsPanel.enableButtons(!ingestIsRunning); profilePanel.enableButtons(!ingestIsRunning); - filterPanel.enableButtons(!ingestIsRunning); + filterPanel.enableButtons(); } diff --git a/Core/src/org/sleuthkit/autopsy/modules/dataSourceIntegrity/DataSourceIntegrityIngestSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/dataSourceIntegrity/DataSourceIntegrityIngestSettingsPanel.java index 2c83297673..e48c76c603 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/dataSourceIntegrity/DataSourceIntegrityIngestSettingsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/modules/dataSourceIntegrity/DataSourceIntegrityIngestSettingsPanel.java @@ -22,7 +22,7 @@ import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel; /** - * Ingest job settings panel for the Correlation Engine module. + * Ingest job settings panel for the Central Repository module. */ @SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives final class DataSourceIntegrityIngestSettingsPanel extends IngestModuleIngestJobSettingsPanel { diff --git a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java index fca75c2c56..a6df94206e 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java +++ b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/SevenZipExtractor.java @@ -139,9 +139,10 @@ class SevenZipExtractor { } SevenZipExtractor(IngestJobContext context, FileTypeDetector fileTypeDetector, String moduleDirRelative, String moduleDirAbsolute) throws SevenZipNativeInitializationException { - if (!SevenZip.isInitializedSuccessfully() && (SevenZip.getLastInitializationException() == null)) { - SevenZip.initSevenZipFromPlatformJAR(); + if (!SevenZip.isInitializedSuccessfully()) { + throw new SevenZipNativeInitializationException("SevenZip has not been previously initialized."); } + this.context = context; this.fileTypeDetector = fileTypeDetector; this.moduleDirRelative = moduleDirRelative; diff --git a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties-MERGED index 3c275ee9cb..5d005fab85 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/Bundle.properties-MERGED @@ -6,6 +6,7 @@ FilesIdentifierIngestModule.indexError.message=Failed to index interesting file FilesSet.rule.dateRule.toString=(modified within {0} day(s)) FilesSetDefsPanel.bytes=Bytes FilesSetDefsPanel.cancelImportMsg=Cancel import +FilesSetDefsPanel.cancelNewSetMsg=Cancel # {0} - file name FilesSetDefsPanel.exportButtonActionPerformed.fileExistPrompt=File {0} exists, overwrite? FilesSetDefsPanel.gigaBytes=Gigabytes @@ -23,8 +24,12 @@ FilesSetDefsPanel.interesting.fileExtensionFilterLbl=Autopsy Interesting File Se FilesSetDefsPanel.interesting.importButtonAction.featureName=Interesting Files Set Import FilesSetDefsPanel.interesting.importOwConflict=Import Interesting files set conflict FilesSetDefsPanel.interesting.importSetButton.text=Import Set +FilesSetDefsPanel.interesting.newOwConflict=Interesting files set conflict # {0} - FilesSet name -FilesSetDefsPanel.interesting.overwriteSetPrompt=Interesting files set <{0}> already exists locally, overwrite? +FilesSetDefsPanel.interesting.overwriteSetPrompt=Interesting files set "{0}" already exists locally, overwrite? +# {0} - FilesSet name +# {1} - New FilesSet name +FilesSetDefsPanel.interesting.standardFileConflict=A standard interesting file set already exists with the name "{0}." Would you like to rename the set to "{1}?" FilesSetDefsPanel.Interesting.Title=Global Interesting Items Settings FilesSetDefsPanel.kiloBytes=Kilobytes FilesSetDefsPanel.loadError=Error loading interesting files sets from file. @@ -32,6 +37,7 @@ FilesSetDefsPanel.megaBytes=Megabytes FilesSetDefsPanel.noSkipMsg=No, skip FilesSetDefsPanel.saveError=Error saving interesting files sets to file. FilesSetDefsPanel.yesOwMsg=Yes, overwrite +FilesSetDefsPanel.yesStandardFileConflictCreate=Yes, create FilesSetPanel.filter.title=File Filter FilesSetPanel.ingest.createNewFilter=Create/edit file ingest filters... FilesSetPanel.ingest.messages.filtersMustBeNamed=File ingest filters must be named. @@ -140,3 +146,5 @@ FilesSetDefsPanel.ruleLabel.text=Rule Details FilesSetDefsPanel.pathLabel.text=Path Substring: FilesSetDefsPanel.mimeTypeLabel.text=MIME Type: FilesSetDefsPanel.fileSizeLabel.text=File Size: +# {0} - filesSetName +StandardInterestingFileSetsLoader.customSuffixed={0} (Custom) diff --git a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesSet.java b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesSet.java index 0e91869151..396480cd50 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesSet.java +++ b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesSet.java @@ -44,6 +44,10 @@ public final class FilesSet implements Serializable { private final String description; private final boolean ignoreKnownFiles; private final boolean ignoreUnallocatedSpace; + + private final boolean standardSet; + private final int versionNumber; + private final Map rules = new HashMap<>(); /** @@ -59,9 +63,39 @@ public final class FilesSet implements Serializable { * but a set with no rules is the empty set. */ public FilesSet(String name, String description, boolean ignoreKnownFiles, boolean ignoreUnallocatedSpace, Map rules) { + this(name, description, ignoreKnownFiles, ignoreUnallocatedSpace, rules, false, 0); + } + + /** + * Constructs an interesting files set. + * + * @param name The name of the set. + * @param description A description of the set, may be null. + * @param ignoreKnownFiles Whether or not to exclude known files from + * the set. + * @param ignoreUnallocatedSpace Whether or not to exclude unallocated space + * from the set. + * @param standardSet Whether or not the FilesSet is considered a + * standard interesting set file. + * @param versionNumber The versionNumber for the FilesSet so that + * older versions can be replaced with newer + * versions. + * @param rules The rules that define the set. May be null, + * but a set with no rules is the empty set. + */ + public FilesSet(String name, String description, boolean ignoreKnownFiles, boolean ignoreUnallocatedSpace, Map rules, + boolean standardSet, int versionNumber) { if ((name == null) || (name.isEmpty())) { throw new IllegalArgumentException("Interesting files set name cannot be null or empty"); } + + if (versionNumber < 0) { + throw new IllegalArgumentException("version number must be >= 0"); + } + + this.standardSet = standardSet; + this.versionNumber = versionNumber; + this.name = name; this.description = (description != null ? description : ""); this.ignoreKnownFiles = ignoreKnownFiles; @@ -71,6 +105,22 @@ public final class FilesSet implements Serializable { } } + /** + * @return Whether or not the FilesSet is considered a standard interesting + * set file. + */ + boolean isStandardSet() { + return standardSet; + } + + /** + * @return The versionNumber for the FilesSet so that older versions can be + * replaced with newer versions. + */ + int getVersionNumber() { + return versionNumber; + } + /** * Gets the name of this interesting files set. * @@ -624,7 +674,6 @@ public final class FilesSet implements Serializable { * To ensure compatibility with existing serialized configuration * settings, this class cannot have a 'serialVersionUID'. */ - private final TextMatcher textMatcher; /** @@ -648,10 +697,10 @@ public final class FilesSet implements Serializable { AbstractTextCondition(Pattern regex) { this.textMatcher = new FilesSet.Rule.RegexMatcher(regex); } - + /** * Construct a case-insensitive multi-value text condition. - * + * * @param values The list of values in which to look for a match. */ AbstractTextCondition(List values) { @@ -783,7 +832,6 @@ public final class FilesSet implements Serializable { * To ensure compatibility with existing serialized configuration * settings, this class cannot have a 'serialVersionUID'. */ - private final static long SECS_PER_DAY = 60 * 60 * 24; private int daysIncluded; @@ -834,8 +882,8 @@ public final class FilesSet implements Serializable { // AbstractFile.getFileNameExtension() returns just the // extension chars and not the dot. super(normalize(extension), false); - } - + } + /** * Construct a case-insensitive file name extension condition. * @@ -862,29 +910,29 @@ public final class FilesSet implements Serializable { public boolean passes(AbstractFile file) { return this.textMatches(file.getNameExtension()); } - + /** * Strip "." from the start of extensions in the provided list. - * + * * @param extensions The list of extensions to be processed. - * + * * @return A post-processed list of extensions. */ private static List normalize(List extensions) { List values = new ArrayList<>(extensions); - - for (int i=0; i < values.size(); i++) { + + for (int i = 0; i < values.size(); i++) { values.set(i, normalize(values.get(i))); } - + return values; } - + /** * Strip "." from the start of the provided extension. - * + * * @param extension The extension to be processed. - * + * * @return A post-processed extension. */ private static String normalize(String extension) { diff --git a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesSetDefsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesSetDefsPanel.java index 2163c68997..7e0b57a412 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesSetDefsPanel.java +++ b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/FilesSetDefsPanel.java @@ -30,6 +30,7 @@ import java.util.Map; import java.util.SortedSet; import java.util.TreeMap; import java.util.logging.Level; +import java.util.stream.Collectors; import javax.swing.DefaultListModel; import javax.swing.JButton; import javax.swing.JFileChooser; @@ -37,12 +38,15 @@ import javax.swing.JOptionPane; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import javax.swing.filechooser.FileNameExtensionFilter; +import org.apache.commons.lang3.tuple.Pair; import org.netbeans.spi.options.OptionsPanelController; import org.openide.util.NbBundle; +import org.openide.util.NbBundle.Messages; import org.openide.windows.WindowManager; import org.sleuthkit.autopsy.corecomponents.OptionsPanel; import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil; +import org.sleuthkit.autopsy.ingest.IngestManager; import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSettingsPanel; import org.sleuthkit.autopsy.ingest.IngestProfiles; import org.sleuthkit.autopsy.ingest.IngestProfiles.IngestProfile; @@ -100,6 +104,7 @@ public final class FilesSetDefsPanel extends IngestModuleGlobalSettingsPanel imp this.panelType = panelType; this.initComponents(); this.customInit(); + this.setsList.setModel(setsListModel); this.setsList.addListSelectionListener(new FilesSetDefsPanel.SetsListSelectionListener()); this.rulesList.setModel(rulesListModel); @@ -133,6 +138,13 @@ public final class FilesSetDefsPanel extends IngestModuleGlobalSettingsPanel imp this.ruleDialogTitle = "FilesSetPanel.interesting.title"; this.ingoreUnallocCheckbox.setVisible(false); } + + IngestManager.getInstance().addIngestJobEventListener((ignored) -> { + canBeEnabled + = !IngestManager.getInstance().isIngestRunning(); + enableButtons(); + }); + canBeEnabled = !IngestManager.getInstance().isIngestRunning(); } @NbBundle.Messages({"FilesSetDefsPanel.Interesting.Title=Global Interesting Items Settings", @@ -172,20 +184,23 @@ public final class FilesSetDefsPanel extends IngestModuleGlobalSettingsPanel imp } } - public void enableButtons(boolean isEnabled) { - boolean setSelected = (FilesSetDefsPanel.this.setsList.getSelectedValue() != null); + public void enableButtons() { + FilesSet selectedFilesSet = this.setsList.getSelectedValue(); + boolean setSelected = (selectedFilesSet != null); + boolean isStandardSet = (selectedFilesSet != null && selectedFilesSet.isStandardSet()); + boolean ruleSelected = (FilesSetDefsPanel.this.rulesList.getSelectedValue() != null); - canBeEnabled = isEnabled; - newRuleButton.setEnabled(isEnabled); - copySetButton.setEnabled(isEnabled && setSelected); - newSetButton.setEnabled(isEnabled); - editRuleButton.setEnabled(isEnabled && ruleSelected); - editSetButton.setEnabled(isEnabled && setSelected); + + newRuleButton.setEnabled(canBeEnabled && !isStandardSet); + copySetButton.setEnabled(canBeEnabled && setSelected); + newSetButton.setEnabled(canBeEnabled); + editRuleButton.setEnabled(canBeEnabled && ruleSelected && !isStandardSet); + editSetButton.setEnabled(canBeEnabled && setSelected && !isStandardSet); exportSetButton.setEnabled(setSelected); - importSetButton.setEnabled(isEnabled); - deleteRuleButton.setEnabled(isEnabled && ruleSelected); - deleteSetButton.setEnabled(isEnabled && setSelected); - ingestWarningLabel.setVisible(!isEnabled); + importSetButton.setEnabled(canBeEnabled); + deleteRuleButton.setEnabled(canBeEnabled && ruleSelected && !isStandardSet); + deleteSetButton.setEnabled(canBeEnabled && setSelected && !isStandardSet); + ingestWarningLabel.setVisible(!canBeEnabled); } @Override @@ -231,17 +246,11 @@ public final class FilesSetDefsPanel extends IngestModuleGlobalSettingsPanel imp * Clears the list models and resets all of the components. */ private void resetComponents() { - this.resetRuleComponents(); this.setsListModel.clear(); this.setDescriptionTextArea.setText(""); this.ignoreKnownFilesCheckbox.setSelected(true); this.ingoreUnallocCheckbox.setSelected(true); - this.newSetButton.setEnabled(true && canBeEnabled); - this.editSetButton.setEnabled(false); - this.copySetButton.setEnabled(false); - this.exportSetButton.setEnabled(false); - this.importSetButton.setEnabled(true && canBeEnabled); - this.deleteSetButton.setEnabled(false); + this.resetRuleComponents(); } /** @@ -260,9 +269,7 @@ public final class FilesSetDefsPanel extends IngestModuleGlobalSettingsPanel imp this.equalitySignComboBox.setSelectedIndex(2); this.fileSizeUnitComboBox.setSelectedIndex(1); this.fileSizeSpinner.setValue(0); - this.newRuleButton.setEnabled(!this.setsListModel.isEmpty() && canBeEnabled); - this.editRuleButton.setEnabled(false); - this.deleteRuleButton.setEnabled(false); + enableButtons(); } /** @@ -275,12 +282,10 @@ public final class FilesSetDefsPanel extends IngestModuleGlobalSettingsPanel imp if (e.getValueIsAdjusting()) { return; } + FilesSetDefsPanel.this.rulesListModel.clear(); FilesSetDefsPanel.this.resetRuleComponents(); - //enable the new button - FilesSetDefsPanel.this.newSetButton.setEnabled(canBeEnabled); - FilesSetDefsPanel.this.importSetButton.setEnabled(canBeEnabled); - + // Get the selected interesting files set and populate the set // components. FilesSet selectedSet = FilesSetDefsPanel.this.setsList.getSelectedValue(); @@ -291,11 +296,6 @@ public final class FilesSetDefsPanel extends IngestModuleGlobalSettingsPanel imp FilesSetDefsPanel.this.setDescriptionTextArea.setText(selectedSet.getDescription()); FilesSetDefsPanel.this.ignoreKnownFilesCheckbox.setSelected(selectedSet.ignoresKnownFiles()); FilesSetDefsPanel.this.ingoreUnallocCheckbox.setSelected(selectedSet.ingoresUnallocatedSpace()); - // Enable the copy, export, edit and delete set buttons. - FilesSetDefsPanel.this.editSetButton.setEnabled(canBeEnabled); - FilesSetDefsPanel.this.deleteSetButton.setEnabled(canBeEnabled); - FilesSetDefsPanel.this.copySetButton.setEnabled(canBeEnabled); - FilesSetDefsPanel.this.exportSetButton.setEnabled(true); // Populate the rule definitions list, sorted by name. List rules = new ArrayList<>(selectedSet.getRules().values()); Collections.sort(rules, new Comparator() { @@ -311,15 +311,8 @@ public final class FilesSetDefsPanel extends IngestModuleGlobalSettingsPanel imp if (!FilesSetDefsPanel.this.rulesListModel.isEmpty()) { FilesSetDefsPanel.this.rulesList.setSelectedIndex(0); } - } else { - // Disable the edit, delete, copy, and export buttons - FilesSetDefsPanel.this.editSetButton.setEnabled(false); - FilesSetDefsPanel.this.deleteSetButton.setEnabled(false); - FilesSetDefsPanel.this.copySetButton.setEnabled(false); - FilesSetDefsPanel.this.exportSetButton.setEnabled(false); } } - } /** @@ -389,18 +382,14 @@ public final class FilesSetDefsPanel extends IngestModuleGlobalSettingsPanel imp FilesSetDefsPanel.this.equalitySignComboBox.setSelectedIndex(2); FilesSetDefsPanel.this.fileSizeSpinner.setValue(0); } - if (dateCondition != null){ - FilesSetDefsPanel.this.daysIncludedTextField.setText(Integer.toString(dateCondition.getDaysIncluded())); + if (dateCondition != null) { + FilesSetDefsPanel.this.daysIncludedTextField.setText(Integer.toString(dateCondition.getDaysIncluded())); + } else { + FilesSetDefsPanel.this.daysIncludedTextField.setText(""); } - else { - FilesSetDefsPanel.this.daysIncludedTextField.setText(""); - } - // Enable the new, edit and delete rule buttons. - FilesSetDefsPanel.this.newRuleButton.setEnabled(true && canBeEnabled); - FilesSetDefsPanel.this.editRuleButton.setEnabled(true && canBeEnabled); - FilesSetDefsPanel.this.deleteRuleButton.setEnabled(true && canBeEnabled); + enableButtons(); } else { - FilesSetDefsPanel.this.resetRuleComponents(); + resetRuleComponents(); } } @@ -436,15 +425,6 @@ public final class FilesSetDefsPanel extends IngestModuleGlobalSettingsPanel imp option = JOptionPane.showConfirmDialog(this, panel, NbBundle.getMessage(FilesSetPanel.class, filterDialogTitle), JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE); } while (option == JOptionPane.OK_OPTION && !panel.isValidDefinition()); - // While adding new ruleset(selectedSet == null), if rule set with same name already exists, do not add to the filesSets hashMap. - // In case of editing an existing ruleset(selectedSet != null), following check is not performed. - if (this.filesSets.containsKey(panel.getFilesSetName()) && shouldCreateNew) { - MessageNotifyUtil.Message.error(NbBundle.getMessage(this.getClass(), - "FilesSetDefsPanel.doFileSetsDialog.duplicateRuleSet.text", - panel.getFilesSetName())); - return; - } - if (option == JOptionPane.OK_OPTION) { Map rules = new HashMap<>(); if (selectedSet != null) { @@ -453,10 +433,25 @@ public final class FilesSetDefsPanel extends IngestModuleGlobalSettingsPanel imp // Preserve the existing rules from the set being edited. rules.putAll(selectedSet.getRules()); } - if (shouldCreateNew) { - this.replaceFilesSet(null, panel.getFilesSetName(), panel.getFilesSetDescription(), panel.getFileSetIgnoresKnownFiles(), panel.getFileSetIgnoresUnallocatedSpace(), rules); - } else { - this.replaceFilesSet(selectedSet, panel.getFilesSetName(), panel.getFilesSetDescription(), panel.getFileSetIgnoresKnownFiles(), panel.getFileSetIgnoresUnallocatedSpace(), rules); + + FilesSet filesSet = new FilesSet( + panel.getFilesSetName(), + panel.getFilesSetDescription(), + panel.getFileSetIgnoresKnownFiles(), + panel.getFileSetIgnoresUnallocatedSpace(), + rules + ); + + Pair result = handleConflict(filesSet, false); + option = result.getRight(); + FilesSet toAddOrUpdate = result.getLeft(); + + if (result.getRight() == JOptionPane.OK_OPTION) { + if (shouldCreateNew) { + this.replaceFilesSet(null, toAddOrUpdate, null); + } else { + this.replaceFilesSet(selectedSet, toAddOrUpdate, null); + } } } } @@ -504,7 +499,7 @@ public final class FilesSetDefsPanel extends IngestModuleGlobalSettingsPanel imp // Add the new/edited files set definition, replacing any previous // definition with the same name and refreshing the display. - this.replaceFilesSet(selectedSet, selectedSet.getName(), selectedSet.getDescription(), selectedSet.ignoresKnownFiles(), selectedSet.ingoresUnallocatedSpace(), rules); + this.replaceFilesSet(selectedSet, selectedSet, rules); // Select the new/edited rule. Queue it up so it happens after the // selection listeners react to the selection of the "new" files @@ -520,27 +515,36 @@ public final class FilesSetDefsPanel extends IngestModuleGlobalSettingsPanel imp * owned by this panel. If there is a definition with the same name, it will * be replaced, so this is an add/edit operation. * - * @param oldSet A set to replace, null if the new set is - * not a replacement. - * @param name The name of the files set. - * @param description The description of the files set. - * @param ignoresKnownFiles Whether or not the files set ignores - * known files. - * @param rules The set membership rules for the set. - * @param processesUnallocatedSpace Whether or not this set of rules - * processes unallocated space + * @param oldSet A set to replace, null if the new set is not a + * replacement. + * @param newSet The new set of rules. + * @param rules The set membership rules for the set. If null, + * the rules in the new set will be used. */ - void replaceFilesSet(FilesSet oldSet, String name, String description, boolean ignoresKnownFiles, boolean ignoresUnallocatedSpace, Map rules) { + private void replaceFilesSet(FilesSet oldSet, FilesSet newSet, Map rules) { if (oldSet != null) { // Remove the set to be replaced from the working copy if the files // set definitions. this.filesSets.remove(oldSet.getName()); } + FilesSet setToAdd = newSet; + // Make the new/edited set definition and add it to the working copy of // the files set definitions. - FilesSet newSet = new FilesSet(name, description, ignoresKnownFiles, ignoresUnallocatedSpace, rules); - this.filesSets.put(newSet.getName(), newSet); + if (rules != null) { + setToAdd = new FilesSet( + newSet.getName(), + newSet.getDescription(), + newSet.ignoresKnownFiles(), + newSet.ingoresUnallocatedSpace(), + rules, + newSet.isStandardSet(), + newSet.getVersionNumber() + ); + } + + this.filesSets.put(setToAdd.getName(), setToAdd); // Redo the list model for the files set list component, which will make // everything stays sorted as in the working copy tree set. @@ -552,7 +556,7 @@ public final class FilesSetDefsPanel extends IngestModuleGlobalSettingsPanel imp // Select the new/edited files set definition in the set definitions // list. This will cause the selection listeners to repopulate the // subordinate components. - this.setsList.setSelectedValue(newSet, true); + this.setsList.setSelectedValue(setToAdd, true); } /** @@ -1058,7 +1062,7 @@ public final class FilesSetDefsPanel extends IngestModuleGlobalSettingsPanel imp Map rules = new HashMap<>(oldSet.getRules()); FilesSet.Rule selectedRule = this.rulesList.getSelectedValue(); rules.remove(selectedRule.getUuid()); - this.replaceFilesSet(oldSet, oldSet.getName(), oldSet.getDescription(), oldSet.ignoresKnownFiles(), oldSet.ingoresUnallocatedSpace(), rules); + this.replaceFilesSet(oldSet, oldSet, rules); if (!this.rulesListModel.isEmpty()) { this.rulesList.setSelectedIndex(0); } else { @@ -1111,13 +1115,8 @@ public final class FilesSetDefsPanel extends IngestModuleGlobalSettingsPanel imp this.doFileSetsDialog(this.setsList.getSelectedValue(), true); firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); }//GEN-LAST:event_copySetButtonActionPerformed + @NbBundle.Messages({ - "FilesSetDefsPanel.yesOwMsg=Yes, overwrite", - "FilesSetDefsPanel.noSkipMsg=No, skip", - "FilesSetDefsPanel.cancelImportMsg=Cancel import", - "# {0} - FilesSet name", - "FilesSetDefsPanel.interesting.overwriteSetPrompt=Interesting files set <{0}> already exists locally, overwrite?", - "FilesSetDefsPanel.interesting.importOwConflict=Import Interesting files set conflict", "FilesSetDefsPanel.interesting.failImportMsg=Interesting files set not imported", "FilesSetDefsPanel.interesting.fileExtensionFilterLbl=Autopsy Interesting File Set File (xml)", "FilesSetDefsPanel.interesting.importButtonAction.featureName=Interesting Files Set Import" @@ -1157,28 +1156,14 @@ public final class FilesSetDefsPanel extends IngestModuleGlobalSettingsPanel imp logger.log(Level.WARNING, "No Interesting files set definitions were read from the selected file, exception", ex); return; } - for (FilesSet set : importedSets) { - int choice = JOptionPane.OK_OPTION; - if (filesSets.containsKey(set.getName())) { - Object[] options = {NbBundle.getMessage(this.getClass(), "FilesSetDefsPanel.yesOwMsg"), - NbBundle.getMessage(this.getClass(), "FilesSetDefsPanel.noSkipMsg"), - NbBundle.getMessage(this.getClass(), "FilesSetDefsPanel.cancelImportMsg")}; - choice = JOptionPane.showOptionDialog(this, - NbBundle.getMessage(this.getClass(), "FilesSetDefsPanel.interesting.overwriteSetPrompt", set.getName()), - NbBundle.getMessage(this.getClass(), "FilesSetDefsPanel.interesting.importOwConflict"), - JOptionPane.YES_NO_CANCEL_OPTION, - JOptionPane.QUESTION_MESSAGE, - null, - options, - options[0]); - } - if (choice == JOptionPane.OK_OPTION) { - selectedSet = set; - this.filesSets.put(set.getName(), set); - } else if (choice == JOptionPane.CANCEL_OPTION) { - break; - } - } + + importedSets = importedSets + .stream() + .map((filesSet) -> StandardInterestingFilesSetsLoader.getAsStandardFilesSet(filesSet, false)) + .collect(Collectors.toList()); + + FilesSet newSelected = determineFilesToImport(importedSets); + // Redo the list model for the files set list component FilesSetDefsPanel.this.setsListModel.clear(); this.filesSets.values().forEach((set) -> { @@ -1187,12 +1172,234 @@ public final class FilesSetDefsPanel extends IngestModuleGlobalSettingsPanel imp // Select the new/edited files set definition in the set definitions // list. This will cause the selection listeners to repopulate the // subordinate components. - this.setsList.setSelectedValue(selectedSet, true); + this.setsList.setSelectedValue(newSelected == null ? selectedSet : newSelected, true); + firePropertyChange(OptionsPanelController.PROP_CHANGED, null, null); } }//GEN-LAST:event_importSetButtonActionPerformed + /** + * From the files sets that can be imported, this method rectifies any + * conflicts that may occur. + * + * @param importedSets The sets to be imported. + * + * @return The files set to be selected or null if no items imported. + */ + private FilesSet determineFilesToImport(Collection importedSets) { + FilesSet selectedSet = null; + + for (FilesSet set : importedSets) { + Pair conflictResult = handleConflict(set, true); + int choice = conflictResult.getRight(); + FilesSet resultingFilesSet = conflictResult.getLeft(); + + if (choice == JOptionPane.OK_OPTION) { + selectedSet = resultingFilesSet; + this.filesSets.put(resultingFilesSet.getName(), resultingFilesSet); + } else if (choice == JOptionPane.CANCEL_OPTION) { + break; + } + } + + return selectedSet; + } + + /** + * Handles any possible conflicts that may arise from importing a files set. + * + * @param set The set to potentially import. + * @param isImport The set with which to handle the conflict is being + * imported, otherwise this is a set to be added from the + * "New Set" button. + * + * @return A pair of the files set to be imported (or null if none) and the + * integer corresponding to the JOptionPane choice of the + * JOptionPane.YES_NO_CANCEL option. + */ + private Pair handleConflict(FilesSet set, boolean isImport) { + FilesSet conflict = this.filesSets.get(set.getName()); + // if no conflict, return the files set as is with the option to proceed + if (conflict == null) { + return Pair.of(set, JOptionPane.OK_OPTION); + } + + if (isImport) { + if (conflict.isStandardSet()) { + return onImportStandardSetConflict(set); + } else { + return onImportConflict(set); + } + } else { + if (conflict.isStandardSet()) { + return onNewEditSetStandardSetConflict(set); + } else { + return onNewEditSetConflict(set); + } + } + + } + + /** + * When a user imports a files set and the files set name collides with a + * pre-existing files set (not a standard files set), the user is prompted + * for how they would like that handled (overwrite, skip, or cancel whole + * operation) + * + * @param set The set to be imported. + * + * @return a pair of the files set and the JOptionPane.YES_NO_CANCEL option + */ + @Messages({ + "FilesSetDefsPanel.yesOwMsg=Yes, overwrite", + "FilesSetDefsPanel.noSkipMsg=No, skip", + "FilesSetDefsPanel.cancelImportMsg=Cancel import", + "# {0} - FilesSet name", + "FilesSetDefsPanel.interesting.overwriteSetPrompt=Interesting files set \"{0}\" already exists locally, overwrite?", + "FilesSetDefsPanel.interesting.importOwConflict=Import Interesting files set conflict",}) + private Pair onImportConflict(FilesSet set) { + // if there is a conflict, see if it is okay to overwrite. + Object[] options = { + Bundle.FilesSetDefsPanel_yesOwMsg(), + Bundle.FilesSetDefsPanel_noSkipMsg(), + Bundle.FilesSetDefsPanel_cancelImportMsg() + }; + int conflictChoice = JOptionPane.showOptionDialog(this, + Bundle.FilesSetDefsPanel_interesting_overwriteSetPrompt(set.getName()), + Bundle.FilesSetDefsPanel_interesting_importOwConflict(), + JOptionPane.YES_NO_CANCEL_OPTION, + JOptionPane.QUESTION_MESSAGE, + null, + options, + options[0]); + + if (conflictChoice == JOptionPane.OK_OPTION) { + // if so, just return the files set to be placed in the map overwriting what is currently present. + return Pair.of(set, conflictChoice); + } + + return Pair.of(null, conflictChoice); + } + + /** + * When a user imports a files set and the files set name collides with a + * pre-existing standard files set, the user is prompted for how they would + * like that handled (create files set with a " custom" suffix, skip, or + * cancel whole operation) + * + * @param set The set to be imported. + * + * @return a pair of the files set and the JOptionPane.YES_NO_CANCEL option + */ + @Messages({ + "FilesSetDefsPanel.yesStandardFileConflictCreate=Yes, create", + "# {0} - FilesSet name", + "# {1} - New FilesSet name", + "FilesSetDefsPanel.interesting.standardFileConflict=A standard interesting file set already exists with the name \"{0}.\" Would you like to rename your set to \"{1}?\"",}) + private Pair onImportStandardSetConflict(FilesSet set) { + // if there is a conflict and the conflicting files set is a standard files set, + // see if allowing a custom files set is okay. + Object[] options = { + Bundle.FilesSetDefsPanel_yesStandardFileConflictCreate(), + Bundle.FilesSetDefsPanel_noSkipMsg(), + Bundle.FilesSetDefsPanel_cancelImportMsg() + }; + + String setName = set.getName(); + String customSetName = Bundle.StandardInterestingFileSetsLoader_customSuffixed(set.getName()); + + int conflictChoice = JOptionPane.showOptionDialog(this, + Bundle.FilesSetDefsPanel_interesting_standardFileConflict(setName, customSetName), + Bundle.FilesSetDefsPanel_interesting_importOwConflict(), + JOptionPane.YES_NO_CANCEL_OPTION, + JOptionPane.QUESTION_MESSAGE, + null, + options, + options[0]); + + // if it is okay to create with custom prefix, try again to see if there is a conflict. + if (conflictChoice == JOptionPane.OK_OPTION) { + return handleConflict(StandardInterestingFilesSetsLoader.getAsCustomFileSet(set), true); + } + + return Pair.of(null, conflictChoice); + } + + /** + * When a user creates a files set or edits a files set and the files set + * name collides with a pre-existing files set (not a standard files set), + * the user is prompted for how they would like that handled (overwrite or + * cancel whole operation) + * + * @param set The set to be added. + * + * @return a pair of the files set and the JOptionPane.YES_NO_CANCEL option + */ + @Messages({ + "FilesSetDefsPanel.cancelNewSetMsg=Cancel", + "FilesSetDefsPanel.interesting.newOwConflict=Interesting files set conflict",}) + private Pair onNewEditSetConflict(FilesSet set) { + // if there is a conflict, see if it is okay to overwrite. + Object[] options = { + Bundle.FilesSetDefsPanel_yesOwMsg(), + Bundle.FilesSetDefsPanel_cancelNewSetMsg() + }; + int conflictChoice = JOptionPane.showOptionDialog(this, + Bundle.FilesSetDefsPanel_interesting_overwriteSetPrompt(set.getName()), + Bundle.FilesSetDefsPanel_interesting_newOwConflict(), + JOptionPane.OK_CANCEL_OPTION, + JOptionPane.QUESTION_MESSAGE, + null, + options, + options[0]); + + if (conflictChoice == JOptionPane.OK_OPTION) { + // if so, just return the files set to be placed in the map overwriting what is currently present. + return Pair.of(set, conflictChoice); + } + + return Pair.of(null, conflictChoice); + } + + /** + * When a user creates a files set and the files set name collides with a + * pre-existing standard files set, the user is prompted for how they would + * like that handled (create files set with a " custom" suffix or cancel + * whole operation) + * + * @param set The set to be adedd. + * + * @return a pair of the files set and the JOptionPane.YES_NO_CANCEL option + */ + private Pair onNewEditSetStandardSetConflict(FilesSet set) { + // if there is a conflict and the conflicting files set is a standard files set, + // see if allowing a custom files set is okay. + Object[] options = { + Bundle.FilesSetDefsPanel_yesStandardFileConflictCreate(), + Bundle.FilesSetDefsPanel_cancelNewSetMsg() + }; + + String setName = set.getName(); + String customSetName = Bundle.StandardInterestingFileSetsLoader_customSuffixed(set.getName()); + + int conflictChoice = JOptionPane.showOptionDialog(this, + Bundle.FilesSetDefsPanel_interesting_standardFileConflict(setName, customSetName), + Bundle.FilesSetDefsPanel_interesting_newOwConflict(), + JOptionPane.OK_CANCEL_OPTION, + JOptionPane.QUESTION_MESSAGE, + null, + options, + options[0]); + + // if it is okay to create with custom prefix, try again to see if there is a conflict. + if (conflictChoice == JOptionPane.OK_OPTION) { + return handleConflict(StandardInterestingFilesSetsLoader.getAsCustomFileSet(set), false); + } + + return Pair.of(null, conflictChoice); + } + @NbBundle.Messages({"FilesSetDefsPanel.interesting.exportButtonAction.featureName=Interesting Files Set Export", "# {0} - file name", "FilesSetDefsPanel.exportButtonActionPerformed.fileExistPrompt=File {0} exists, overwrite?", diff --git a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemsFilesSetSettings.java b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemsFilesSetSettings.java index f491fe14d6..6069aad3f6 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemsFilesSetSettings.java +++ b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/InterestingItemsFilesSetSettings.java @@ -26,6 +26,7 @@ import java.io.Serializable; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Arrays; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -35,6 +36,7 @@ import java.util.regex.PatternSyntaxException; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; +import org.apache.commons.lang.StringUtils; import org.openide.util.io.NbObjectInputStream; import org.openide.util.io.NbObjectOutputStream; import org.sleuthkit.autopsy.coreutils.Logger; @@ -46,9 +48,13 @@ import org.sleuthkit.autopsy.modules.interestingitems.FilesSet.Rule.MetaTypeCond import org.sleuthkit.autopsy.modules.interestingitems.FilesSet.Rule.MimeTypeCondition; import org.sleuthkit.autopsy.modules.interestingitems.FilesSet.Rule.ParentPathCondition; import org.sleuthkit.autopsy.modules.interestingitems.FilesSet.Rule.DateCondition; +import org.sleuthkit.autopsy.modules.interestingitems.FilesSetsManager.FilesSetsManagerException; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; +import java.util.Comparator; +import java.util.function.Function; +import java.util.stream.Collectors; class InterestingItemsFilesSetSettings implements Serializable { @@ -79,6 +85,8 @@ class InterestingItemsFilesSetSettings implements Serializable { private static final Logger logger = Logger.getLogger(InterestingItemsFilesSetSettings.class.getName()); private static final String TYPE_FILTER_ATTR = "typeFilter"; //NON-NLS private static final String EXTENSION_RULE_TAG = "EXTENSION"; //NON-NLS + private static final String STANDARD_SET = "standardSet"; + private static final String VERSION_NUMBER = "versionNumber"; private Map filesSets; @@ -378,6 +386,25 @@ class InterestingItemsFilesSetSettings implements Serializable { if (!ignoreUnallocated.isEmpty()) { ignoreUnallocatedSpace = Boolean.parseBoolean(ignoreUnallocated); } + + String isStandardSetString = setElem.getAttribute(STANDARD_SET); + boolean isStandardSet = false; + if (StringUtils.isNotBlank(isStandardSetString)) { + isStandardSet = Boolean.parseBoolean(isStandardSetString); + } + + String versionNumberString = setElem.getAttribute(VERSION_NUMBER); + int versionNumber = 0; + if (StringUtils.isNotBlank(versionNumberString)) { + try { + versionNumber = Integer.parseInt(versionNumberString); + } catch (NumberFormatException ex) { + logger.log(Level.WARNING, + String.format("Unable to parse version number for files set named: %s with provided input: '%s'", setName, versionNumberString), + ex); + } + } + // Read the set membership rules, if any. Map rules = new HashMap<>(); NodeList allRuleElems = setElem.getChildNodes(); @@ -401,7 +428,7 @@ class InterestingItemsFilesSetSettings implements Serializable { // Make the files set. Note that degenerate sets with no rules are // allowed to facilitate the separation of set definition and rule // definitions. A set without rules is simply the empty set. - FilesSet set = new FilesSet(setName, description, ignoreKnownFiles, ignoreUnallocatedSpace, rules); + FilesSet set = new FilesSet(setName, description, ignoreKnownFiles, ignoreUnallocatedSpace, rules, isStandardSet, versionNumber); filesSets.put(set.getName(), set); } // Note: This method takes a file path to support the possibility of @@ -446,31 +473,51 @@ class InterestingItemsFilesSetSettings implements Serializable { * org.sleuthkit.autopsy.modules.interestingitems.FilesSetsManager.FilesSetsManagerException */ static Map readDefinitionsXML(File xmlFile) throws FilesSetsManager.FilesSetsManagerException { - Map filesSets = new HashMap<>(); if (!xmlFile.exists()) { - return filesSets; + return new HashMap<>(); } // Check if the file can be read. if (!xmlFile.canRead()) { logger.log(Level.SEVERE, "FilesSet definition file at {0} exists, but cannot be read", xmlFile.getPath()); // NON-NLS - return filesSets; + return new HashMap<>(); } - // Parse the XML in the file. + Document doc = XMLUtil.loadDoc(InterestingItemsFilesSetSettings.class, xmlFile.getPath()); + return readDefinitionsXML(doc, xmlFile.getPath()); + } + + /** + * Reads an XML file and returns a map of fileSets. Allows for legacy XML + * support as well as importing of file sets to XMLs. + * + * + * @param doc The xml document. + * + * @return fileSets - a Map of the definition(s) found in + * the xml file for logging purposes (can provide null). + * + * @throws + * org.sleuthkit.autopsy.modules.interestingitems.FilesSetsManager.FilesSetsManagerException + */ + static Map readDefinitionsXML(Document doc, String resourceName) throws FilesSetsManager.FilesSetsManagerException { + // Parse the XML in the file. + Map filesSets = new HashMap<>(); + if (doc == null) { - logger.log(Level.SEVERE, "FilesSet definition file at {0}", xmlFile.getPath()); // NON-NLS + logger.log(Level.SEVERE, "FilesSet definition file at {0}", resourceName); // NON-NLS return filesSets; } // Get the root element. Element root = doc.getDocumentElement(); if (root == null) { - logger.log(Level.SEVERE, "Failed to get root {0} element tag of FilesSet definition file at {1}", new Object[]{FILE_SETS_ROOT_TAG, xmlFile.getPath()}); // NON-NLS + logger.log(Level.SEVERE, "Failed to get root {0} element tag of FilesSet definition file at {1}", + new Object[]{FILE_SETS_ROOT_TAG, resourceName}); // NON-NLS return filesSets; } // Read in the files set definitions. NodeList setElems = root.getElementsByTagName(FILE_SET_TAG); for (int i = 0; i < setElems.getLength(); ++i) { - readFilesSet((Element) setElems.item(i), filesSets, xmlFile.getPath()); + readFilesSet((Element) setElems.item(i), filesSets, resourceName); } return filesSets; } @@ -493,6 +540,34 @@ class InterestingItemsFilesSetSettings implements Serializable { } return true; } + + + /** + * Generates an alphabetically sorted list based on the provided collection and Function to retrieve a string field from each object. + * @param itemsToSort The items to be sorted into the newly generated list. + * @param getName The method to retrieve the given field from the object. + * @return The newly generated list sorted alphabetically by the given field. + */ + private static List sortOnField(Collection itemsToSort, final Function getName) { + Comparator comparator = (a,b) -> { + String aName = getName.apply(a); + String bName = getName.apply(b); + if (aName == null) { + aName = ""; + } + + if (bName == null) { + bName = ""; + } + + return aName.compareToIgnoreCase(bName); + }; + + return itemsToSort.stream() + .sorted(comparator) + .collect(Collectors.toList()); + } + /** * Write the FilesSets to a file as an xml. @@ -512,15 +587,27 @@ class InterestingItemsFilesSetSettings implements Serializable { Element rootElement = doc.createElement(FILE_SETS_ROOT_TAG); doc.appendChild(rootElement); // Add the interesting files sets to the document. - for (FilesSet set : interestingFilesSets) { + + List sortedFilesSets = sortOnField( + interestingFilesSets, + filesSet -> filesSet == null ? null : filesSet.getName()); + + for (FilesSet set : sortedFilesSets) { // Add the files set element and its attributes. Element setElement = doc.createElement(FILE_SET_TAG); setElement.setAttribute(NAME_ATTR, set.getName()); setElement.setAttribute(DESC_ATTR, set.getDescription()); setElement.setAttribute(IGNORE_KNOWN_FILES_ATTR, Boolean.toString(set.ignoresKnownFiles())); + setElement.setAttribute(STANDARD_SET, Boolean.toString(set.isStandardSet())); + setElement.setAttribute(VERSION_NUMBER, Integer.toString(set.getVersionNumber())); // Add the child elements for the set membership rules. // All conditions of a rule will be written as a single element in the xml - for (FilesSet.Rule rule : set.getRules().values()) { + + List sortedRules = sortOnField( + set.getRules().values(), + rule -> rule == null ? null : rule.getName()); + + for (FilesSet.Rule rule : sortedRules) { // Add a rule element with the appropriate name Condition // type tag. Element ruleElement; @@ -577,13 +664,13 @@ class InterestingItemsFilesSetSettings implements Serializable { ruleElement.setAttribute(FS_SIZE_ATTR, Integer.toString(sizeCondition.getSizeValue())); ruleElement.setAttribute(FS_UNITS_ATTR, sizeCondition.getUnit().getName()); } - - //Add the optional date condition + + //Add the optional date condition DateCondition dateCondition = rule.getDateCondition(); if (dateCondition != null) { ruleElement.setAttribute(DAYS_INCLUDED_ATTR, Integer.toString(dateCondition.getDaysIncluded())); } - + setElement.appendChild(ruleElement); } rootElement.appendChild(setElement); diff --git a/Core/src/org/sleuthkit/autopsy/modules/interestingitems/StandardInterestingFilesSetsLoader.java b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/StandardInterestingFilesSetsLoader.java new file mode 100644 index 0000000000..e20628e4e4 --- /dev/null +++ b/Core/src/org/sleuthkit/autopsy/modules/interestingitems/StandardInterestingFilesSetsLoader.java @@ -0,0 +1,232 @@ +/* + * Autopsy Forensic Browser + * + * Copyright 2020 Basis Technology Corp. + * Contact: carrier sleuthkit org + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.sleuthkit.autopsy.modules.interestingitems; + +import java.io.File; +import java.io.FilenameFilter; +import java.util.HashMap; +import java.util.Map; +import java.util.function.Function; +import java.util.logging.Level; +import java.util.stream.Collectors; +import org.openide.modules.InstalledFileLocator; +import org.openide.modules.OnStart; +import org.openide.util.NbBundle.Messages; +import org.sleuthkit.autopsy.coreutils.Logger; + +/** + * When the interesting items module loads, this runnable loads standard + * interesting file set rules. + */ +@OnStart +public class StandardInterestingFilesSetsLoader implements Runnable { + + private static final Logger LOGGER = Logger.getLogger(StandardInterestingFilesSetsLoader.class.getName()); + + private static final String CONFIG_DIR = "InterestingFileSetRules"; + + private static final FilenameFilter DEFAULT_XML_FILTER = new FilenameFilter() { + @Override + public boolean accept(File dir, String name) { + return name.endsWith(".xml"); + } + }; + + @Override + public void run() { + Map standardInterestingFileSets = readStandardFileXML(); + + // Call FilesSetManager.getInterestingFilesSets() to get a Map of the existing rule sets. + Map userConfiguredSettings = null; + try { + userConfiguredSettings = FilesSetsManager.getInstance().getInterestingFilesSets(); + } catch (FilesSetsManager.FilesSetsManagerException ex) { + LOGGER.log(Level.SEVERE, "Unable to properly read user-configured interesting files sets.", ex); + } + + if (userConfiguredSettings == null) { + userConfiguredSettings = new HashMap<>(); + } + + // Add each FilesSet read from the standard rules set XML files that is missing from the Map to the Map. + copyOnNewer(standardInterestingFileSets, userConfiguredSettings, true); + + try { + // Call FilesSetManager.setInterestingFilesSets with the updated Map. + FilesSetsManager.getInstance().setInterestingFilesSets(userConfiguredSettings); + } catch (FilesSetsManager.FilesSetsManagerException ex) { + LOGGER.log(Level.SEVERE, "Unable to write updated configuration for interesting files sets to config directory.", ex); + } + } + + /** + * Reads xml definitions for each file found in the standard interesting + * file set config directory and marks the files set as a standard + * interesting file if it isn't already. + * + * @return The mapping of files set keys to the file sets. + */ + private static Map readStandardFileXML() { + Map standardInterestingFileSets = new HashMap<>(); + + File[] standardFileSets = InstalledFileLocator.getDefault() + .locate(CONFIG_DIR, StandardInterestingFilesSetsLoader.class.getPackage().getName(), false) + .listFiles(DEFAULT_XML_FILTER); + + for (File standardFileSetsFile : standardFileSets) { //NON-NLS + try { + Map thisFilesSet = InterestingItemsFilesSetSettings.readDefinitionsXML(standardFileSetsFile); + + // ensure that read resources are standard sets + thisFilesSet = thisFilesSet.values() + .stream() + .map((filesSet) -> getAsStandardFilesSet(filesSet, true)) + .collect(Collectors.toMap(FilesSet::getName, Function.identity())); + + copyOnNewer(thisFilesSet, standardInterestingFileSets); + } catch (FilesSetsManager.FilesSetsManagerException ex) { + LOGGER.log(Level.WARNING, String.format("There was a problem importing the standard interesting file set at: %s.", + standardFileSetsFile.getAbsoluteFile()), ex); + } + } + return standardInterestingFileSets; + } + + /** + * gets a copy of the Files Set forcing the standard file set flag to what + * is provided as a parameter. + * + * @param origFilesSet The fileset to get a copy of. + * @param standardFilesSet Whether or not the copy should be a standard + * files set. + * + * @return The copy. + */ + static FilesSet getAsStandardFilesSet(FilesSet origFilesSet, boolean standardFilesSet) { + return new FilesSet( + origFilesSet.getName(), + origFilesSet.getDescription(), + origFilesSet.ignoresKnownFiles(), + origFilesSet.ingoresUnallocatedSpace(), + origFilesSet.getRules(), + standardFilesSet, + origFilesSet.getVersionNumber() + ); + } + + /** + * Copies the entries in the src map to the destination map if the src item + * has a newer version than what is in dest or no equivalent entry exists + * within the dest map. + * + * @param src The source map. + * @param dest The destination map. + */ + private static void copyOnNewer(Map src, Map dest) { + copyOnNewer(src, dest, false); + } + + /** + * Copies the entries in the src map to the destination map if the src item + * has a newer version than what is in dest or no equivalent entry exists + * within the dest map. + * + * @param src The source map. + * @param dest The destination map. + * @param appendCustom On conflict, if one of the items is readonly and one + * is not, this flag can be set so the item that is not + * readonly will have " (custom)" appended. + */ + private static void copyOnNewer(Map src, Map dest, boolean appendCustom) { + for (Map.Entry srcEntry : src.entrySet()) { + String key = srcEntry.getKey(); + FilesSet srcFileSet = srcEntry.getValue(); + FilesSet destFileSet = dest.get(key); + if (destFileSet != null) { + // If and only if there is a naming conflict with a user-defined rule set, append (Custom) + // to the user-defined rule set and add it back to the Map. + if (appendCustom && srcFileSet.isStandardSet() != destFileSet.isStandardSet()) { + if (srcFileSet.isStandardSet()) { + addCustomFile(dest, destFileSet); + dest.put(key, srcFileSet); + } else { + addCustomFile(dest, srcFileSet); + } + continue; + } + + // Replace each FilesSet read from the standard rules set XML files that has a newer version + // number than the corresponding FilesSet in the Map with the updated FilesSet. + if (destFileSet.getVersionNumber() >= srcEntry.getValue().getVersionNumber()) { + continue; + } + } + + dest.put(srcEntry.getKey(), srcEntry.getValue()); + } + } + + /** + * Adds an entry to the destination map where the name will be the same as + * the key with " (custom)" appended. + * + * @param dest The destination map. + * @param srcFilesSet The FilesSet to append as custom. A non-readonly + * filesset must be provided. + */ + private static void addCustomFile(Map dest, FilesSet srcFilesSet) { + if (srcFilesSet.isStandardSet()) { + LOGGER.log(Level.SEVERE, "An attempt to create a custom file that was a standard set."); + return; + } + + FilesSet srcToAdd = srcFilesSet; + + do { + srcToAdd = getAsCustomFileSet(srcToAdd); + } while (dest.containsKey(srcToAdd.getName())); + + dest.put(srcToAdd.getName(), srcToAdd); + } + + /** + * Gets a copy of the FilesSet as a non-standard files set with " (custom)" + * appended. + * + * @param srcFilesSet The files set. + * + * @return The altered copy. + */ + @Messages({ + "# {0} - filesSetName", + "StandardInterestingFileSetsLoader.customSuffixed={0} (Custom)" + }) + static FilesSet getAsCustomFileSet(FilesSet srcFilesSet) { + String customKey = Bundle.StandardInterestingFileSetsLoader_customSuffixed(srcFilesSet.getName()); + return new FilesSet( + customKey, + srcFilesSet.getDescription(), + srcFilesSet.ignoresKnownFiles(), + srcFilesSet.ingoresUnallocatedSpace(), + srcFilesSet.getRules(), + false, + srcFilesSet.getVersionNumber() + ); + } +} diff --git a/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/PhotoRecCarverFileIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/PhotoRecCarverFileIngestModule.java index 392e9587c9..4b2f8eddfa 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/PhotoRecCarverFileIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/PhotoRecCarverFileIngestModule.java @@ -81,6 +81,7 @@ final class PhotoRecCarverFileIngestModule implements FileIngestModule { static final boolean DEFAULT_CONFIG_KEEP_CORRUPTED_FILES = false; private static final String PHOTOREC_DIRECTORY = "photorec_exec"; //NON-NLS + private static final String PHOTOREC_SUBDIRECTORY = "bin"; //NON-NLS private static final String PHOTOREC_EXECUTABLE = "photorec_win.exe"; //NON-NLS private static final String PHOTOREC_LINUX_EXECUTABLE = "photorec"; private static final String PHOTOREC_RESULTS_BASE = "results"; //NON-NLS @@ -454,6 +455,7 @@ final class PhotoRecCarverFileIngestModule implements FileIngestModule { return path; } + /** * Finds and returns the path to the executable, if able. * @@ -468,7 +470,7 @@ final class PhotoRecCarverFileIngestModule implements FileIngestModule { Path execName; String photorec_linux_directory = "/usr/bin"; if (PlatformUtil.isWindowsOS()) { - execName = Paths.get(PHOTOREC_DIRECTORY, PHOTOREC_EXECUTABLE); + execName = Paths.get(PHOTOREC_DIRECTORY, PHOTOREC_SUBDIRECTORY, PHOTOREC_EXECUTABLE); exeFile = InstalledFileLocator.getDefault().locate(execName.toString(), PhotoRecCarverFileIngestModule.class.getPackage().getName(), false); } else { File usrBin = new File("/usr/bin/photorec"); diff --git a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.java b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.java index b9d9fc8b34..79680178e1 100644 --- a/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.java +++ b/Core/src/org/sleuthkit/autopsy/report/infrastructure/ReportVisualPanel1.java @@ -151,6 +151,7 @@ final class ReportVisualPanel1 extends JPanel implements ListSelectionListener { } modulesJList.getSelectionModel().addListSelectionListener(this); + modulesJList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); modulesJList.setCellRenderer(new ModuleCellRenderer()); modulesJList.setListData(modules.toArray(new ReportModule[modules.size()])); modulesJList.setSelectedIndex(selectedIndex); diff --git a/Core/src/org/sleuthkit/autopsy/tags/TagUtils.java b/Core/src/org/sleuthkit/autopsy/tags/TagUtils.java index 3b63168a07..de93bed26e 100755 --- a/Core/src/org/sleuthkit/autopsy/tags/TagUtils.java +++ b/Core/src/org/sleuthkit/autopsy/tags/TagUtils.java @@ -19,6 +19,9 @@ package org.sleuthkit.autopsy.tags; import java.util.logging.Level; +import org.sleuthkit.autopsy.casemodule.Case; +import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException; +import org.sleuthkit.autopsy.casemodule.services.TagsManager; import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.datamodel.TagName; import org.sleuthkit.datamodel.TagSet; @@ -52,12 +55,13 @@ public final class TagUtils { public static String getDecoratedTagDisplayName(TagName tagName) { String displayName = tagName.getDisplayName(); try { - TagSet tagSet = tagName.getTagSet(); + TagsManager tagsManager = Case.getCurrentCaseThrows().getServices().getTagsManager(); + TagSet tagSet = tagsManager.getTagSet(tagName); if (tagSet != null) { displayName = tagSet.getName() + ": " + displayName; } - } catch (TskCoreException ex) { - logger.log(Level.WARNING, String.format("Failed to get TagSet for TagName (%d)", tagName.getId())); + } catch (NoCurrentCaseException | TskCoreException ex) { + logger.log(Level.SEVERE, String.format("Failed to get TagSet for TagName '%s' (ID=%d)", tagName.getDisplayName(), tagName.getId())); } if (tagName.getKnownStatus() == TskData.FileKnown.BAD) { diff --git a/Core/src/org/sleuthkit/autopsy/textextractors/TextFileExtractor.java b/Core/src/org/sleuthkit/autopsy/textextractors/TextFileExtractor.java index 9c71b14ecc..678d62b487 100644 --- a/Core/src/org/sleuthkit/autopsy/textextractors/TextFileExtractor.java +++ b/Core/src/org/sleuthkit/autopsy/textextractors/TextFileExtractor.java @@ -62,7 +62,7 @@ public final class TextFileExtractor implements TextExtractor { encoding = StandardCharsets.UTF_8; } } catch (TskCoreException | IOException ex) { - logger.log(Level.SEVERE, String.format("Error detecting the " + logger.log(Level.WARNING, String.format("Error detecting the " + "encoding for %s (objID=%d)", file.getName(), file.getId()), ex); encoding = StandardCharsets.UTF_8; } diff --git a/Experimental/nbproject/project.xml b/Experimental/nbproject/project.xml index 166c73f0a5..6e1fe0eaef 100644 --- a/Experimental/nbproject/project.xml +++ b/Experimental/nbproject/project.xml @@ -135,7 +135,7 @@ 10 - 10.19 + 10.20 diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutopsyManifestFileParser.java b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutopsyManifestFileParser.java index 889dffd071..93e6e5956c 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutopsyManifestFileParser.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutopsyManifestFileParser.java @@ -1,7 +1,7 @@ /* * Autopsy Forensic Browser * - * Copyright 2015 Basis Technology Corp. + * Copyright 2015-2020 Basis Technology Corp. * Contact: carrier sleuthkit org * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -71,16 +71,26 @@ public final class AutopsyManifestFileParser implements ManifestFileParser { Date dateFileCreated = new Date(attrs.creationTime().toMillis()); Document doc = this.createManifestDOM(filePath); XPath xpath = XPathFactory.newInstance().newXPath(); + XPathExpression expr = xpath.compile(CASE_NAME_XPATH); String caseName = (String) expr.evaluate(doc, XPathConstants.STRING); + if (caseName.isEmpty()) { + throw new ManifestFileParserException("Case name not found, manifest is invalid"); + } + expr = xpath.compile(DEVICE_ID_XPATH); String deviceId = (String) expr.evaluate(doc, XPathConstants.STRING); if (deviceId.isEmpty()) { deviceId = UUID.randomUUID().toString(); } + expr = xpath.compile(DATA_SOURCE_NAME_XPATH); String dataSourceName = (String) expr.evaluate(doc, XPathConstants.STRING); + if (dataSourceName.isEmpty()) { + throw new ManifestFileParserException("Data source path not found, manifest is invalid"); + } Path dataSourcePath = filePath.getParent().resolve(dataSourceName); + return new Manifest(filePath, dateFileCreated, caseName, deviceId, dataSourcePath, new HashMap<>()); } catch (Exception ex) { throw new ManifestFileParserException(String.format("Error parsing manifest %s", filePath), ex); diff --git a/ImageGallery/nbproject/project.xml b/ImageGallery/nbproject/project.xml index 4ef4c1fde1..501d7a9ea3 100644 --- a/ImageGallery/nbproject/project.xml +++ b/ImageGallery/nbproject/project.xml @@ -127,7 +127,7 @@ 10 - 10.19 + 10.20 diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml index 10e1e76bfe..bd5072a4be 100644 --- a/KeywordSearch/nbproject/project.xml +++ b/KeywordSearch/nbproject/project.xml @@ -119,7 +119,7 @@ 10 - 10.19 + 10.20 diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java index a403b32e7b..d26290d112 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java @@ -506,12 +506,13 @@ public final class KeywordSearchIngestModule implements FileIngestModule { * * @param aFile file to extract strings from, divide into chunks and * index + * @param extractedMetadata Map that will be populated with the file's metadata. * * @return true if the file was text_ingested, false otherwise * * @throws IngesterException exception thrown if indexing failed */ - private boolean extractTextAndIndex(AbstractFile aFile) throws IngesterException { + private boolean extractTextAndIndex(AbstractFile aFile, Map extractedMetadata) throws IngesterException { ImageConfig imageConfig = new ImageConfig(); imageConfig.setOCREnabled(KeywordSearchSettings.getOcrOption()); ProcessTerminator terminator = () -> context.fileIngestIsCancelled(); @@ -525,7 +526,10 @@ public final class KeywordSearchIngestModule implements FileIngestModule { try { Map metadata = extractor.getMetadata(); if (!metadata.isEmpty()) { - createMetadataArtifact(aFile, metadata); + // Creating the metadata artifact here causes occasional problems + // when indexing the text, so we save the metadata map to + // use after this method is complete. + extractedMetadata.putAll(metadata); } CharSource formattedMetadata = getMetaDataCharSource(metadata); //Append the metadata to end of the file text @@ -731,6 +735,7 @@ public final class KeywordSearchIngestModule implements FileIngestModule { } boolean wasTextAdded = false; + Map extractedMetadata = new HashMap<>(); //extract text with one of the extractors, divide into chunks and index with Solr try { @@ -742,7 +747,7 @@ public final class KeywordSearchIngestModule implements FileIngestModule { extractStringsAndIndex(aFile); return; } - if (!extractTextAndIndex(aFile)) { + if (!extractTextAndIndex(aFile, extractedMetadata)) { // Text extractor not found for file. Extract string only. putIngestStatus(jobId, aFile.getId(), IngestStatus.SKIPPED_ERROR_TEXTEXTRACT); } else { @@ -770,6 +775,13 @@ public final class KeywordSearchIngestModule implements FileIngestModule { if (wasTextAdded == false) { extractStringsAndIndex(aFile); } + + // Now that the indexing is complete, create the metadata artifact (if applicable). + // It is unclear why calling this from extractTextAndIndex() generates + // errors. + if (!extractedMetadata.isEmpty()) { + createMetadataArtifact(aFile, extractedMetadata); + } } /** diff --git a/RecentActivity/nbproject/project.xml b/RecentActivity/nbproject/project.xml index f6465f00a5..3073bf314b 100644 --- a/RecentActivity/nbproject/project.xml +++ b/RecentActivity/nbproject/project.xml @@ -60,7 +60,7 @@ 10 - 10.19 + 10.20 diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED index 5fcd412743..5ea28d7eec 100755 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED @@ -206,6 +206,7 @@ Recently_Used_Artifacts_Mmc=Recently opened according to Windows Management Cons Recently_Used_Artifacts_Office_Trustrecords=Stored in TrustRecords because Office security exception was granted Recently_Used_Artifacts_Officedocs=Recently opened according to Office MRU Recently_Used_Artifacts_Winrar=Recently opened according to WinRAR MRU +Registry_System_Bam=Recently Executed according to Background Activity Moderator (BAM) RegRipperFullNotFound=Full version RegRipper executable not found. RegRipperNotFound=Autopsy RegRipper executable not found. # {0} - file name diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java index 80171f0672..fd3584d843 100644 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java @@ -79,6 +79,7 @@ import org.sleuthkit.datamodel.AbstractFile; import org.sleuthkit.datamodel.Account; import org.sleuthkit.datamodel.BlackboardArtifact; import static org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE.TSK_ASSOCIATED_OBJECT; +import static org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE.TSK_OS_ACCOUNT; import org.sleuthkit.datamodel.BlackboardAttribute; import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT; import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_COMMENT; @@ -86,6 +87,8 @@ import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DAT import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME_CREATED; import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DATETIME_MODIFIED; import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PATH; +import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_USER_ID; +import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_USER_NAME; import org.sleuthkit.datamodel.Content; import org.sleuthkit.datamodel.ReadContentInputStream.ReadContentInputStreamException; import org.sleuthkit.datamodel.Report; @@ -112,7 +115,8 @@ import org.sleuthkit.datamodel.TskDataException; "Recently_Used_Artifacts_Winrar=Recently opened according to WinRAR MRU", "Recently_Used_Artifacts_Officedocs=Recently opened according to Office MRU", "Recently_Used_Artifacts_Adobe=Recently opened according to Adobe MRU", - "Recently_Used_Artifacts_Mediaplayer=Recently opened according to Media Player MRU" + "Recently_Used_Artifacts_Mediaplayer=Recently opened according to Media Player MRU", + "Registry_System_Bam=Recently Executed according to Background Activity Moderator (BAM)" }) class ExtractRegistry extends Extract { @@ -160,6 +164,7 @@ class ExtractRegistry extends Extract { private final Path rrFullHome; // Path to the full version of RegRipper private Content dataSource; private IngestJobContext context; + private Map userNameMap; private static final String SHELLBAG_ARTIFACT_NAME = "RA_SHELL_BAG"; //NON-NLS private static final String SHELLBAG_ATTRIBUTE_LAST_WRITE = "RA_SHELL_BAG_LAST_WRITE"; //NON-NLS @@ -229,6 +234,17 @@ class ExtractRegistry extends Extract { List allRegistryFiles = new ArrayList<>(); org.sleuthkit.autopsy.casemodule.services.FileManager fileManager = currentCase.getServices().getFileManager(); + // find the sam hives', process this first so we can map the user id's and sids for later use + try { + allRegistryFiles.addAll(fileManager.findFiles(dataSource, "sam", "/system32/config")); //NON-NLS + } catch (TskCoreException ex) { + String msg = NbBundle.getMessage(this.getClass(), + "ExtractRegistry.findRegFiles.errMsg.errReadingFile", "sam"); + logger.log(Level.WARNING, msg, ex); + this.addErrorMessage(this.getName() + ": " + msg); + } + + // find the user-specific ntuser-dat files try { allRegistryFiles.addAll(fileManager.findFiles(dataSource, "ntuser.dat")); //NON-NLS @@ -244,7 +260,7 @@ class ExtractRegistry extends Extract { } // find the system hives' - String[] regFileNames = new String[]{"system", "software", "security", "sam"}; //NON-NLS + String[] regFileNames = new String[]{"system", "software", "security"}; //NON-NLS for (String regFileName : regFileNames) { try { allRegistryFiles.addAll(fileManager.findFiles(dataSource, regFileName, "/system32/config")); //NON-NLS @@ -337,6 +353,12 @@ class ExtractRegistry extends Extract { } catch (IOException | TskCoreException ex) { logger.log(Level.WARNING, String.format("Unable to get shell bags from file %s", regOutputFiles.fullPlugins), ex); } + } else if (regFileNameLocal.toLowerCase().contains("system")) { + try { + createSystemArtifacts(regOutputFiles.fullPlugins, regFile); + } catch (IOException ex) { + logger.log(Level.WARNING, String.format("Unable to get artifacts from file %s", regOutputFiles.fullPlugins), ex); + } } try { Report report = currentCase.addReport(regOutputFiles.fullPlugins, @@ -990,6 +1012,16 @@ class ExtractRegistry extends Extract { // index the artifact for keyword search newArtifacts.add(bbart); } + // Get a mapping of user sids to user names and save globally so it can be used for other areas + // of the registry, ie: BAM key + try { + userNameMap = makeUserNameMap(dataSource); + } catch (TskCoreException ex) { + logger.log(Level.WARNING, "Unable to create OS Account user name map", ex); + // This is not the end of the world we will just continue without + // user names + userNameMap = new HashMap<>(); + } return true; } catch (FileNotFoundException ex) { logger.log(Level.WARNING, "Error finding the registry file.", ex); //NON-NLS @@ -1248,6 +1280,91 @@ class ExtractRegistry extends Extract { } } + /** + * Create artifacts from the System registry Hive + * + * @param regFileName name of the regripper output file + * + * @param regFile registry file the artifact is associated with + * + * @throws FileNotFound and IOException + */ + private void createSystemArtifacts(String regFileName, AbstractFile regFile) throws FileNotFoundException, IOException { + File regfile = new File(regFileName); + try (BufferedReader reader = new BufferedReader(new FileReader(regfile))) { + String line = reader.readLine(); + while (line != null) { + line = line.trim(); + + if (line.matches("^bam v.*")) { + parseBamKey(regFile, reader, Bundle.Registry_System_Bam()); + } + line = reader.readLine(); + } + } + } + + /** + * Create artifacts from BAM Regripper Plugin records + * + * @param regFile registry file the artifact is associated with + * + * @param reader buffered reader to parse adobemru records + * + * @param comment string that will populate attribute TSK_COMMENT + * + * @throws FileNotFound and IOException + */ + private void parseBamKey(AbstractFile regFile, BufferedReader reader, String comment) throws FileNotFoundException, IOException { + List bbartifacts = new ArrayList<>(); + String line = reader.readLine(); + // Read thru first bam output to get to second bam output which is the same but delimited + while (!line.contains(SECTION_DIVIDER)) { + line = reader.readLine(); + line = line.trim(); + } + line = reader.readLine(); + line = line.trim(); + while (!line.contains(SECTION_DIVIDER)) { + // Split the line into it parts based on delimiter of "|" + // 1570493613|BAM|||\Device\HarddiskVolume3\Program Files\TechSmith\Snagit 2018\Snagit32.exe (S-1-5-21-3042408413-2583535980-1301764466-1001) + String tokens[] = line.split("\\|"); + Long progRunDateTime = Long.valueOf(tokens[0]); + // Split on " (S-" as this signifies a User SID, if S- not used then may have issues becuase of (x86) in path is valid. + // We can add the S- back to the string that we split on since S- is a valid beginning of a User SID + String fileNameSid[] = tokens[4].split("\\s+\\(S-"); + String userSid = "S-" + fileNameSid[1].substring(0, fileNameSid[1].length() - 1); + String userName = userNameMap.get(userSid); + if (userName == null) { + userName = userSid; + } + String fileName = fileNameSid[0]; + if (fileName.startsWith("\\Device\\HarddiskVolume")) { + // Start at point past the 2nd slash + int fileNameStart = fileName.indexOf('\\', 16); + fileName = fileName.substring(fileNameStart, fileName.length()); + + } + Collection attributes = new ArrayList<>(); + attributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME, getName(), fileName)); + attributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_USER_NAME, getName(), userName)); + attributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME, getName(), progRunDateTime)); + attributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_COMMENT, getName(), comment)); + BlackboardArtifact bba = createArtifactWithAttributes(ARTIFACT_TYPE.TSK_PROG_RUN, regFile, attributes); + if (bba != null) { + bbartifacts.add(bba); + bba = createAssociatedArtifact(FilenameUtils.normalize(fileName, true), bba); + if (bba != null) { + bbartifacts.add(bba); + } + } + line = reader.readLine(); + } + if (!bbartifacts.isEmpty()) { + postArtifacts(bbartifacts); + } + } + /** * Create recently used artifacts from adobemru Regripper Plugin records * @@ -1388,7 +1505,8 @@ class ExtractRegistry extends Extract { line = reader.readLine(); // Columns are // FileX -> - while (!line.contains(SECTION_DIVIDER) && !line.isEmpty() && !line.contains("Applets")) { + while (!line.contains(SECTION_DIVIDER) && !line.isEmpty() && !line.contains("Applets") + && !line.contains(("Recent File List"))) { // Split line on "> " which is the record delimiter between position and file String tokens[] = line.split("> "); String fileName = tokens[1]; @@ -1650,6 +1768,49 @@ class ExtractRegistry extends Extract { return null; } + /** + * Create a map of userids to usernames from the OS Accounts. + * + * @param dataSource + * + * @return A Map of userIDs and userNames + * + * @throws TskCoreException + */ + private Map makeUserNameMap(Content dataSource) throws TskCoreException { + Map userNameMap = new HashMap<>(); + + List accounts = blackboard.getArtifacts(TSK_OS_ACCOUNT.getTypeID(), dataSource.getId()); + + for (BlackboardArtifact account : accounts) { + BlackboardAttribute nameAttribute = getAttributeForArtifact(account, TSK_USER_NAME); + BlackboardAttribute idAttribute = getAttributeForArtifact(account, TSK_USER_ID); + + String userName = nameAttribute != null ? nameAttribute.getDisplayString() : ""; + String userID = idAttribute != null ? idAttribute.getDisplayString() : ""; + + if (!userID.isEmpty()) { + userNameMap.put(userID, userName); + } + } + + return userNameMap; + } + + /** + * Gets the attribute for the given type from the given artifact. + * + * @param artifact BlackboardArtifact to get the attribute from + * @param type The BlackboardAttribute Type to get + * + * @return BlackboardAttribute for given artifact and type + * + * @throws TskCoreException + */ + private BlackboardAttribute getAttributeForArtifact(BlackboardArtifact artifact, BlackboardAttribute.ATTRIBUTE_TYPE type) throws TskCoreException { + return artifact.getAttribute(new BlackboardAttribute.Type(BlackboardAttribute.ATTRIBUTE_TYPE.fromID(type.getTypeID()))); + } + /** * Create the shellbag artifacts from the list of ShellBag objects. * diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/USB_DATA.txt b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/USB_DATA.txt index c8a83c862b..0b850290d5 100644 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/USB_DATA.txt +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/USB_DATA.txt @@ -9,8 +9,8 @@ # The latest version can be obtained from # http://www.linux-usb.org/usb.ids # -# Version: 2014.02.03 -# Date: 2014-02-03 20:34:03 +# Version: 2020.06.22 +# Date: 2020-06-22 20:34:08 # # Vendors, devices and interfaces. Please keep sorted. @@ -21,20 +21,34 @@ # interface interface_name <-- two tabs 0001 Fry's Electronics - 142b Arbiter Systems, Inc. 7778 Counterfeit flash drive [Kingston] 0002 Ingram + 0002 passport00 0003 Club Mac 0004 Nebraska Furniture Mart -0011 Unknown manufacturer - 7788 Flash mass storage drive +0011 Unknown + 7788 counterfeit flash drive 0053 Planex 5301 GW-US54ZGL 802.11bg +0078 Microntek + 0006 Joystick 0079 DragonRise Inc. 0006 PC TWIN SHOCK Gamepad 0011 Gamepad + 1800 Mayflash Wii U Pro Game Controller Adapter [DirectInput] + 181b Venom Arcade Joystick + 1843 Mayflash GameCube Controller Adapter + 1844 Mayflash GameCube Controller +0080 Unknown + a001 JMS578 based SATA bridge +0085 Boeye Technology Co., Ltd. + 0600 eBook Reader +0102 miniSTREAK 0105 Trust International B.V. 145f NW-3100 802.11b/g 54Mbps Wireless Network Adapter [zd1211] +0127 IBP + 0002 HDM Interface + 0127 ibp 0145 Unknown 0112 Card Reader 017c MLK @@ -48,7 +62,7 @@ 0301 MIDI Port 02ad HUMAX Co., Ltd. 138c PVR Mass Storage -0300 MM300 eBook Reader +0303 Mini Automation Controller 0324 OCZ Technology Inc bc06 OCZ ATV USB 2.0 Flash Drive bc08 OCZ Rally2/ATV USB 2.0 Flash Drive @@ -60,6 +74,10 @@ 0499 SE340D PC Remote Control 03da Bernd Walter Computer Technology 0002 HD44780 LCD interface +03e7 Intel + 2150 Myriad VPU [Movidius Neural Compute Stick] + 2485 Movidius MyriadX + f63b Myriad VPU [Movidius Neural Compute Stick] 03e8 EndPoints, Inc. 0004 SE401 Webcam 0008 101 Ethernet [klsi] @@ -108,12 +126,29 @@ 2106 STK600 development board 2107 AVR Dragon 2109 STK541 ZigBee Development Board + 210a AT86RF230 [RZUSBSTICK] transceiver 210d XPLAIN evaluation kit (CDC ACM) 2110 AVR JTAGICE3 Debugger and Programmer + 2111 Xplained Pro board debugger and programmer 2122 XMEGA-A1 Explained evaluation kit + 2140 AVR JTAGICE3 (v3.x) Debugger and Programmer + 2141 ICE debugger + 2145 ATMEGA328P-XMINI (CDC ACM) 2310 EVK11xx evaluation board + 2404 The Micro 2fe4 ATxmega32A4U DFU bootloader + 2fe6 Cactus V6 (DFU) + 2fea Cactus RF60 (DFU) + 2fee atmega8u2 DFU bootloader + 2fef atmega16u2 DFU bootloader 2ff0 atmega32u2 DFU bootloader + 2ff1 at32uc3a3 DFU bootloader + 2ff3 atmega16u4 DFU bootloader + 2ff4 atmega32u4 DFU bootloader + 2ff6 at32uc3b0/1 DFU bootloader + 2ff7 at90usb82 DFU bootloader + 2ff8 at32uc3a0/1 DFU bootloader + 2ff9 at90usb646/647 DFU bootloader 2ffa at90usb162 DFU bootloader 2ffb at90usb AVR DFU bootloader 2ffd at89c5130/c5131 DFU bootloader @@ -138,6 +173,9 @@ 7615 AT76C505AMX Wireless Adapter 7617 AT76C505AS Wireless Adapter 7800 Mini Album + 800c Airspy HF+ + ff01 WootingOne + ff02 WootingTwo ff07 Tux Droid fish dongle 03ec Iwatsu America, Inc. 03ed Mitel Corp. @@ -153,12 +191,13 @@ 6902 Floppy Disk Drive 7500 CD-R/RW ffff Dongle with BlueCore in DFU mode -03f0 Hewlett-Packard +03f0 HP, Inc 0004 DeskJet 895c 0011 OfficeJet G55 0012 DeskJet 1125C Printer Port 0024 KU-0316 Keyboard 002a LaserJet P1102 + 0053 DeskJet 2620 All-in-One Printer 0101 ScanJet 4100c 0102 PhotoSmart S20 0104 DeskJet 880c/970c @@ -169,8 +208,10 @@ 0117 LaserJet 3200 011c hn210w 802.11b Adapter 011d Bluetooth 1.2 Interface [Broadcom BCM2035] - 0121 HP49g+ Calculator + 0121 HP 39g+ [F2224A], 39gs [F2223A], 40gs [F2225A], 48gII [F2226A], 49g+ [F2228A], 50g [F2229A, NW240AA] 0122 HID Internet Keyboard + 0125 DAT72 Tape + 0139 Barcode Scanner 4430 0201 ScanJet 6200c 0202 PhotoSmart S20 0204 DeskJet 815c @@ -181,6 +222,10 @@ 0212 DeskJet 1220C 0217 LaserJet 2200 0218 APOLLO P2500/2600 + 0221 StreamSmart 400 [F2235AA] + 0223 Digital Drive Flash Reader + 022a Laserjet CP1525nw + 0241 Link-5 micro dongle 0304 DeskJet 810c/812c 0305 ScanJet 4300c 0307 CD-Writer+ CD-4e @@ -189,6 +234,7 @@ 0314 designjet 30/130 series 0317 LaserJet 1200 0324 SK-2885 keyboard + 034a Elite Keyboard 0401 ScanJet 5200c 0404 DeskJet 830c/832c 0405 ScanJet 3400cse @@ -197,7 +243,7 @@ 0417 LaserJet 1200 series 0423 HS-COMBO Cardreader 042a LaserJet M1132 MFP - 0441 HP Prime Calculator + 0441 Prime [NW280AA, G8X92AA] 0504 DeskJet 885c 0505 ScanJet 2100c 0507 DVD+RW @@ -206,18 +252,23 @@ 0512 DeckJet 450 0517 LaserJet 1000 051d Bluetooth Interface + 052a LaserJet M1212nf MFP 0601 ScanJet 6300c 0604 DeskJet 840c 0605 ScanJet 2200c + 0610 Z24i Monitor Hub 0611 OfficeJet K60xi 0612 business inkjet 3000 0624 Bluetooth Dongle + 0641 X1200 Optical Mouse 0701 ScanJet 5300c/5370c 0704 DeskJet 825c 0705 ScanJet 4400c + 070c Personal Media Drive 0711 OfficeJet K80 0712 DeskJet 1180c 0714 Printing Support + 0741 Prime Wireless Kit [FOK65AA] 0801 ScanJet 7400c 0804 DeskJet 816c 0805 HP4470C @@ -228,6 +279,7 @@ 0912 Printing Support 0917 LaserJet 3330 0924 Modular Smartcard Keyboard + 0941 X500 Optical Mouse 094a Optical Mouse [672662-001] 0a01 ScanJet 2400c 0a17 color LaserJet 3700 @@ -238,11 +290,13 @@ 0c24 Bluetooth Dongle 0d12 OfficeJet 9100 series 0d17 LaserJet 1012 + 0d4a SK-2025 Keyboard 0e17 LaserJet 1015 0f0c Wireless Keyboard and Optical Mouse receiver 0f11 OfficeJet V40 0f12 Printing Support 0f17 LaserJet 1150 + 0f2a LaserJet 400 color M451dn 1001 Photo Scanner 1000 1002 PhotoSmart 140 series 1004 DeskJet 970c/970cse @@ -252,6 +306,7 @@ 1017 LaserJet 1300 1024 Smart Card Keyboard 1027 Virtual keyboard and mouse + 102a LaserJet Professional P 1102w 1102 PhotoSmart 240 series 1104 DeskJet 959c 1105 ScanJet 5470c/5490c @@ -259,17 +314,20 @@ 1116 Jornada 568 Pocket PC 1117 LaserJet 1300n 1151 PSC-750xi Printer/Scanner/Copier + 1198 HID-compliant mouse 1202 PhotoSmart 320 series 1204 DeskJet 930c 1205 ScanJet 4500C/5550C 1211 OfficeJet v60xi 1217 LaserJet 2300L + 1227 Virtual CD-ROM 1302 PhotoSmart 370 series 1305 ScanJet 4570c 1311 OfficeJet V30 1312 DeskJet 460 1317 LaserJet 1005 1327 iLO Virtual Hub + 134a Optical Mouse 1405 ScanJet 3670 1411 PSC 750 1424 f2105 Monitor Hub @@ -280,6 +338,9 @@ 1512 Printing Support 1517 color LaserJet 3500 1524 Smart Card Keyboard - KR + 1539 Mini Magnetic Stripe Reader + 1541 Prime [G8X92AA] + 154a Laser Mouse 1602 PhotoSmart 330 series 1604 DeskJet 940c 1605 ScanJet 5530C PhotoSmart @@ -317,6 +378,7 @@ 1c17 Color LaserJet 2550l 1d02 PhotoSmart A310 series 1d17 LaserJet 1320 + 1d24 Barcode scanner 1e02 PhotoSmart A320 Printer series 1e11 PSC-950 1e17 LaserJet 1160 series @@ -331,6 +393,7 @@ 2005 ScanJet 3570c 2012 OfficeJet Pro K5400 201d un2400 Gobi Wireless Modem (QDL mode) + 2039 Cashdrawer 2102 PhotoSmart 7345 2104 DeskJet 630c 2112 OfficeJet Pro L7500 @@ -339,6 +402,7 @@ 2205 ScanJet 3500c 2212 OfficeJet Pro L7600 2217 color LaserJet 9500 MFP + 222a LaserJet Pro MFP M125nw 2302 PhotoSmart 7600 series 2304 DeskJet 656c 2305 ScanJet 3970c @@ -352,10 +416,11 @@ 2417 LaserJet 4250 241d Gobi 2000 Wireless Modem (QDL mode) 2424 LP1965 19" Monitor Hub + 2441 Prime G2 [2AP18AA] 2502 PhotoSmart 7700 series 2504 DeskJet F4200 series 2505 ScanJet 3770 - 2512 OfficeJet Pro L7300 + 2512 OfficeJet Pro L7300 / Compaq LA2405 series monitor 2514 4-port hub 2517 LaserJet 2410 251d Gobi 2000 Wireless Modem @@ -368,6 +433,8 @@ 2702 PhotoSmart A620 series 2704 DeskJet 915 2717 Color LaserJet 2830 + 2724 Magnetic Stripe Reader IDRA-334133-HP + 2805 Scanjet G2710 2811 PSC-2100 2817 Color LaserJet 2840 2902 PhotoSmart A820 series @@ -375,8 +442,10 @@ 2917 LaserJet 2420 2a11 PSC 2150 series 2a17 LaserJet 2430 + 2a1d Integrated Module with Bluetooth 2.1 Wireless technology 2b11 PSC 2170 series 2b17 LaserJet 1020 + 2b4a Business Slim Keyboard 2c12 Officejet J4680 2c17 LaserJet 1022 2c24 Logitech M-UAL-96 Mouse @@ -387,13 +456,14 @@ 2e17 LaserJet 2600n 2e24 LP2275w Monitor Hub 2f11 PSC 1200 - 2f17 EWS 2605dn + 2f17 Color LaserJet 2605dn 2f24 LP2475w Monitor Hub 3002 PhotoSmart P1000 3004 DeskJet 980c 3005 ScanJet 4670v 3011 PSC 1100 series 3017 Printing Support + 304a Slim Keyboard 3102 PhotoSmart P1100 Printer w/ Card Reader 3104 DeskJet 960c 3111 OfficeJet 4100 series @@ -405,6 +475,7 @@ 3217 LaserJet 3050 3302 PhotoSmart 1218 3304 DeskJet 990c + 3307 v125w Stick 3312 OfficeJet J6410 3317 LaserJet 3052 3402 PhotoSmart 1115 @@ -414,8 +485,10 @@ 3504 DeskJet 6127c 3511 PSC 2300 3517 LaserJet 3390 + 354a Slim Keyboard 3602 PhotoSmart 1315 3611 PSC 2410 PhotoSmart + 3612 Officejet Pro 8000 A809 3617 Color LaserJet 2605 3711 PSC 2500 3717 EWS UPD @@ -424,13 +497,17 @@ 3807 c485w Flash Drive 3817 LaserJet P2015 series 3902 PhotoSmart 130 + 3912 Officejet Pro 8500 + 3917 LaserJet P2014 3a02 PhotoSmart 7150 3a11 OfficeJet 5500 series 3a17 Printing Support + 3a1d hs2340 HSPA+ mobile broadband 3b02 PhotoSmart 7150~ 3b05 Scanjet N8460 3b11 PSC 1300 series 3b17 LaserJet M1005 MFP + 3b2a Color LaserJet MFP M277dw 3c02 PhotoSmart 7350 3c05 Scanjet Professional 1000 Mobile Scanner 3c11 PSC 1358 @@ -442,8 +519,9 @@ 3e17 LaserJet P1006 3f02 PhotoSmart 7550~ 3f11 PSC-1315/PSC-1317 - 4002 PhotoSmart 635/715/720/735/935 (storage) - 4004 cp1160 + 3f17 Laserjet P1505 + 4002 PhotoSmart 635/715/720/735/935/E337 (storage) + 4004 CP1160 4102 PhotoSmart 618 4105 ScanJet 4370 4111 OfficeJet 7200 series @@ -485,6 +563,7 @@ 5307 v165w Stick 5311 OfficeJet 6300 5312 Officejet Pro 8500A + 5317 Color LaserJet CP2025 series 5411 OfficeJet 4300 5511 DeskJet F300 series 5611 PhotoSmart C3180 @@ -493,9 +572,12 @@ 5717 LaserJet M1120n MFP 5811 PhotoSmart C5100 series 5817 LaserJet M1319f MFP + 581d lt4112 Gobi 4G Module Network Device 5911 PhotoSmart C6180 + 5912 Officejet Pro 8600 5a11 PhotoSmart C7100 series 5b11 OfficeJet J2100 series + 5b12 Officejet Pro 8100 5c11 PhotoSmart C4200 Printer series 5c12 OfficeJet 6700 5c17 LaserJet P2055 series @@ -530,6 +612,7 @@ 6a17 LaserJet 4240 6b02 PhotoSmart R707 (PTP mode) 6b11 Photosmart C4500 series + 6c11 Photosmart C4480 6c17 Color LaserJet 4610 6f17 Color LaserJet CP6015 series 7004 DeskJet 3320c @@ -558,6 +641,7 @@ 7917 LaserJet M5025 MFP 7a02 PhotoSmart M415 (PTP mode) 7a04 DeskJet D2460 + 7a11 Photosmart B109 7a17 LaserJet M3027 MFP 7b02 PhotoSmart M23 (PTP mode) 7b17 Color LaserJet CP4005 @@ -582,13 +666,17 @@ 8711 Deskjet 2050 J510 8804 DeskJet 6980 series 8904 DeskJet 6940 series + 8911 Deskjet 1050 J410 8c07 Digital Stereo Headset 8c11 Deskjet F4500 series 9002 PhotoSmart M437 9102 PhotoSmart M537 + 9207 HD-4110 Webcam 9302 PhotoSmart R930 series 9402 PhotoSmart R837 + 942a LaserJet Pro M12a 9502 PhotoSmart R840 series + 952a LaserJet Pro M12w 9602 PhotoSmart M730 series 9702 PhotoSmart R740 series 9802 PhotoSmart Mz60 series @@ -599,6 +687,7 @@ 9c02 PhotoSmart M440 series a004 DeskJet 5850c a011 Deskjet 3050A + a407 Wireless Optical Comfort Mouse b002 PhotoSmart 7200 series b102 PhotoSmart 7200 series b107 v255w/c310w Flash Drive @@ -618,7 +707,9 @@ bef4 NEC Picty760 c002 PhotoSmart 7800 series c102 PhotoSmart 8000 series + c111 Deskjet 1510 c202 PhotoSmart 8200 series + c211 Deskjet 2540 series c302 DeskJet D2300 c402 PhotoSmart D5100 series c502 PhotoSmart D6100 series @@ -626,6 +717,7 @@ c702 PhotoSmart D7300 series c802 PhotoSmart D5060 Printer d104 Bluetooth Dongle + d507 39gII [NW249AA] efbe NEC Picty900 f0be NEC Picty920 f1be NEC Picty800 @@ -657,6 +749,8 @@ 03fb OPTi, Inc. 03fc Elitegroup Computer Systems 03fd Xilinx, Inc. + 0008 Platform Cable USB II + 0050 dfu downloader 03fe Farallon Comunications 0400 National Semiconductor Corp. 05dc Rigol Technologies DS1000USB Oscilloscope @@ -683,30 +777,38 @@ 5635 M5635 Flash Card Reader 5636 USB 2.0 Storage Device 5637 M5637 IDE Controller + 5642 Storage Device 5661 M5661 MP3 player 5667 M5667 MP3 player 9665 Gateway Webcam 0403 Future Technology Devices International, Ltd - 0000 H4SMK 7 Port Hub + 0000 H4SMK 7 Port Hub / Bricked Counterfeit FT232 Serial (UART) IC 0232 Serial Converter 1060 JTAG adapter - 6001 FT232 USB-Serial (UART) IC + 1234 IronLogic RFID Adapter [Z-2 USB] + 1235 Iron Logic Z-397 RS-485/422 converter + 6001 FT232 Serial (UART) IC 6002 Lumel PD12 6007 Serial Converter 6008 Serial Converter 6009 Serial Converter - 6010 FT2232C Dual USB-UART/FIFO IC + 6010 FT2232C/D/H Dual UART/FIFO IC 6011 FT4232H Quad HS USB-UART/FIFO IC 6014 FT232H Single HS USB-UART/FIFO IC 6015 Bridge(I2C/SPI/UART/FIFO) + 601f Myriad-RF LimeSDR-Mini + 6f70 HB-RF-USB 8028 Dev board JTAG (FT232H based) 8040 4 Port Hub 8070 7 Port Hub 8140 Vehicle Explorer Interface 8210 MGTimer - MGCC (Vic) Timing System + 8348 FT232BM [SIENNA Serial Interface] 8370 7 Port Hub 8371 PS/2 Keyboard And Mouse 8372 FT8U100AX Serial Port + 8508 Selectronic SP PRO + 87d0 Cressi Dive Computer Interface 8a28 Rainforest Automation ZigBee Controller 8a98 TIAO Multi-Protocol Adapter 8b28 Alpermann+Velte TCI70 @@ -714,13 +816,24 @@ 8b2a Alpermann+Velte Rubidium Q1 8b2b Alpermann+Velte TCD 8b2c Alpermann+Velte TCC70 + 9090 SNAP Stick 200 + 9132 LCD and Temperature Interface 9133 CallerID 9135 Rotary Pub alarm + 9136 Pulsecounter 9e90 Marvell OpenRD Base/Client + 9f08 CIB-1894 Conclusion SmartLink Box: 9f80 Ewert Energy Systems CANdapter a6d0 Texas Instruments XDS100v2 JTAG / BeagleBone A3 a951 HCP HIT GSM/GPRS modem [Cinterion MC55i] + a9a0 FT2232D - Dual UART/FIFO IC - FTDI abb8 Lego Mindstorms NXTCam + b0c0 microSensys RFID device + b0c1 microSensys RFID device + b0c2 iID contactless RFID device + b0c3 iID contactless RFID device + b0c4 RFID device + b0c5 RFID device b810 US Interface Navigator (CAT and 2nd PTT lines) b811 US Interface Navigator (WKEY and FSK lines) b812 US Interface Navigator (RS232 and CONFIG lines) @@ -729,12 +842,14 @@ bcd8 Stellaris Development Board bcd9 Stellaris Evaluation Board bcda Stellaris ICDI Board + bd90 PICAXE Download Cable [AXE027] bdc8 Egnite GmbH - JTAG/RS-232 adapter bfd8 OpenDCC bfd9 OpenDCC (Sniffer) bfda OpenDCC (Throttle) bfdb OpenDCC (Gateway) bfdc OpenDCC (GBM) + c580 HID UNIKEY dongle [F-Response] c630 lcd2usb interface c631 i2c-tiny-usb interface c632 xu1541 c64 floppy drive interface @@ -757,6 +872,14 @@ d011 SCS Position-Tracker/TNC d012 SCS DRAGON 1 d013 SCS DRAGON 1 + d388 Xsens converter + d389 Xsens Wireless Receiver + d38a Xsens serial converter + d38b Xsens serial converter + d38c Xsens Wireless Receiver + d38d Xsens Awinda Station + d38e Xsens serial converter + d38f Xsens serial converter d491 Zolix Omni 1509 monochromator d578 Accesio USB-COM-4SM d6f8 UNI Black BOX @@ -764,6 +887,8 @@ d739 Propox ISPcable III d9a9 Actisense USG-1 NMEA Serial Gateway d9aa Actisense NGT-1 NMEA2000 PC Interface + d9ab Actisense NGT-1 NMEA2000 Gateway + daf4 Qundis Serial Infrared Head e0d0 Total Phase Aardvark I2C/SPI Host Adapter e521 EVER Sinline XL Series UPS e6c8 PYRAMID Computer GmbH LCD @@ -777,15 +902,21 @@ e8d8 Aaronia AG Spectran Spectrum Analyzer e8dc Aaronia AG UBBV Preamplifier ea90 Eclo 1-Wire Adapter + ecd9 miControl miCan-Stick ed71 HAMEG HO870 Serial Port ed72 HAMEG HO720 Serial Port ed73 HAMEG HO730 Serial Port ed74 HAMEG HO820 Serial Port ef10 FT1245BL f070 Serial Converter 422/485 [Vardaan VEUSB422R3] + f0c8 SPROG Decoder Programmer + f0c9 SPROG-DCC CAN-USB + f0e9 Tagsys L-P101 + f0ee Tagsys Medio P200x f1a0 Asix PRESTO Programmer f208 Papenmeier Braille-Display f3c0 4N-GALAXY Serial Converter + f458 ABACUS ELECTRICS Optical Probe f608 CTI USB-485-Mini f60b CTI USB-Nano-485 f680 Suunto Sports Instrument @@ -807,6 +938,7 @@ fc82 SEMC DSS-20/DSS-25 SyncStation fd48 ShipModul MiniPlex-4xUSB NMEA Multiplexer fd49 ShipModul MiniPlex-4xUSB-AIS NMEA Multiplexer + fd4b ShipModul MiniPlex NMEA Multiplexer ff08 ToolHouse LoopBack Adapter ff18 ScienceScope Logbook ML ff19 Logbook Bus @@ -839,9 +971,12 @@ 0103 FV TouchCam N1 (Audio) 030c HP Webcam 03b2 HP Webcam + 03f4 HP Webcam 1030 FV TouchCam N1 (Video) 3000 Optical dual-touch panel 3001 Optical Touch Screen + 3008 Optical Touch Screen + a060 HD Webcam 0409 NEC Corp. 0011 PC98 Series Layout Keyboard Mouse 0012 ATerm IT75DSU ISDN TA @@ -884,6 +1019,7 @@ 0249 Aterm WL300NU-G 02b4 Aterm WL300NU-AG 02b6 Aterm WL300NU-GS 802.11n Wireless Adapter + 02bc Computer Monitor 0300 LifeTouch Note 0301 LifeTouch Note (debug mode) 55aa Hub @@ -1019,8 +1155,14 @@ 4000 InkJet Color Printer 4021 Photo Printer 6800 4022 1400 Digital Photo Printer + 402b Photo Printer 6850 402e 605 Photo Printer 4034 805 Photo Printer + 4035 7000 Photo Printer + 4037 7010 Photo Printer + 4038 7015 Photo Printer + 404d 8810 Photo Printer + 404f 305 Photo Printer 4056 ESP 7200 Series AiO 4109 EasyShare Printer Dock Series 3 410d EasyShare G600 Printer Dock @@ -1031,15 +1173,20 @@ 6003 i50 6004 i60 6005 i80 + 6029 i900 + 602a i900 040b Weltrend Semiconductor 0a68 Func MS-3 gaming mouse [WT6573F MCU] + 2000 wired Keyboard [Dynex DX-WRK1401] + 2367 Human Interface Device [HP CalcPad 200 Calculator and Numeric Keypad] 6510 Weltrend Bar Code Reader - 6520 XBOX Xploder + 6520 Xploder Xbox Memory Unit (8MB) 6533 Speed-Link Competition Pro 6543 Manhattan Magnetic Card Strip Reader 040c VTech Computers, Ltd 040d VIA Technologies, Inc. 3184 VNT VT6656 USB-802.11 Wireless LAN Adapter + 340f Audinst HUD-mx2 6205 USB 2.0 Card Reader 040e MCCI 040f Echo Speech Corp. @@ -1083,7 +1230,9 @@ 00da WLI-U2-KG54L 802.11bg [ZyDAS ZD1211B] 00db External Hard Drive HD-PF32OU2 [Buffalo Ministation] 00e8 WLI-UC-G300N Wireless LAN Adapter [Ralink RT2870] + 00f9 Portable DVD Writer (DVSM-PL58U2) 0105 External Hard Drive HD-CEU2 [Drive Station] + 012c SATA Bridge 012e WLI-UC-AG300N Wireless LAN Adapter 0148 WLI-UC-G300HP Wireless LAN Adapter 0150 WLP-UC-AG300 Wireless LAN Adapter @@ -1095,11 +1244,14 @@ 019e WLI-UC-GNP Wireless LAN Adapter 01a1 MiniStation Metro 01a2 WLI-UC-GNM Wireless LAN Adapter [Ralink RT8070] + 01ba SATA Bridge 01dc Ultra-Slim Portable DVD Writer (DVSM-PC58U2V) 01de External Hard Drive HD-PCTU3 [Buffalo MiniStation] + 01ea SATA Bridge 01ee WLI-UC-GNM2 Wireless LAN Adapter [Ralink RT3070] 01f1 SATA Adapter [HD-LBU3] 01fd WLI-UC-G450 Wireless LAN Adapter + 027e HD-LCU3 0412 Award Software International 0413 Leadtek Research, Inc. 1310 WinFast TV - NTSC + FM @@ -1151,6 +1303,14 @@ 3812 Smart Card Controller_2Interface 3813 Panel Display 5011 Virtual Com Port + 511b Nuvoton Nu-Link1 ICE + 511c Nuvoton Nu-Link1 ICE + 511d Nuvoton Nu-Link1 ICE/VCOM + 511e Nuvoton Nu-Link1 MSC/VCOM + 5200 Nuvoton Nu-Link2-ME ICE/MSC/VCOM + 5201 Nuvoton Nu-Link2-Pro ICE/MSC/VCOM + 5210 Nuvoton Nu-Link2 MSC FW UPGRADE + 5211 Nuvoton Nu-Link2 HID FW UPGRADE 5518 4-Port Hub 551a PC Sync Keypad 551b PC Async Keypad @@ -1163,11 +1323,13 @@ 7721 Memory Stick Reader/Writer 7722 Memory Stick Reader/Writer 7723 SD Card Reader + c141 Barcode Scanner 0417 Symbios Logic 0418 AST Research 0419 Samsung Info. Systems America, Inc. 0001 IrDA Remote Controller / Creative Cordless Mouse 0600 Desktop Wireless 6000 + 2694 Laila 3001 Xerox P1202 Laser Printer 3003 Olivetti PG L12L 3201 Docuprint P8ex @@ -1184,6 +1346,7 @@ 041b d'TV 041d S3, Inc. 041e Creative Technology, Ltd + 0414 HS-720 Headset 1002 Nomad II 1003 Blaster GamePad Cobra 1050 GamePad Cobra @@ -1203,13 +1366,18 @@ 3060 Sound Blaster Audigy 2 ZS External 3061 SoundBlaster Audigy 2 ZS Video Editor 3090 Sound Blaster Digital Music SX + 30d0 Xmod 30d3 Sound Blaster Play! + 3100 IR Receiver (SB0540) 3121 WoW tap chat 3220 Sound Blaster Tactic(3D) Sigma sound card + 3232 Sound Blaster Premium HD [SBX] + 3237 SB X-Fi Surround 5.1 Pro 3f00 E-Mu Xboard 25 MIDI Controller 3f02 E-Mu 0202 3f04 E-Mu 0404 3f07 E-Mu Xmidi 1x1 + 3f0e Xmidi 1x1 Tab 4003 VideoBlaster Webcam Go Plus [W9967CF] 4004 Nomad II MG 4005 Webcam Blaster Go ES @@ -1269,6 +1437,8 @@ 4083 Live! Cam Socialize [VF0640] 4087 Live! Cam Socialize HD 1080 [VF0680] 4088 Live! Cam Chat HD [VF0700] + 4095 Live! Cam Sync HD [VF0770] + 4097 Live! Cam Chat HD [VF0700] 4100 Nomad Jukebox 2 4101 Nomad Jukebox 3 4102 NOMAD MuVo^2 @@ -1343,6 +1513,10 @@ 0104 ADL Re-Flashing Engine Parent 0105 Nokia Firmware Upgrade Mode 0106 ROM Parent + 010d E75 (Storage Mode) + 010e E75 (PC Suite mode) + 010f E75 (Media transfer mode) + 0110 E75 (Imaging Mode) 0154 5800 XpressMusic (PC Suite mode) 0155 5800 XpressMusic (Multimedia mode) 0156 5800 XpressMusic (Storage mode) @@ -1368,8 +1542,12 @@ 02e3 5230 (PC-Suite mode) 02e4 5230 (Imaging mode) 0360 C1-01 Ovi Suite Mode + 0396 C7-00 (Modem mode) 03a4 C5 (Storage mode) - 03c0 C7-00 + 03c0 C7-00 (Mass storage mode) + 03c1 C7-00 (Media transfer mode) + 03c2 Sim + 03cd C7-00 (Nokia Suite mode) 03d1 N950 0400 7600 Phone Parent 0401 6650 GSM Phone @@ -1436,9 +1614,15 @@ 0508 E65 (PC Suite mode) 0509 E65 (Storage mode) 0518 N9 Phone + 054d C2-01 0600 Digital Pen SU-1B 0610 CS-15 (Internet Stick 3G modem) - 0661 Lumia 920 + 0661 Lumia 620/920 + 0662 301 Dual SIM (Mass Storage) + 0663 301 Dual SIM + 069a 130 [RM-1035] (Charging only) + 06fc Lumia 640 Phone + 0720 X (RM-980) 0800 Connectivity Cable DKU-5 0801 Data Cable DKU-6 0802 CA-42 Phone Parent @@ -1455,18 +1639,19 @@ 0301 2500H Tracer Trainer 030a PETracer x1 1237 Andromeda Hub -0424 Standard Microsystems Corp. +0424 Microchip Technology, Inc. (formerly SMSC) 0001 Integrated Hub + 0140 LPC47M14x hub 0acd Sitecom Internal Multi Memory reader/writer MD-005 0fdc Floppy 10cd Sitecom Internal Multi Memory reader/writer MD-005 2020 USB Hub 20cd Sitecom Internal Multi Memory reader/writer MD-005 20fc 6-in-1 Card Reader + 2134 Hub 2228 9-in-2 Card Reader 223a 8-in-1 Card Reader 2503 USB 2.0 Hub - 2504 USB 2.0 Hub 2507 hub 2512 USB 2.0 Hub 2513 2.0 Hub @@ -1475,10 +1660,48 @@ 2524 USB MultiSwitch Hub 2602 USB 2.0 Hub 2640 USB 2.0 Hub + 2660 Hub + 2744 Hub + 274d HTC Hub Controller + 2807 Hub + 3fc7 RME Babyface audio system + 3fcc RME MADIface + 4041 Hub and media card controller 4060 Ultra Fast Media Reader 4064 Ultra Fast Media Reader + 4712 USB4712 high-speed hub + 4713 USB4715 high-speed hub (2 ports disabled) + 4714 USB4715 high-speed hub (1 port disabled) + 4715 USB4715 high-speed hub + 4910 USB491x hub integrated functions (primary) + 4912 USB4912 high-speed hub (1 port disabled) + 4914 USB4914 high-speed hub + 4916 USB4916 high-speed hub + 4920 USB491x hub integrated functions (secondary) + 4925 USB4925 high-speed hub (primary upstream) + 4927 USB4927 high-speed hub (primary upstream) + 4931 USB4925/4927 high-speed hub (secondary upstream) + 4940 USB47xx/49xx hub integrated WinUSB + 4942 USB47xx/49xx hub integrated I2S audio port + 4943 USB47xx/49xx hub integrated I2S audio + HID port + 4944 USB47xx/49xx hub integrated serial port + 4946 USB47xx/49xx hub integrated serial + I2S audio port + 4947 USB47xx/49xx hub integrated serial + I2S audio + HID port + 494a USB47xx/49xx hub integrated WinUSB + I2S audio port + 494b USB47xx/49xx hub integrated WinUSB + I2S audio + HID port + 494c USB47xx/49xx hub integrated WinUSB + serial port + 494e USB47xx/49xx hub integrated WinUSB + serial + I2S audio port + 494f USB47xx/49xx hub integrated WinUSB + serial + I2S audio + HID port + 5434 Hub + 5534 Hub + 5744 Hub + 5807 Hub 7500 LAN7500 Ethernet 10/100/1000 Adapter + 9500 LAN9500/LAN9500i 9512 SMC9512/9514 USB Hub + 9514 SMC9514 Hub + 9904 LAN9512/LAN9514 Ethernet 10/100 Adapter (SAL10) + 9e00 LAN9500A/LAN9500Ai a700 2 Port Hub ec00 SMSC9512/9514 Fast Ethernet Adapter 0425 Motorola Semiconductors HK, Ltd @@ -1507,16 +1730,21 @@ 0083 109 Japanese Keyboard 00a2 Type 7 Keyboard 0100 3-button Mouse + 0502 Panasonic CF-19 HID Touch Panel 100e 24.1" LCD Monitor v4 / FID-638 Mouse 36ba Bus Powered Hub a101 remote key/mouse for P3 chip a102 remote key/mouse/storage for P3 chip a103 remote storage for P3 chip + a111 remote keyboard for P4 chip + a112 remote mouse for P4 chip + a113 remote storage for P4 chip a4a2 Ethernet (RNDIS and CDC ethernet) cdab Raritan KVM dongle 0431 Itac Systems, Inc. 0100 Mouse-Trak 3-button Track Ball 0432 Unisys Corp. + 0031 Document Processor 0433 Alps Electric, Inc. 1101 IBM Game Controller abab Keyboard @@ -1526,6 +1754,7 @@ 0005 CameraMate (DPCM_USB) 0437 Framatome Connectors USA 0438 Advanced Micro Devices, Inc. + 7900 Root Hub 0439 Voice Technologies Group 043d Lexmark International, Inc. 0001 Laser Printer @@ -1635,6 +1864,7 @@ 008c to CF/SM/SD/MS Card Reader 008e InkJet Color Printer 008f X422 + 0091 Laser Printer E232 0093 X5250 0095 E220 Printer 0096 2200 series @@ -1677,6 +1907,9 @@ 4303 Xerox WorkCentre Pro 412 043e LG Electronics USA, Inc. 3001 AN-WF100 802.11abgn Wireless Adapter [Broadcom BCM4323] + 3004 TWFM-B003D 802.11abgn Wireless Module [Broadcom BCM43236B] + 3009 VC400 + 3101 AN-WF500 802.11abgn + BT Wireless Adapter [Broadcom BCM43242] 42bd Flatron 795FT Plus Monitor 4a4d Flatron 915FT Plus Monitor 7001 MF-PD100 Soul Digital MP3 Player @@ -1704,6 +1937,10 @@ 6781 Keyboard with PS/2 Mouse Port 6782 Keyboard 0447 Momentum Microsystems +0449 Duta Multi Robotik + 0128 Menengah + 0210 Dasar + 0612 Lanjutan 044a Shamrock Tech. Co., Ltd 044b WSI 044c CCL/ITRI @@ -1726,7 +1963,14 @@ ffff Compaq Bluetooth Multiport Module 044f ThrustMaster, Inc. 0400 HOTAS Cougar + 0402 HOTAS Warthog Joystick + 0404 HOTAS Warthog Throttle 044f GP XID + 0f00 Steering Wheel for Xbox + 0f03 Steering Wheel for Xbox + 0f07 Controller for Xbox + 0f0c Xbox Memory Unit (8MB) + 0f10 Modena GT Wheel a003 Rage 3D Game Pad a01b PK-GP301 Driving Wheel a0a0 Top Gun Joystick @@ -1742,39 +1986,71 @@ b307 vibrating Upad b30b Wireless VibrationPad b315 Firestorm Dual Analog 3 + b320 Dual Trigger gamepad PC/PS2 2.0 b323 Dual Trigger 3-in-1 (PC Mode) b324 Dual Trigger 3-in-1 (PS3 Mode) + b326 Gamepad GP XID + b351 F16 MFD 1 + b352 F16 MFD 2 + b365 UbiSoft UbiConnect b603 force feedback Wheel b605 force feedback Racing Wheel b651 Ferrari GT Rumble Force Wheel b653 RGT Force Feedback Clutch Racing Wheel b654 Ferrari GT Force Feedback Wheel + b678 T.Flight Rudder Pedals + b679 T-Rudder + b687 TWCS Throttle b700 Tacticalboard 0450 DFI, Inc. 0451 Texas Instruments, Inc. + 0422 TUSB422 Port Controller with Power Delivery 1234 Bluetooth Device 1428 Hub 1446 TUSB2040/2070 Hub + 16a2 CC Debugger 16a6 BM-USBD1 BlueRobin RF heart rate sensor receiver + 16a8 CC2531 ZigBee + 16ae CC2531 Dongle 2036 TUSB2036 Hub 2046 TUSB2046 Hub 2077 TUSB2077 Hub + 2f90 SM-USB-DIG + 3200 TUSB3200 Boot Loader 3410 TUSB3410 Microcontroller 3f00 OMAP1610 3f02 SMC WSKP100 Wi-Fi Phone + 505f TUSB5052 Serial + 5153 TUSB5052 Hub 5409 Frontier Labs NEX IA+ Digital Audio Player 6000 AU5 ADSL Modem (pre-reenum) 6001 AU5 ADSL Modem 6060 RNDIS/BeWAN ADSL2+ 6070 RNDIS/BeWAN ADSL2+ 625f TUSB6250 ATA Bridge + 8041 Hub 8042 Hub + 8043 Hub + 8140 TUSB8041 4-Port Hub + 8142 TUSB8041 4-Port Hub + 926b TUSB9260 Boot Loader + bef3 CC1352R1 Launchpad dbc0 Device Bay Controller e001 GraphLink [SilverLink] e003 TI-84 Plus Calculator e004 TI-89 Titanium Calculator e008 TI-84 Plus Silver Calculator + e00e TI-89 Titanium Presentation Link + e00f TI-84 Plus Presentation Link + e010 TI SmartPad Keyboard + e011 Nspire CAS+ prototype e012 TI-Nspire Calculator + e013 Network Bridge + e01c Data Collection Sled [Nspire Lab Cradle, Nspire Datatracker Cradle] + e01e Nspire CX Navigator Access Point + e01f Python Adapter (firmware install mode) + e020 Python Adapter + e022 Nspire CX II f430 MSP-FET430UIF JTAG Tool f432 eZ430 Development Tool ffff Bluetooth Device @@ -1782,6 +2058,7 @@ 0021 HID Monitor Controls 0050 Diamond Pro 900u CRT Monitor 0051 Integrated Hub + 0100 Control Panel for Leica TCS SP5 0453 CMD Technology 6781 NMB Keyboard 6783 Chicony Composite Keyboard @@ -1794,19 +2071,22 @@ 0150 Super Talent 1GB Flash Drive 0151 Super Flash 1GB / GXT 64MB Flash Drive 0162 SiS162 usb Wireless LAN Adapter - 0163 802.11 Wireless LAN Adapter + 0163 SiS163U 802.11 Wireless LAN Adapter 0817 SiS-184-ASUS-4352.17 touch panel + 10e1 HID Touch Controller 5401 Wireless Adapter RO80211GS-USB 0458 KYE Systems Corp. (Mouse Systems) 0001 Mouse 0002 Genius NetMouse Pro 0003 Genius NetScroll+ 0006 Easy Mouse+ + 0007 Trackbar Emotion 000b NetMouse Wheel(P+U) 000c TACOMA Fingerprint V1.06.01 - 000e VideoCAM Web + 000e Genius NetScroll Optical 0013 TACOMA Fingerprint Mouse V1.06.01 001a Genius WebScroll+ + 002e NetScroll + Traveler / NetScroll 110 0036 Pocket Mouse LE 0039 NetScroll+ Superior 003a NetScroll+ Mini Traveler / Genius NetScroll 120 @@ -1823,10 +2103,13 @@ 0072 Navigator 335 0083 Bluetooth Dongle 0087 Ergo 525V Laser Mouse + 0088 Genius Traveler 515 Laser + 0089 Genius Traveler 350 00ca Pen Mouse 0100 EasyPen Tablet 0101 CueCat 011b NetScroll T220 + 0186 Genius DX-120 Mouse 1001 Joystick 1002 Game Pad 1003 Genius VideoCam @@ -1859,11 +2142,16 @@ 3018 Wireless 2.4Ghz Game Pad 3019 10-Button USB Joystick with Vibration 301a MaxFire G-12U Vibration + 301c Genius MaxFighter F-16U 301d Genius MaxFire MiniPad 400f Genius TVGo DVB-T02Q MCE 4012 TVGo DVB-T03 [AF9015] 5003 G-pen 560 Tablet 5004 G-pen Tablet + 5005 Genius EasyPen M406 + 5012 Genius EasyPen M406W + 5014 Genius EasyPen 340 + 505e Genius iSlim 330 6001 GF3000F Ethernet Adapter 7004 VideoCAM Express V2 7006 Dsc 1.3 Smart Camera Device @@ -1886,9 +2174,17 @@ 7055 Slim 2020AF camera 705a Asus USB2.0 Webcam 705c Genius iSlim 1300AF + 7061 Genius iLook 1321 V2 + 7066 Acer Crystal Eye Webcam + 7067 Genius iSlim 1300AF V2 + 7068 Genius eFace 1325R + 706d Genius iSlim 2000AF V2 + 7076 Genius FaceCam 312 7079 FaceCam 2025R 707f TVGo DVB-T03 [RTL2832] 7088 WideCam 1050 + 7089 Genius FaceCam 320 + 708c Genius WideCam F100 0459 Adobe Systems, Inc. 045a SONICblue, Inc. 07da Supra Express 56K modem @@ -1911,12 +2207,14 @@ 501e Rio Chiba 501f Rio Cali 503f Cali256 MP3 Player + 5042 Rio Forge 5202 Rio Riot MP3 Player 5210 Rio Karma Music Player 5220 Rio Nitrus MP3 Player 5221 Rio Eigen 045b Hitachi, Ltd 0053 RX610 RX-Stick + 0229 mSATA Adapter [renkforce Pi-102] 045d Nortel Networks, Ltd 045e Microsoft Corp. 0007 SideWinder Game Pad @@ -1971,7 +2269,7 @@ 0080 Digital Media Pro Keyboard 0083 Basic Optical Mouse 0084 Basic Optical Mouse - 008a Wireless Keyboard and Mouse + 008a Wireless Optical Desktop Receiver 2.0A 008b Dual Receiver Wireless Mouse (IntelliPoint) 008c Wireless Intellimouse Explorer 2.0 0095 IntelliMouse Explorer 4.0 (IntelliPoint) @@ -1991,10 +2289,11 @@ 00cb Basic Optical Mouse v2.0 00ce Generic PPC Flash device 00d1 Optical Mouse with Tilt Wheel + 00d2 Notebook Optical Mouse with Tilt Wheel 00da eHome Infrared Receiver 00db Natural Ergonomic Keyboard 4000 V1.0 00dd Comfort Curve Keyboard 2000 V1.0 - 00e1 Wireless Laser Mouse 6000 Reciever + 00e1 Wireless Laser Mouse 6000 Receiver 00f4 LifeCam VX-6000 (SN9C20x + OV9650) 00f5 LifeCam VX-3000 00f6 Comfort Optical Mouse 1000 @@ -2002,7 +2301,7 @@ 00f8 LifeCam NX-6000 00f9 Wireless Desktop Receiver 3.1 0202 Xbox Controller - 0280 XBox Device + 0280 Xbox Memory Unit (8MB) 0283 Xbox Communicator 0284 Xbox DVD Playback Kit 0285 Xbox Controller S @@ -2024,7 +2323,18 @@ 02ad Xbox NUI Audio 02ae Xbox NUI Camera 02b0 Xbox NUI Motor - 02b6 Xbox 360 / Bluetooth Wireless Headset + 02b6 Xbox360 Bluetooth Wireless Headset + 02bb Kinect Audio + 02be Kinect for Windows NUI Audio + 02bf Kinect for Windows NUI Camera + 02c2 Kinect for Windows NUI Motor + 02d1 Xbox One Controller + 02d5 Xbox One Digital TV Tuner + 02dd Xbox One Controller (Firmware 2015) + 02e3 Xbox One Elite Controller + 02e6 Wireless XBox Controller Dongle + 02ea Xbox One S Controller + 02fd Xbox One S Controller [Bluetooth] 0400 Windows Powered Pocket PC 2002 0401 Windows Powered Pocket PC 2002 0402 Windows Powered Pocket PC 2002 @@ -2158,6 +2468,7 @@ 0707 Wireless Laser Mouse 8000 0708 Transceiver v 3.0 for Bluetooth 070a Charon Bluetooth Dongle (DFU) + 070f LifeChat LX-3000 Headset 0710 Zune Media Player 0713 Wireless Presenter Mouse 8000 0719 Xbox 360 Wireless Adapter @@ -2165,22 +2476,56 @@ 0721 LifeCam NX-3000 (UVC-compliant) 0723 LifeCam VX-7000 (UVC-compliant) 0724 SideWinder Mouse + 0728 LifeCam VX-5000 0730 Digital Media Keyboard 3000 0734 Wireless Optical Desktop 700 0736 Sidewinder X5 Mouse 0737 Compact Optical Mouse 500 0745 Nano Transceiver v1.0 for Bluetooth + 074a LifeCam VX-500 [1357] 0750 Wired Keyboard 600 0752 Wired Keyboard 400 075d LifeCam Cinema + 0761 LifeCam VX-2000 + 0765 Xbox360 Slim Internal Wireless Module (1400) [Marvell 88W8786U] 0766 LifeCam VX-800 0768 Sidewinder X4 076c Comfort Mouse 4500 076d LifeCam HD-5000 + 0770 LifeCam VX-700 0772 LifeCam Studio 0779 LifeCam HD-3000 + 077f LifeChat LX-6000 Headset 0780 Comfort Curve Keyboard 3000 0797 Optical Mouse 200 + 0799 Surface Pro embedded keyboard + 07a5 Wireless Receiver 1461C + 07b2 2.4GHz Transceiver v8.0 used by mouse Wireless Desktop 900 + 07b6 Comfort Curve Keyboard 3000 + 07b9 Wired Keyboard 200 + 07c6 RTL8153 GigE [Surface Ethernet Adapter] + 07ca Surface Pro 3 Docking Station Audio Device + 07cd Surface Keyboard + 07f8 Wired Keyboard 600 (model 1576) + 07fd Nano Transceiver 1.1 + 0800 Wireless keyboard (All-in-One-Media) + 0810 LifeCam HD-3000 + 0823 Classic IntelliMouse + 0900 Surface Dock Hub + 0901 Surface Dock Hub + 0902 Surface Dock Hub + 0903 Surface Dock Hub + 0904 Surface Dock Extender + 0905 Surface Dock Audio + 090b Hub + 090c SD Card + 091a Hub + 0927 RTL8153B GigE [Surface Ethernet Adapter] + 0955 Hub + 0957 Hub + 09a0 RTL8153B GigE [Surface Ethernet Adapter] + 09c0 Surface Type Cover + 0a00 Lumia 950 Dual SIM (RM-1118) 930a ISOUSB.SYS Intel 82930 Isochronous IO Test Board ffca Catalina fff8 Keyboard @@ -2190,7 +2535,7 @@ 0006 LCD Tablet (12x9) 0008 Tablet (3x2.25) 0461 Primax Electronics, Ltd - 0010 HP Keyboard + 0010 HP PR1101U / Primax PMX-KPR1101U Keyboard 0300 G2-300 Scanner 0301 G2E-300 Scanner 0302 G2-300 #2 Scanner @@ -2230,7 +2575,7 @@ 081c Elitegroup ECS-C11 Camera 081d Elitegroup ECS-C11 Storage 0a00 Micro Innovations Web Cam 320 - 4d01 Comfort Keyboard + 4d01 Comfort Keyboard / Kensington Orbit Elite 4d02 Mouse-in-a-Box 4d03 Kensington Mouse-in-a-box 4d04 Mouse @@ -2247,7 +2592,15 @@ 4d62 HP Laser Mobile Mini Mouse 4d75 Rocketfish RF-FLBTAD Bluetooth Adapter 4d81 Dell N889 Optical Mouse + 4d8a HP Multimedia Keyboard + 4d91 Laser mouse M-D16DL + 4d92 Optical mouse M-D17DR + 4db1 Dell Laptop Integrated Webcam 2Mpix + 4de3 HP 5-Button Optical Comfort Mouse 4de7 webcam + 4e04 Lenovo Keyboard KB1021 + 4e22 Dell Mouse, 2 Buttons, Modell: MS111-P + 4e6f Acer Wired Keyboard Model KBAY211 0463 MGE UPS Systems 0001 UPS ffff UPS @@ -2263,15 +2616,22 @@ 0010 SmartBoard XX44 0011 G83 (RS 6000) Keyboard 0021 CyMotion Expert Combo - 0023 CyMotion Master Linux Keyboard G230 + 0023 Keyboard 0027 CyMotion Master Solar Keyboard 002a Wireless Mouse & Keyboard 002d SmartTerminal XX44 + 003c Raptor Gaming Keyboard + 003d Raptor Gaming Keyboard Integrated Hub 003e SmartTerminal ST-2xxx 0041 G86 6240 Keyboard 0080 eHealth Terminal ST 1503 0081 eHealth Keyboard G87 1504 + 00a1 SmartCard Reader Keyboard KC 1000 SC 0106 R-300 Wireless Mouse Receiver + 010d MX-Board 3.0 Keyboard + 0180 Strait 3.0 + b090 Keyboard + b091 Mouse 046b American Megatrends, Inc. 0001 Keyboard 0101 PS/2 Keyboard, Mouse & Joystick Ports @@ -2283,6 +2643,7 @@ 0082 Acer Aspire 5672 Webcam 0200 WingMan Extreme Joystick 0203 M2452 Keyboard + 0242 Chillstream for Xbox 360 0301 M4848 Mouse 0401 HP PageScan 0402 NEC PageScan @@ -2299,16 +2660,25 @@ 080f Webcam C120 0810 QuickCam Pro 0819 Webcam C210 + 081a Webcam C260 081b Webcam C310 081d HD Webcam C510 0820 QuickCam VC 0821 HD Webcam C910 + 0823 HD Webcam B910 0825 Webcam C270 + 0826 HD Webcam C525 0828 HD Webcam B990 + 082b Webcam C170 + 082c HD Webcam C615 082d HD Pro Webcam C920 0830 QuickClip + 0836 B525 HD Webcam + 0837 BCC950 ConferenceCam 0840 QuickCam Express + 0843 Webcam C930e 0850 QuickCam Web + 085c C922 Pro Stream Webcam 0870 QuickCam Express 0890 QuickCam Traveler 0892 OrbiCam @@ -2405,16 +2775,28 @@ 0a07 Z-10 Speakers 0a0b ClearChat Pro USB 0a0c Clear Chat Comfort USB Headset + 0a10 V10 Notebook Speakers 0a13 Z-5 Speakers + 0a14 USB Headset + 0a15 G35 Headset 0a17 G330 Headset 0a1f G930 0a29 H600 [Wireless Headset] + 0a37 USB Headset H540 + 0a38 Headset H340 + 0a44 Headset H390 + 0a45 960 Headset + 0a4d G430 Surround Sound Gaming Headset + 0a5b G933 Wireless Headset Dongle + 0a5d G933 Headset Battery Charger + 0a66 [G533 Wireless Headset Dongle] 0b02 C-UV35 [Bluetooth Mini-Receiver] (HID proxy mode) 8801 Video Camera + b014 Bluetooth Mouse M336/M337/M535 b305 BT Mini-Receiver bfe4 Premium Optical Wheel Mouse c000 N43 [Pilot Mouse] - c001 N48/M-BB48 [FirstMouse Plus] + c001 N48/M-BB48/M-UK96A [FirstMouse Plus] c002 M-BA47 [MouseMan Plus] c003 MouseMan c004 WingMan Gaming Mouse @@ -2475,22 +2857,30 @@ c064 M110 corded optical mouse (M-B0001) c066 G9x Laser Mouse c068 G500 Laser Mouse - c069 M500 Laser Mouse + c069 M-U0007 [Corded Mouse M500] c06a USB Optical Mouse c06b G700 Wireless Gaming Mouse c06c Optical Mouse c077 M105 Optical Mouse + c07c M-R0017 [G700s Rechargeable Gaming Mouse] + c07d G502 Mouse + c07e G402 Gaming Mouse + c080 G303 Gaming Mouse + c083 G403 Prodigy Gaming Mouse + c084 G203 Gaming Mouse + c08b G502 SE HERO Gaming Mouse c101 UltraX Media Remote - c110 Harmony 785/885 Remote + c110 Harmony 785/880/885 Remote c111 Harmony 525 Remote c112 Harmony 890 Remote c11f Harmony 900/1100 Remote c121 Harmony One Remote c122 Harmony 650/700 Remote - c124 Harmony 300 Remote + c124 Harmony 300/350 Remote c125 Harmony 200 Remote c126 Harmony Link - c12b Harmony Touch Remote + c129 Harmony Hub + c12b Harmony Touch/Ultimate Remote c201 WingMan Extreme Joystick with Throttle c202 WingMan Formula c207 WingMan Extreme Digital 3D @@ -2501,14 +2891,14 @@ c20c WingMan Precision c20d WingMan Attack 2 c20e WingMan Formula GP - c211 iTouch Cordless Reciever + c211 iTouch Cordless Receiver c212 WingMan Extreme Digital 3D c213 J-UH16 (Freedom 2.4 Cordless Joystick) c214 ATK3 (Attack III Joystick) c215 Extreme 3D Pro - c216 Dual Action Gamepad - c218 Logitech RumblePad 2 USB - c219 Cordless RumblePad 2 + c216 F310 Gamepad [DirectInput Mode] + c218 F510 Gamepad [DirectInput Mode] + c219 F710 Gamepad [DirectInput Mode] c21a Precision Gamepad c21c G13 Advanced Gameboard c21d F310 Gamepad [XInput Mode] @@ -2526,12 +2916,17 @@ c22b Gaming Keyboard G110 G-keys c22d G510 Gaming Keyboard c22e G510 Gaming Keyboard onboard audio + c231 G13 Virtual Mouse c245 G400 Optical Mouse c246 Gaming Mouse G300 + c247 G100S Optical Gaming Mouse c248 G105 Gaming Keyboard c24a G600 Gaming Mouse + c24c G400s Optical Mouse c24d G710 Gaming Keyboard c24e G500s Laser Gaming Mouse + c24f G29 Driving Force Racing Wheel [PS3] + c260 G29 Driving Force Racing Wheel [PS4] c281 WingMan Force c283 WingMan Force 3D c285 WingMan Strike Force 3D @@ -2547,13 +2942,14 @@ c29c Speed Force Wireless Wheel for Wii c2a0 Wingman Force Feedback Mouse c2a1 WingMan Force Feedback Mouse + c2ab G13 Joystick c301 iTouch Keyboard c302 iTouch Pro Keyboard c303 iTouch Keyboard c305 Internet Keyboard c307 Internet Keyboard c308 Internet Navigator Keyboard - c309 Internet Keyboard + c309 Y-BF37 [Internet Navigator Keyboard] c30a iTouch Composite c30b NetPlay Keyboard c30c Internet Keys (X) @@ -2569,8 +2965,15 @@ c318 Illuminated Keyboard c31a Comfort Wave 450 c31b Compact Keyboard K300 - c31c Keyboard K120 for Business + c31c Keyboard K120 c31d Media Keyboard K200 + c31f Comfort Keyboard K290 + c326 Washable Keyboard K310 + c328 Corded Keyboard K280e + c32b G910 Orion Spark Mechanical Keyboard + c332 G502 Proteus Spectrum Optical Mouse + c335 G910 Orion Spectrum Mechanical Keyboard + c33a G413 Gaming Keyboard c401 TrackMan Marble Wheel c402 Marble Mouse (2-button) c403 Turbo TrackMan Marble FX @@ -2603,14 +3006,26 @@ c526 Nano Receiver c529 Logitech Keyboard + Mice c52b Unifying Receiver + c52d R700 Remote Presenter receiver c52e MK260 Wireless Combo Receiver c52f Unifying Receiver + c531 C-U0007 [Unifying Receiver] c532 Unifying Receiver + c534 Unifying Receiver + c537 Cordless Mouse Receiver + c53a PowerPlay Wireless Charging System + c603 3Dconnexion Spacemouse Plus XT + c605 3Dconnexion CADman + c606 3Dconnexion Spacemouse Classic + c621 3Dconnexion Spaceball 5000 c623 3Dconnexion Space Traveller 3D Mouse c625 3Dconnexion Space Pilot 3D Mouse c626 3Dconnexion Space Navigator 3D Mouse c627 3Dconnexion Space Explorer 3D Mouse + c628 3Dconnexion Space Navigator for Notebooks c629 3Dconnexion SpacePilot Pro 3D Mouse + c62b 3Dconnexion Space Mouse Pro + c640 NuLOOQ navigator c702 Cordless Presenter c703 Elite Keyboard Y-RP20 + Mouse MX900 (Bluetooth) c704 diNovo Wireless Desktop @@ -2633,8 +3048,13 @@ c720 Bluetooth wireless hub ca03 MOMO Racing ca04 Formula Vibration Feedback Wheel + ca84 Cordless Controller for Xbox + ca88 Thunderpad for Xbox + ca8a Precision Vibration Feedback Wheel for Xbox + caa3 DriveFX Racing Wheel cab1 Cordless Keyboard for Wii HID Receiver d001 QuickCam Pro + f301 Controller 046e Behavior Tech. Computer Corp. 0100 Keyboard 3001 Mass Storage Device @@ -2648,6 +3068,7 @@ 5308 KeyMaestro Keyboard 5408 KeyMaestro Multimedia Keyboard/Hub 5500 Portable Keyboard 86+9 keys (Model 6100C US) + 5550 5 button optical mouse model M873U 5720 Smart Card Reader 6782 BTC 7932 mouse+keyboard 046f Crystal Semiconductor @@ -2750,7 +3171,10 @@ 20d0 SPZ2000 Webcam [PixArt PAC7332] 20e3 GoGear Raga 20e4 GoGear ViBE 8GB + 2160 Mio LINK Heart Rate Monitor + 21e0 GoGEAR Raga 262c SPC230NC Webcam + 2721 PTA 317 TV Camera 485d Senselock SenseIV v2.x df55 LPCXpresso LPC-Link 0472 Chicony Electronics Co., Ltd @@ -2792,6 +3216,7 @@ 1000 Trust Office Scan USB 19200 1002 HP ScanJet 4300c Parallel Port 047c Dell Computer Corp. + ffff UPS Tower 500W LV 047d Kensington 1001 Mouse*in*a*Box 1002 Expert Mouse Pro @@ -2877,26 +3302,46 @@ f101 Atlas Modem 047f Plantronics, Inc. 0101 Bulk Driver + 02ee BT600 0301 Bulk Driver 0411 Savi Office Base Station 0ca1 USB DSP v4 Audio Interface 4254 BUA-100 Bluetooth Adapter + aa05 DA45 ac01 Savi 7xx ad01 GameCom 777 5.1 Headset + af01 DA80 + c008 Audio 655 DSP c00e Blackwire C310 headset -0480 Toshiba America Info. Systems, Inc. + c03b HD1 +0480 Toshiba America Inc 0001 InTouch Module 0004 InTouch Module 0011 InTouch Module 0014 InTouch Module + 0100 Stor.E Slim USB 3.0 + 0200 External Disk + 0820 Canvio Advance Disk + 0821 Canvio Advance 2TB model DTC920 + 0900 MQ04UBF100 a006 External Disk 1.5TB a007 External Disk USB 3.0 a009 Stor.E Basics + a00d STOR.E BASICS 500GB + a100 Canvio Alu 2TB 2.5" Black External Disk Model HDTH320EK3CA + a102 Canvio Alu 2TB 2.5" Black External Disk Model HDTH320EK3CA + a202 Canvio Basics HDD + a208 Canvio Basics 2TB USB 3.0 Portable Hard Drive + b001 Stor.E Partner + b207 Canvio Ready + d000 External Disk 2TB Model DT01ABA200 d010 External Disk 3TB + d011 Canvio Desk 0481 Zenith Data Systems 0482 Kyocera Corp. 000e FS-1020D Printer 000f FS-1920 Mono Printer + 0015 FS-1030D printer 0100 Finecam S3x 0101 Finecam S4 0103 Finecam S5 @@ -2906,9 +3351,14 @@ 0108 Digital Camera Device 0203 AH-K3001V 0204 iBurst Terminal + 0408 FS-1320D Printer + 0640 ECOSYS M6026cdn + 069b ECOSYS M2635dn 0483 STMicroelectronics 0137 BeWAN ADSL USB ST (blue or green) 0138 Unicorn II (ST70138B + MTC-20174TQ chipset) + 0adb Android Debug Bridge (ADB) device + 0afb Android Fastboot device 1307 Cytronix 6in1 Card Reader 163d Cool Icam Digi-MP3 2015 TouchChip速 Fingerprint Reader @@ -2916,19 +3366,34 @@ 2017 Biometric Smart Card Reader 2018 BioSimKey 2302 Portable Flash Device (PFD) - 3744 STLINK Pseudo disk + 3744 ST-LINK/V1 3747 ST Micro Connect Lite 3748 ST-LINK/V2 + 374b ST-LINK/V2.1 + 374d STLINK-V3 Loader + 374e STLINK-V3 + 374f STLINK-V3 + 3752 ST-LINK/V2.1 + 3753 STLINK-V3 4810 ISDN adapter 481d BT Digital Access adapter 5000 ST Micro/Ergenic ERG BT-002 Bluetooth Adapter 5001 ST Micro Bluetooth Device 5710 Joystick in FS Mode - 5720 STM microSD Flash Device - 5721 Hantek DDS-3X25 Arbitrary Waveform Generator - 5740 STM32F407 + 5720 Mass Storage Device + 5721 Interrupt Demo + 5722 Bulk Demo + 5730 Audio Speaker + 5731 Microphone + 5740 Virtual COM Port + 5750 LED badge -- mini LED display -- 11x44 7270 ST Micro Serial Bridge 7554 56k SoftModem + 8213 ThermaData Logger Cradle + 8259 Probe + 91d1 Sensor Hub + a171 ThermaData WiFi + a2e0 BMeasure instrument df11 STM Device in DFU Mode ff10 Swann ST56 Modem 0484 Specialix @@ -2946,19 +3411,30 @@ e003 Pirelli DP-L10 e00d Broadcom Bluetooth 2.1 Device e00f Foxconn T77H114 BCM2070 [Single-Chip Bluetooth 2.1 + EDR Adapter] + e011 Acer Bluetooth module e016 Ubee PXU1900 WiMAX Adapter [Beceem BCSM250] e02c Atheros AR5BBU12 Bluetooth Device + e032 Broadcom BCM20702 Bluetooth + e042 Broadcom BCM20702 Bluetooth + e04d Atheros AR3012 Bluetooth + e055 BCM43142A0 broadcom bluetooth 048a S-MOS Systems, Inc. 048c Alps Electric Ireland, Ltd 048d Integrated Technology Express, Inc. 1165 IT1165 Flash Controller + 1172 Flash Drive + 1234 Mass storage 1336 SD/MMC Cardreader 1345 Multi Cardreader + 8297 IT8297 RGB LED Controller 9006 IT9135 BDA Afatech DVB-T HDTV Dongle 9009 Zolid HD DVD Maker 9135 Zolid Mini DVB-T Stick + 9306 IT930x DVB stick 9503 ITE it9503 feature-limited DVB-T transmission chip [ccHDtv] 9507 ITE it9507 full featured DVB-T transmission chip [ccHDtv] + 9910 IT9910 chipset based grabber + ff59 Hdmi-CEC Bridge 048f Eicon Tech. 0490 United Microelectronics Corp. 0491 Capetronic @@ -3024,6 +3500,10 @@ 1037 PSR-E403 103c MOTIF-RACK ES 1054 S90XS Keyboard/Music Synthesizer + 160f P-105 + 1613 Clavinova CLP535 + 1617 PSR-E353 digital keyboard + 1704 Steinberg UR44 2000 DGP-7 2001 DGP-5 3001 YST-MS55D USB Speaker @@ -3210,6 +3690,8 @@ 049b Strobe XP 100 04a0 7400 04ac Xerox Travel Scanner 100 + 04bb strobe 400 scanner + 04cd Xerox Travel Scanner 150 04a8 Multivideo Labs, Inc. 0101 Hub 0303 Peripheral Switch @@ -3282,8 +3764,13 @@ 10a8 iP6220D 10a9 iP6600D 10b6 PIXMA iP4300 Printer + 10b7 PIXMA iP5300 Printer 10c2 PIXMA iP1800 Printer 10c4 Pixma iP4500 Printer + 10c9 PIXMA iP4600 Printer + 10ca PIXMA iP3600 Printer + 10e3 PIXMA iX6850 Printer + 12fe Printer in service mode 1404 W6400PG 1405 W8400PG 150f BIJ2350 PCL @@ -3291,44 +3778,115 @@ 1512 BIJ1350D PCL 1601 DR-2080C Scanner 1607 DR-6080 Scanner + 1608 DR-2580C Scanner + 1609 DR-3080CII + 160a DR-2050C Scanner 1700 PIXMA MP110 Scanner 1701 PIXMA MP130 Scanner 1702 MP410 Composite 1703 MP430 Composite 1704 MP330 Composite 1706 PIXMA MP750 Scanner - 1707 PIXMA MP780 Scanner - 1708 PIXMA MP760 Scanner + 1707 PIXMA MP780/MP790 + 1708 PIXMA MP760/MP770 1709 PIXMA MP150 Scanner 170a PIXMA MP170 Scanner 170b PIXMA MP450 Scanner 170c PIXMA MP500 Scanner 170d PIXMA MP800 Scanner - 170e MP800R + 170e PIXMA MP800R 1710 MP950 - 1712 MP530 + 1712 PIXMA MP530 1713 PIXMA MP830 Scanner 1714 MP160 - 1715 MP180 Storage - 1716 MP460 Composite - 1717 MP510 - 1718 MP600 Storage - 171a MP810 Storage - 171b MP960 - 1721 MP210 ser - 1723 MP470 ser + 1715 PIXMA MP180 + 1716 PIXMA MP460 + 1717 PIXMA MP510 + 1718 PIXMA MP600 + 1719 PIXMA MP600R + 171a PIXMA MP810 + 171b PIXMA MP960 + 171c PIXMA MX7600 + 1721 PIXMA MP210 + 1722 PIXMA MP220 + 1723 PIXMA MP470 1724 PIXMA MP520 series - 1725 MP610 ser - 1726 MP970 ser - 1727 MX300 ser - 1728 MX310 ser - 1729 MX700 ser + 1725 PIXMA MP610 + 1726 PIXMA MP970 + 1727 PIXMA MX300 + 1728 PIXMA MX310 series + 1729 PIXMA MX700 172b MP140 ser + 172c PIXMA MX850 + 172d PIXMA MP980 + 172e PIXMA MP630 + 172f PIXMA MP620 + 1730 PIXMA MP540 + 1731 PIXMA MP480 + 1732 PIXMA MP240 + 1733 PIXMA MP260 + 1734 PIXMA MP190 + 1735 PIXMA MX860 + 1736 PIXMA MX320 series + 1737 PIXMA MX330 + 173a PIXMA MP250 173b PIXMA MP270 All-In-One Printer - 173e MP560 - 173f Pixma MP640 Multifunction device - 1748 Pixma MG5150 - 174d MX360 ser + 173c PIXMA MP490 + 173d PIXMA MP550 + 173e PIXMA MP560 + 173f PIXMA MP640 + 1740 PIXMA MP990 + 1741 PIXMA MX340 + 1742 PIXMA MX350 + 1743 PIXMA MX870 + 1746 PIXMA MP280 + 1747 PIXMA MP495 + 1748 PIXMA MG5100 Series + 1749 PIXMA MG5200 Series + 174a PIXMA MG6100 Series + 174b PIXMA MG8100 Series + 174d PIXMA MX360 + 174e PIXMA MX410 + 174f PIXMA MX420 + 1750 PIXMA MX880 Series + 1752 PIXMA MG3100 Series + 1753 PIXMA MG4100 Series + 1754 PIXMA MG5300 Series + 1755 PIXMA MG6200 Series + 1756 PIXMA MG8200 Series + 1757 PIXMA MP493 + 1759 PIXMA MX370 Series + 175b PIXMA MX430 Series + 175c PIXMA MX510 Series + 175d PIXMA MX710 Series + 175e PIXMA MX890 Series + 175f PIXMA MP230 + 1762 PIXMA MG3200 Series + 1763 PIXMA MG4200 Series + 1764 PIXMA MG5400 Series + 1765 PIXMA MG6300 Series + 1766 PIXMA MX390 Series + 1768 PIXMA MX450 Series + 1769 PIXMA MX520 Series + 176a PIXMA MX720 Series + 176b PIXMA MX920 Series + 176d PIXMA MG2500 Series + 176e PIXMA MG3500 Series + 176f PIXMA MG6500 Series + 1770 PIXMA MG6400 Series + 1771 PIXMA MG5500 Series + 1772 PIXMA MG7100 Series + 1774 PIXMA MX470 Series + 1775 PIXMA MX530 Series + 177c PIXMA MG7500 Series + 177e PIXMA MG6600 Series + 177f PIXMA MG5600 Series + 1780 PIXMA MG2900 Series + 1787 PIXMA MX490 Series + 178a PIXMA MG3600 Series + 178d PIXMA MG6853 + 180b PIXMA MG3000 series + 1856 PIXMA TS6250 1900 CanoScan LiDE 90 1901 CanoScan 8800F 1904 CanoScan LiDE 100 @@ -3337,6 +3895,9 @@ 1907 CanoScan LiDE 700F 1909 CanoScan LiDE 110 190a CanoScan LiDE 210 + 190d CanoScan 9000F Mark II + 190e CanoScan LiDE 120 + 190f CanoScan LiDE 220 2200 CanoScan LiDE 25 2201 CanoScan FB320U 2202 CanoScan FB620U @@ -3367,14 +3928,15 @@ 2224 CanoScan LiDE 600F 2225 CanoScan LiDE 70 2228 CanoScan 4400F + 2229 CanoScan 8600F 2602 MultiPASS C555 2603 MultiPASS C755 - 260a CAPT Printer + 260a LBP810 260e LBP-2000 2610 MPC600F 2611 SmartBase MPC400 2612 MultiPASS C855 - 2617 CAPT Printer + 2617 LBP1210 261a iR1600 261b iR1610 261c iC2300 @@ -3384,26 +3946,34 @@ 2623 FAX-B180C 2629 FAXPHONE L75 262b LaserShot LBP-1120 Printer + 262c imageCLASS D300 262d iR C3200 - 262f MultiPASS MP730 - 2630 MultiPASS MP700 + 262f PIXMA MP730 + 2630 PIXMA MP700 2631 LASER CLASS 700 2632 FAX-L2000 + 2633 LASERCLASS 500 + 2634 PC-D300/FAX-L400/ICD300 2635 MPC190 + 2636 LBP3200 2637 iR C6800 2638 iR C3100 - 263c Smartbase MP360 - 263d MP370 - 263e MP390 FAX - 263f MP375 + 263c PIXMA MP360 + 263d PIXMA MP370 + 263e PIXMA MP390 + 263f PIXMA MP375R 2646 MF5530 Scanner Device V1.9.1 2647 MF5550 Composite + 264c PIXMA MP740 264d PIXMA MP710 264e MF5630 264f MF5650 (FAX) 2650 iR 6800C EUR 2651 iR 3100C EUR + 2654 LBP3600 2655 FP-L170/MF350/L380/L398 + 2656 iR1510-1670 CAPT Printer + 2657 LBP3210 2659 MF8100 265b CAPT Printer 265c iR C3220 @@ -3417,7 +3987,7 @@ 2666 iR C5800 2667 iR85PLUS 2669 iR105PLUS - 266a CAPT Device + 266a LBP3000 266b iR8070 266c iR9070 266d iR 5800C EUR @@ -3427,31 +3997,52 @@ 2671 iR5570/iR6570 2672 iR C3170 2673 iR 3170C EUR - 2674 L120 + 2674 FAX-L120 2675 iR2830 - 2676 CAPT Device + 2676 LBP2900 2677 iR C2570 2678 iR 2570C EUR - 2679 CAPT Device + 2679 LBP5000 267a iR2016 267b iR2020 267d MF7100 series + 267e LBP3300 2684 MF3200 series 2686 MF6500 series 2687 iR4530 2688 LBP3460 + 2689 FAX-L180/L380S/L398S + 268a LC310/L390/L408S + 268b LBP3500 268c iR C6870 268d iR 6870C EUR 268e iR C5870 268f iR 5870C EUR 2691 iR7105 + 26a1 LBP5300 26a3 MF4100 series + 26a4 LBP5100 26b0 MF4600 series 26b4 MF4010 series 26b5 MF4200 series - 26da LBP3010B printer + 26b6 FAX-L140/L130 + 26b9 LBP3310 + 26ba LBP5050 + 26da LBP3010/LBP3018/LBP3050 + 26db LBP3100/LBP3108/LBP3150 26e6 iR1024 + 26ea LBP9100C + 26ee MF4320-4350 + 26f1 LBP7200C + 26ff LBP6300 + 271a LBP6000 + 271b LBP6200 + 271c LBP7010C/7018C + 2736 I-SENSYS MF4550d 2737 MF4410 + 2742 imageRUNNER1133 series + 2771 LBP6020 + 2796 LBP6230/6240 3041 PowerShot S10 3042 CanoScan FS4000US Film Scanner 3043 PowerShot S20 @@ -3608,6 +4199,7 @@ 3160 Digital IXUS 860 IS 3170 SELPHY CP750 3171 SELPHY CP740 + 3172 SELPHY CP520 3173 PowerShot SD890 IS DIGITAL ELPH / Digital IXUS 970 IS / IXY DIGITAL 820 IS 3174 PowerShot SD790 IS DIGITAL ELPH / Digital IXUS 90 IS / IXY DIGITAL 95 IS 3175 IXY Digital 25 IS @@ -3625,7 +4217,9 @@ 3193 PowerShot SD990 IS DIGITAL ELPH / Digital IXUS 980 IS / IXY DIGITAL 3000 IS 3195 PowerShot SX1 IS 3196 PowerShot SD880 IS DIGITAL ELPH / Digital IXUS 870 IS / IXY DIGITAL 920 IS + 3199 EOS 5D Mark II 319a EOS 7D + 319b EOS 50D 31aa SELPHY CP770 31ab SELPHY CP760 31ad PowerShot E1 @@ -3669,7 +4263,9 @@ 3211 PowerShot SX130 IS 3212 Powershot S95 3214 SELPHY CP800 + 3215 EOS 60D 3218 EOS 600D / Rebel T3i (ptp) + 3219 EOS 1D X 3223 PowerShot A3300 IS 3224 PowerShot A3200 IS 3225 PowerShot ELPH 500 HS / IXUS 310 HS @@ -3682,10 +4278,13 @@ 322c PowerShot SX220 HS 3233 PowerShot G1 X 3234 PowerShot SX150 IS + 3235 PowerShot ELPH 510 HS / IXUS 1100 HS 3236 PowerShot S100 3237 PowerShot ELPH 310 HS / IXUS 230 HS 3238 PowerShot SX40 HS + 323a EOS 5D Mark III 323b EOS Rebel T4i + 323d EOS M 323e PowerShot A1300 323f PowerShot A810 3240 PowerShot ELPH 320 HS / IXUS 240 HS @@ -3694,10 +4293,14 @@ 3243 PowerShot A4000 IS 3244 PowerShot SX260 HS 3245 PowerShot SX240 HS + 3246 PowerShot ELPH 530 HS / IXUS 510 HS 3247 PowerShot ELPH 520 HS / IXUS 500 HS 3248 PowerShot A3400 IS 3249 PowerShot A2400 IS 324a PowerShot A2300 + 3250 EOS 6D + 3252 EOS 1D C + 3253 EOS 70D 3255 SELPHY CP900 3256 SELPHY CP810 3258 PowerShot G15 @@ -3705,16 +4308,66 @@ 325a PowerShot SX160 IS 325b PowerShot S110 325c PowerShot SX500 IS + 325e PowerShot N 325f PowerShot SX280 HS 3260 PowerShot SX270 HS + 3261 PowerShot A3500 IS 3262 PowerShot A2600 + 3263 PowerShot SX275 HS 3264 PowerShot A1400 3265 Powershot ELPH 130 IS / IXUS 140 + 3266 Powershot ELPH 120 IS / IXUS 135 3268 PowerShot ELPH 330 HS / IXUS 255 HS + 326f EOS 7D Mark II + 3270 EOS 100D 3271 PowerShot A2500 + 3272 EOS 700D + 3274 PowerShot G16 + 3275 PowerShot S120 3276 PowerShot SX170 IS 3277 PowerShot SX510 HS + 3278 PowerShot S200 + 327a SELPHY CP910 + 327b SELPHY CP820 327d Powershot ELPH 115 IS / IXUS 132 + 327f EOS Rebel T5 / EOS 1200D / EOS Kiss X70 + 3284 PowerShot D30 + 3285 PowerShot SX700 HS + 3286 PowerShot SX600 HS + 3287 PowerShot ELPH 140 IS / IXUS 150 + 3288 Powershot ELPH 135 / IXUS 145 + 3289 PowerShot ELPH 340 HS / IXUS 265 HS + 328a PowerShot ELPH 150 IS / IXUS 155 + 328b PowerShot N Facebook(R) Ready + 3299 EOS M3 + 329a PowerShot SX60 HS + 329b PowerShot SX520 HS + 329c PowerShot SX400 IS + 329d PowerShot G7 X + 329f PowerShot SX530 HS + 32a0 EOS M10 + 32a6 PowerShot SX710 HS + 32a7 PowerShot SX610 HS + 32a8 PowerShot G3 X + 32aa Powershot ELPH 160 / IXUS 160 + 32ab PowerShot ELPH 350HS / IXUS 275 HS + 32ac PowerShot ELPH 170 IS / IXUS 170 + 32ad PowerShot SX410 IS + 32b1 SELPHY CP1200 + 32b2 PowerShot G9 X + 32b3 PowerShot G5 X + 32b4 EOS Rebel T6 + 32bb EOS M5 + 32bf PowerShot SX420 IS + 32c1 PowerShot ELPH 180 / IXUS 175 + 32c2 PowerShot SX720 HS + 32c5 EOS M6 + 32cc EOS 200D + 32d1 EOS M100 + 32d2 EOS M50 + 32d4 Powershot ELPH 185 / IXUS 185 / IXY 200 + 32d5 PowerShot SX430 IS + 32db SELPHY CP1300 04aa DaeWoo Telecom, Ltd 04ab Chromatic Research 04ac Micro Audiometrics Corp. @@ -3791,6 +4444,9 @@ 0428 D7000 0429 D5100 042a D800 (ptp) + 0430 D7100 + 0436 D810 + 043f D5600 0f03 PD-10 Wireless Printer Adapter 4000 Coolscan LS 40 ED 4001 LS 50 ED/Coolscan V ED @@ -3802,6 +4458,7 @@ 300a Rapid Access IIIe Keyboard 3016 UltraNav Keyboard Hub 3018 UltraNav Keyboard + 301a 2-port low-power hub 301b SK-8815 Keyboard 301c Enhanced Performance Keyboard 3020 Enhanced Performance Keyboard @@ -3817,7 +4474,8 @@ 310c Wheel Mouse 4427 Portable CD ROM 4482 Serial Converter - 4485 Serial Converter + 4484 SMSC USB20H04 3-Port Hub [ThinkPad X4 UltraBase, Wistron S Note-3 Media Slice] + 4485 ThinkPad Dock Hub 4524 40 Character Vacuum Fluorescent Display 4525 Double sided CRT 4535 4610 Suremark Printer @@ -3832,6 +4490,7 @@ 0002 CY7C63x0x Thermometer 0033 Mouse 0060 Wireless optical mouse + 00f3 FX3 micro-controller (DFU mode) 0100 Cino FuzzyScan F760-B 0101 Keyboard/Hub 0102 Keyboard with APM @@ -3843,15 +4502,24 @@ 1006 Human Interface Device 2050 hub 2830 Opera1 DVB-S (cold state) + 3813 NANO BIOS Programmer + 4235 Monitor 02 Driver 4381 SCAPS USC-1 Scanner Controller 4611 Storage Adapter FX2 (CY) 4616 Flash Disk (TPP) + 4624 DS-Xtreme Flash Card + 4717 West Bridge 5201 Combi Keyboard-Hub (Hub) 5202 Combi Keyboard-Hub (Keyboard) 5500 HID->COM RS232 Adapter 5a9b Dacal CD/DVD Library D-101/DC-300/DC-016RW 6370 ViewMate Desktop Mouse CC2201 + 6502 CY4609 + 6506 CY4603 + 650a CY4613 6560 CY7C65640 USB-2.0 "TetraHub" + 6570 Unprogrammed CY7C65632/34 hub HX2VL + 6572 Unprogrammed CY7C65642 hub 6830 CY7C68300A EZ-USB AT2 USB 2.0 to ATA/ATAPI 6831 Storage Adapter ISD-300LP (CY) 7417 Wireless PC Lock/Ultra Mouse @@ -3868,7 +4536,11 @@ f000 CY30700 Licorice evaluation board f111 CY8CKIT-002 PSoC MiniProg3 Rev A Program and debug kit f115 PSoC FirstTouch Programmer - fd13 Programmable power socket + f231 DELLY Changer 4in1 universal IR remote + f232 Mono embedded computer + fd10 Gembird MSIS-PM + fd13 Energenie EG-PMS + fd15 Energenie EG-PMS2 04b5 ROHM LSI Systems USA, LLC 3064 Hantek DSO-3064 04b6 Hint Corp. @@ -3932,7 +4604,8 @@ 0142 GT-F730 [GT-S630/Perfection V33/V330 Photo] 0143 GT-S55 0144 GT-S85 - 0202 Receipt Printer M129C/TM-T70 + 0151 Perfection V800 Photo + 0202 Interface Card UB-U05 for Thermal Receipt Printers [M129C/TM-T70/TM-T88IV] 0401 CP 800 Digital Camera 0402 PhotoPC 850z 0403 PhotoPC 3000z @@ -4010,7 +4683,7 @@ 0849 Stylus SX205 084a PX-501A [Stylus NX400] 084d PX-402A [Stylus SX115/Stylus NX110 Series] - 084f ME OFFICE 510 + 084f Multifunctional Printer Scanner [ME Office 510 / Epson Stylus SX215] 0850 EP-702A [Stylus Photo PX650/TX650 Series] 0851 Stylus SX410 0852 EP-802A [Artisan 710 Series/Stylus Photo PX710W/TX720W Series] @@ -4039,18 +4712,21 @@ 0879 EP-904A/EP-904F [Artisan 837/Stylus Photo PX830FWD Series] 087b EP-804A/EP-804AR/EP-804AW [Stylus Photo PX730WD/Artisan 730 Series] 087c PX-1700F - 087d PX-B750F + 087d PX-B750F/WP-4525 Series 087f PX-403A 0880 PX-434A [Stylus NX330 Series] 0881 PX-404A [ME OFFICE 535] 0883 ME 340 Series/Stylus NX130 Series 0884 Stylus NX430W Series - 0885 Stylus NX230 Series + 0885 Stylus NX230/SX235W Series 088f Stylus Office BX635FWD 0890 ME OFFICE 940FW Series/Stylus Office BX630FW Series 0891 Stylus Office BX535WD 0892 Stylus Office BX935FWD 0893 EP-774A + 0e03 Thermal Receipt Printer [TM-T20] + 1114 XP-440 [Expression Home Small-in-One Printer] + 1129 ET-4750 [WorkForce ET-4750 EcoTank All-in-One] 04b9 Rainbow Technologies, Inc. 0300 SafeNet USB SuperPro/UltraPro 1000 iKey 1000 Token @@ -4074,9 +4750,11 @@ 1304 iKey Token 1305 iKey Token 1306 iKey Token + 8000 SafeNet Sentinel Hardware Key 04ba Toucan Systems, Ltd 04bb I-O Data Device, Inc. 0101 USB2-IDE/ATAPI Bridge Adapter + 014a HDCL-UT 0201 USB2-IDE/ATAPI Bridge Adapter 0204 DVD Multi-plus unit iU-CD2 0206 DVD Multi-plus unit DVR-UEH8 @@ -4155,11 +4833,19 @@ 1097 fi-5110C 10ae fi-4120C2 10af fi-4220C2 + 10c7 fi-60f scanner 10e0 fi-5120c Scanner 10e1 fi-5220C 10e7 fi-5900C 10fe S500 + 1104 KD02906 Line Thermal Printer + 114f fi-6130 1150 fi-6230 + 11f3 fi-6130Z + 125a PalmSecure Sensor Device - MP + 132e fi-7160 + 200f Sigma DP2 (Mass Storage) + 2010 Sigma DP2 (PictBridge) 201d SATA 3.0 6Gbit/s Adaptor [GROOVY] 04c6 Toshiba America Electronic Components 04c7 Micro Macro Technologies @@ -4174,9 +4860,23 @@ 072c Revio KD20M 072d Revio KD410Z 04ca Lite-On Technology Corp. + 0020 USB Keyboard + 004b Keyboard 004f SK-9020 keyboard + 008a Acer Wired Mouse Model SM-9023 1766 HID Monitor Controls 2004 Bluetooth 4.0 [Broadcom BCM20702A0] + 2006 Broadcom BCM43142A0 Bluetooth Device + 2007 Broadcom BCM43142A0 Bluetooth Device + 3005 Atheros Bluetooth + 300b Atheros AR3012 Bluetooth + 300d Atheros AR3012 Bluetooth + 300f Atheros AR3012 Bluetooth + 3014 Qualcomm Atheros Bluetooth + 3015 Qualcomm Atheros QCA9377 Bluetooth + 7022 HP HD Webcam + 7025 HP HD Webcam + 7046 TOSHIBA Web Camera - HD 9304 Hub f01c TT1280DA DVB-T TV Tuner 04cb Fuji Photo Film Co., Ltd @@ -4187,7 +4887,7 @@ 0109 FinePix F601 Zoom (PC CAM) 010a FinePix S602 (Pro) Zoom (DSC) 010b FinePix S602 (Pro) Zoom (PC CAM) - 010d FinePix Digital Camera 020531 + 010d FinePix S2 pro 010e FinePix F402 Zoom (DSC) 010f FinePix F402 Zoom (PC CAM) 0110 FinePix M603 Zoom (DSC) @@ -4255,6 +4955,7 @@ 01bf FinePix F6000fd/S6500fd Zoom (PTP) 01c0 FinePix F20 (PTP) 01c1 FinePix F31fd (PTP) + 01c3 FinePix S5 Pro 01c4 FinePix S5700 Zoom (PTP) 01c5 FinePix F40fd (PTP) 01c6 FinePix A820 Zoom (PTP) @@ -4268,6 +4969,8 @@ 0240 FinePix S2950 Digital Camera 0241 FinePix S3200 Digital Camera 0278 FinePix JV300 + 02c5 FinePix S9900W Digital Camera (PTP) + 5006 ASK-300 04cc ST-Ericsson 1122 Hub 1520 USB 2.0 Hub (Avocent KVM) @@ -4317,38 +5020,74 @@ 0033 PICkit2 0036 PICkit Serial Analyzer 00e0 PIC32 Starter Board + 04cd 28Cxxx EEPROM Programmer 0a04 AGP LIN Serial Analyzer 8000 In-Circuit Debugger 8001 ICD2 in-circuit debugger 8101 PIC24F Starter Kit 8107 Microstick II + 8108 ChipKit Pro MX7 (PIC32MX) 9004 Microchip REAL ICE + 9009 ICD3 900a PICkit3 + 9012 PICkit4 + 9015 ICD 4 In-Circuit Debugger c001 PicoLCD 20x4 + e11c TL866CS EEPROM Programmer [MiniPRO] + ed16 BeamiRC 2.0 CNC remote controller analoge + edb4 micro PLC (ATSAMD51G19A) [Black Brix ECU II] + edb5 ATMEGA32U4 [Black Brix ECU] + f2c4 Macareux-labs Hygrometry Temperature Sensor + f2f7 Yepkit YKUSH + f3aa Macareux-labs Usbce Bootloader mode + f437 SBE Tech Ultrasonic Anemometer + f4b5 SmartScope + f5fe TrueRNG f8da Hughski Ltd. ColorHug + f8e8 Harmony 300/350 Remote + f91c SPROG IIv3 faff Dangerous Prototypes BusPirate v4 Bootloader mode fb00 Dangerous Prototypes BusPirate v4 fbb2 GCUSB-nStep stepper motor controller fbba DiscFerret Magnetic Disc Analyser (bootloader mode) fbbb DiscFerret Magnetic Disc Analyser (active mode) + fc1e Bachrus Speedometer Interface fc92 Open Bench Logic Sniffer + ffee Devantech USB-ISS ffef PICoPLC [APStech] 04d9 Holtek Semiconductor, Inc. + 0006 Wired Keyboard (78/79 key) [RPI Wired Keyboard 5] 0022 Portable Keyboard + 0348 Keyboard 048e Optical Mouse 0499 Optical Mouse + 1135 Mouse [MGK-15BU/MLK-15BU] 1203 Keyboard 1400 PS/2 keyboard + mouse controller - 1503 Shortboard Lefty + 1503 Keyboard 1603 Keyboard 1702 Keyboard LKS02 + 1818 Keyboard [Diatec Filco Majestouch 2] + 2011 Keyboard [Diatec Filco Majestouch 1] 2013 Keyboard [Das Keyboard] + 2206 Fujitsu Siemens Mouse Esprimo Q 2221 Keyboard 2323 Keyboard 2519 Shenzhen LogoTech 2.4GHz receiver - 2832 1channel Telephone line recorder + 2832 HT82A832R Audio MCU 2834 HT82A834R Audio MCU + 4545 Keyboard [Diatec Majestouch 2 Tenkeyless] + a01c wireless multimedia keyboard with trackball [Trust ADURA 17911] + a050 Chatman V1 + a052 USB-zyTemp a055 Keyboard + a096 Keyboard + a09f E-Signal LUOM G10 Mechanical Gaming Mouse + a100 Mouse [HV-MS735] + a11b Mouse [MX-3200] + a29f Microarray fingerprint reader + b534 LGT8F328P Microprocessor + e002 MCU 04da Panasonic (Matsushita) 0901 LS-120 Camera 0912 SDR-S10 @@ -4359,6 +5098,8 @@ 0d0a CD-R Drive KXL-CB20AN 0d0d CDRCB03 0d0e DVD-ROM & CD-R/RW + 0d14 DVD-RAM MLT08 + 0f07 KX-MB2030 Multifunction Laser Printer 0f40 Printer 104d Elite Panaboard UB-T880 (HID) 104e Elite Panaboard Pen Adaptor (HID) @@ -4376,10 +5117,15 @@ 2372 Lumix Camera (Storage mode) 2374 Lumix Camera (PTP mode) 2451 HDC-SD9 + 245b HC-X920K (3MOS Full HD video camcorder) + 2477 SDR-H85 Camcorder (PC mode) + 2478 SDR-H85 Camcorder (recorder mode - SD card) + 2479 SDR-H85 Camcorder (recorder mode - HDD) 2497 HDC-TM700 250c Gobi Wireless Modem (QDL mode) 250d Gobi Wireless Modem 3904 N5HBZ0000055 802.11abgn Wireless Adapter [Atheros AR7010+AR9280] + 3908 N5HBZ0000062 802.11abgn Wireless Adapter [Atheros AR9374v1.1] 3c04 JT-P100MR-20 [ePassport Reader] 04db Hypertec Pty, Ltd 04dc Huan Hsin Holdings, Ltd @@ -4500,6 +5246,7 @@ 5292 SCL011 RFID reader 5410 SCR35xx Smart Card Reader 5591 SCL3711-NFC&RW + 5810 uTrust 2700 R Smart Card Reader e000 SCRx31 Reader e001 SCR331 SmartCard Reader e003 SPR532 PinPad SmartCard Reader @@ -4524,13 +5271,17 @@ 0082 Touchmonitor Interface 00ff Touchmonitor Interface 04e8 Samsung Electronics Co., Ltd + 0001 Printer Bootloader 0100 Kingston Flash Drive (128MB) 0110 Connect3D Flash Drive 0111 Connect3D Flash Drive 0300 E2530 / GT-C3350 Phones (Mass storage mode) + 04e8 Galaxy (MIDI mode) 1003 MP3 Player and Recorder 1006 SDC-200Z 130c NX100 + 1323 WB700 Camera + 1f05 S2 Portable [JMicron] (500GB) 1f06 HX-MU064DA portable harddisk 2018 WIS09ABGN LinkStick Wireless LAN Adapter 2035 Digital Photo Frame Mass Storage @@ -4568,14 +5319,18 @@ 3268 ML-1610 Mono Laser Printer 326c ML-2010P Mono Laser Printer 3276 ML-3050/ML-3051 Laser Printer + 327e ML-2510 Series 328e CLP-310 Color Laser Printer 3292 ML-1640 Series Laser Printer 3296 ML-2580N Mono Laser Printer 3297 ML-191x/ML-252x Laser Printer 329f CLP-325 Color Laser Printer + 3301 ML-1660 Series 330c ML-1865 + 330f ML-216x Series Laser Printer 3310 ML-331x Series Laser Printer 3315 ML-2540 Series Laser Printer + 331e M262x/M282x Xpress Series Laser Printer 3409 SCX-4216F Scanner 340c SCX-5x15 series 340d SCX-6x20 series @@ -4592,7 +5347,9 @@ 341f Composite Device 3420 Composite Device 3426 SCX-4500 Laser Printer + 342d SCX-4x28 Series 344f SCX-3400 Series + 347e C48x Series Color Laser Multifunction Printer 3605 InkJet Color Printer 3606 InkJet Color Printer 3609 InkJet Color Printer @@ -4664,10 +5421,17 @@ 5f04 NEXiO Sync 5f05 STORY Station 1TB 6032 G2 Portable hard drive + 6033 G2 Portable device 6034 G2 Portable hard drive 60b3 M2 Portable Hard Drive 60c4 M2 Portable Hard Drive USB 3.0 + 6124 D3 Station External Hard Drive + 6125 D3 Station External Hard Drive + 61b5 M3 Portable Hard Drive 2TB 61b6 M3 Portable Hard Drive 1TB + 61b7 M3 Portable Hard Drive 4TB + 61f3 Portable SSD T3 (MU-PT250B, MU-PT500B) + 61f5 Portable SSD T5 6601 Mobile Phone 6602 Galaxy 6603 Galaxy @@ -4684,7 +5448,7 @@ 662e MITs Sync 6630 MITs Sync 6632 MITs Sync - 663e D900e Phone + 663e D900e/B2100 Phone 663f SGH-E720/SGH-E840 6640 Usb Modem Enumerator 6651 i8510 Innov8 @@ -4692,8 +5456,8 @@ 6708 U600 Phone 6709 U600 6734 Juke - 6759 D900e Media Player - 675a D900e Mass Storage + 6759 D900e/B2100 Media Player + 675a D900e/B2100 Mass Storage 675b D900e Camera 6772 Standalone LTE device (Trial) 6795 S5230 @@ -4705,15 +5469,19 @@ 6843 E2530 Phone (Samsung Kies mode) 684e Wave (GT-S8500) 685b GT-I9100 Phone [Galaxy S II] (mass storage mode) - 685c GT-I9250 Phone [Galaxy Nexus] + 685c GT-I9250 Phone [Galaxy Nexus] (Mass storage mode) 685d GT-I9100 Phone [Galaxy S II] (Download mode) 685e GT-I9100 / GT-C3350 Phones (USB Debugging mode) - 6860 GT-I9100 Phone [Galaxy S II], GT-I9300 Phone [Galaxy S III], GT-P7500 [Galaxy Tab 10.1] - 6865 GT-I9300 Phone [Galaxy S III] (PTP mode) - 6866 GT-I9300 Phone [Galaxy S III] (debugging mode) + 6860 Galaxy series, misc. (MTP mode) + 6863 Galaxy series, misc. (tethering mode) + 6864 GT-I9070 (network tethering, USB debugging enabled) + 6865 Galaxy (PTP mode) + 6866 Galaxy (debugging mode) + 6868 Escape Composite driver for Android Phones: Modem+Diagnostic+ADB 6875 GT-B3710 Standalone LTE device (Commercial) 6876 GT-B3710 LTE Modem 6877 Galaxy S + 687a GT-E2370 mobile phone 6888 GT-B3730 Composite LTE device (Commercial) 6889 GT-B3730 Composite LTE device (Commercial) 689a LTE Storage Driver [CMC2xx] @@ -4724,7 +5492,11 @@ 7061 eHome Infrared Receiver 7080 Anycall SCH-W580 7081 Human Interface Device + 7301 Fingerprint Device 8001 Handheld + 8002 Portable SSD 500GB Model Number: MU - P8500B + 8003 Portable SSD T1 + d003 GT-I9003 e020 SERI E02 SCOM 6200 UMTS Phone e021 SERI E02 SCOM 6200 Virtual UARTs e022 SERI E02 SCOM 6200 Flash Load Disk @@ -4761,9 +5533,14 @@ 0402 Genius LuxeMate i200 Keyboard 0403 KU-0420 keyboard 0418 KU-0418 Tactical Pad + 0618 RG-0618U Wireless HID Receiver & KG-0609 Wireless Keyboard with Touchpad + 0718 wired mouse 0760 Acer KU-0760 Keyboard + 0833 KU-0833 Keyboard 0841 HP Multimedia Keyboard 0860 2.4G Multimedia Wireless Kit + 0939 Amazon Basics mouse + 1061 HP KG-1061 Wireless Keyboard+Mouse 1121 Periboard 717 Mini Wireless Keyboard a001 E-Video DC-100 Camera a120 ORITE CCD Webcam(PC370R) @@ -4774,6 +5551,7 @@ a128 PC Camera (SN9C202 + OV7663 + EEPROM) a133 Gateway Webcam a136 LabTec Webcam 5500 + a147 Medion Webcam a204 DSC WIA Device (1300) a208 DSC WIA Device (2320) a209 Labtec DC-2320 @@ -4800,43 +5578,71 @@ b044 Acer CrystalEye Webcam b057 integrated USB webcam b059 CKF7037 HP webcam + b064 CNA7137 Integrated Webcam + b070 Camera b071 2.0M UVC Webcam / CNF7129 b083 CKF7063 Webcam (HP) b091 Webcam b104 CNF7069 Webcam b107 CNF7070 Webcam b14c CNF8050 Webcam + b159 CNF8243 Webcam b15c Sony Vaio Integrated Camera b175 4-Port Hub b1aa Webcam-101 + b1ac HP Laptop Integrated Webcam [2 MP Fixed] b1b4 Lenovo Integrated Camera b1b9 Asus Integrated Webcam b1cf Lenovo Integrated Camera b1d6 CNF9055 Toshiba Webcam + b1d8 1.3M Webcam b1e4 Toshiba Integrated Webcam b213 Fujitsu Integrated Camera b217 Lenovo Integrated Camera (0.3MP) b221 integrated camera b230 Integrated HP HD Webcam + b249 HP Integrated Webcam b257 Lenovo Integrated Camera b26b Sony Visual Communication Camera b272 Lenovo EasyCamera b2b0 Camera b2b9 Lenovo Integrated Camera UVC + b2da thinkpad t430s camera + b2db Thinkpad T430 camera b2ea Integrated Camera [ThinkPad] + b2f4 HP Webcam-50 b330 Asus 720p CMOS webcam b354 UVC 1.00 device HD UVC WebCam + b394 Integrated Camera + b3eb HP 720p HD Monitor Webcam + b3f6 HD WebCam (Acer) + b3fd HD WebCam (Asus N-series) + b40e HP Truevision HD camera + b444 Lenovo Integrated Webcam + b49f Bluetooth (RTL8723BE) + b563 Integrated Camera + b5ce Integrated Camera + b5cf Integrated IR Camera + b5db HP Webcam + b604 Integrated Camera (1280x720@30) + b681 ThinkPad T490 Webcam 04f3 Elan Microelectronics Corp. 000a Touchscreen 0103 ActiveJet K-2024 Multimedia Keyboard + 016f Touchscreen 01a4 Wireless Keyboard + 0201 Touchscreen 0210 Optical Mouse 0212 Laser Mouse 0214 Lynx M9 Optical Mouse 0230 3D Optical Mouse 0232 Mouse + 0234 Optical Mouse + 0235 Optical Mouse 02f4 2.4G Cordless Mouse + 0381 Touchscreen 04a0 Dream Cheeky Stress/Panic Button + 2234 Touchscreen 04f4 Harting Elektronik, Inc. 04f5 Fujitsu-ICL Systems, Inc. 04f6 Norand Corp. @@ -4881,7 +5687,10 @@ 002c Printer 002d Printer 0039 HL-5340 series + 0041 HL-2250DN Laser Printer 0042 HL-2270DW Laser Printer + 004d HL-6180DW series + 0080 HL-L6250DN series 0100 MFC8600/9650 series 0101 MFC9600/9870 series 0102 MFC9750/1200 series @@ -4895,16 +5704,17 @@ 010b MFC-860 010c MFC-7400J 010d MFC-9200J - 010e MFC3100C Scanner - 010f MFC 5100C - 0110 MFC4800 Scanner - 0111 MFC 6800 + 010e MFC-3100C Scanner + 010f MFC-5100C + 0110 MFC-4800 Scanner + 0111 MFC-6800 0112 DCP1000 Port(FaxModem) 0113 MFC-8500 0114 MFC9700 Port(FaxModem) - 0115 MFC9800 Scanner + 0115 MFC-9800 Scanner 0116 DCP1400 Scanner 0119 MFC-9660 + 011a MFC-9860 011b MFC-9880 011c MFC-9760 011d MFC-9070 @@ -4913,13 +5723,20 @@ 0120 MFC580 Port(FaxModem) 0121 MFC-590 0122 MFC-5100J + 0124 MFC-4800J + 0125 MFC-6800J + 0127 MFC-9800J + 0128 MFC-8500J 0129 Imagistics 2500 (MFC-8640D clone) + 012b MFC-9030 + 012e FAX4100e IntelliFax 4100e 012f FAX-4750e + 0130 FAX-5750e 0132 MFC-5200C RemovableDisk 0135 MFC-100 Scanner 0136 MFC-150CL Scanner 013c MFC-890 Port - 013d MFC-5200J Printer + 013d MFC-5200J 013e MFC-4420C RemovableDisk 013f MFC-4820C RemovableDisk 0140 DCP-8020 @@ -4929,14 +5746,17 @@ 0144 DCP-4020C RemovableDisk 0146 MFC-3220C 0147 FAX-1820C Printer - 0148 MFC-3320CN Printer + 0148 MFC-3320CN 0149 FAX-1920CN Printer 014a MFC-3420C 014b MFC-3820CN + 014c DCP-3020C 014d FAX-1815C Printer 014e MFC-8820J + 014f DCP-8025J 0150 MFC-8220 Port(FaxModem) 0151 MFC-8210J + 0153 DCP-1000J 0157 MFC-3420J Printer 0158 MFC-3820JN Port(FaxModem) 015d MFC Composite Device @@ -4962,7 +5782,7 @@ 017b Imagistics sx2100 0180 MFC-7420 0181 MFC-7820N Port(FaxModem) - 0182 Composite Device + 0182 DCP-7010 0183 DCP-7020 0184 DCP-7025 Printer 0185 MFC-7220 Printer @@ -4996,31 +5816,44 @@ 01ae DCP-750CW RemovableDisk 01af MFC-440CN 01b0 MFC-660CN - 01b1 MFC-665CW Remote Setup Port - 01b2 MFC-845CW Remote Setup Port - 01b4 MFC-460CN Remote Setup Port + 01b1 MFC-665CW + 01b2 MFC-845CW + 01b4 MFC-460CN 01b5 MFC-630CD 01b6 MFC-850CDN - 01b7 MFC-5460CN Remote Setup Port + 01b7 MFC-5460CN 01b8 MFC-5860CN 01ba MFC-3360C 01bd MFC-8660DN 01be DCP-750CN RemovableDisk - 01bf MFC-860CDN Remote Setup Port + 01bf MFC-860CDN 01c0 DCP-128C 01c1 DCP-129C 01c2 DCP-131C 01c3 DCP-329C 01c4 DCP-331C 01c5 MFC-239C - 01ca MFC-9440CN Remote Setup Port + 01c9 DCP-9040CN + 01ca MFC-9440CN + 01cb DCP-9045CDN + 01cc MFC-9840CDW 01ce DCP-135C 01cf DCP-150C 01d0 DCP-350C 01d1 DCP-560CN + 01d2 DCP-770CW + 01d3 DCP-770CN 01d4 MFC-230C 01d5 MFC-235C 01d6 MFC-260C + 01d7 MFC-465CN + 01d8 MFC-680CN + 01d9 MFC-685CW + 01da MFC-885CW + 01db MFC-480CN + 01dc MFC-650CD + 01dd MFC-870CDN + 01de MFC-880CDN 01df DCP-155C 01e0 MFC-265C 01e1 DCP-153C @@ -5031,20 +5864,330 @@ 01e9 DCP-7040 01ea DCP-7030 01eb MFC-7320 + 01ec MFC-9640CW 01f4 MFC-5890CN + 020a MFC-8670DN + 020c DCP-9042CDN + 020d MFC-9450CDN + 0216 MFC-8880DN + 0217 MFC-8480DN + 0219 MFC-8380DN + 021a MFC-8370DN + 021b DCP-8070D + 021c MFC-9320CW + 021d MFC-9120CN + 021e DCP-9010CN + 021f DCP-8085DN + 0220 MFC-9010CN + 0222 DCP-195C 0223 DCP-365CN + 0224 DCP-375CW + 0225 DCP-395CN + 0227 DCP-595CN + 0228 MFC-255CW + 0229 MFC-295CN + 022a MFC-495CW + 022b MFC-495CN + 022c MFC-795CW + 022d MFC-675CD + 022e MFC-695CDN + 022f MFC-735CD + 0230 MFC-935CDN + 0234 DCP-373CW + 0235 DCP-377CW + 0236 DCP-390CN + 0239 MFC-253CW + 023a MFC-257CW + 023e DCP-197C + 023f MFC-8680DN + 0240 MFC-J950DN + 0245 MFC-9560CDW 0248 DCP-7055 scanner/printer + 024e MFC-7460DN + 0253 DCP-J125 + 0254 DCP-J315W + 0255 DCP-J515W + 0256 DCP-J515N + 0257 DCP-J715W + 0258 DCP-J715N + 0259 MFC-J220 + 025a MFC-J410 + 025b MFC-J265W + 025c MFC-J415W + 025d MFC-J615W + 025e MFC-J615N + 025f MFC-J700D + 0260 MFC-J800D + 0261 MFC-J850DN + 026b MFC-J630W + 026d MFC-J805D + 026e MFC-J855DN + 026f MFC-J270W + 0270 MFC-7360N + 0273 DCP-7057 scanner/printer + 0276 MFC-5895CW + 0278 MFC-J410W + 0279 DCP-J525W + 027a DCP-J525N + 027b DCP-J725DW + 027c DCP-J725N + 027d DCP-J925DW + 027e MFC-J955DN + 027f MFC-J280W + 0280 MFC-J435W + 0281 MFC-J430W + 0282 MFC-J625DW + 0283 MFC-J825DW + 0284 MFC-J825N + 0285 MFC-J705D + 0287 MFC-J860DN + 0288 MFC-J5910DW + 0289 MFC-J5910CDW + 028a DCP-J925N + 028d MFC-J835DW + 028f MFC-J425W + 0290 MFC-J432W + 0291 DCP-8110DN + 0292 DCP-8150DN + 0293 DCP-8155DN + 0294 DCP-8250DN + 0295 MFC-8510DN + 0296 MFC-8520DN + 0298 MFC-8910DW + 0299 MFC-8950DW + 029a MFC-8690DW + 029c MFC-8515DN + 029e MFC-9125CN + 029f MFC-9325CW + 02a0 DCP-J140W + 02a5 MFC-7240 + 02a6 FAX-2940 + 02a7 FAX-2950 + 02a8 MFC-7290 + 02ab FAX-2990 + 02ac DCP-8110D + 02ad MFC-9130CW + 02ae MFC-9140CDN + 02af MFC-9330CDW + 02b0 MFC-9340CDW + 02b1 DCP-9020CDN + 02b2 MFC-J810DN + 02b3 MFC-J4510DW + 02b4 MFC-J4710DW + 02b5 DCP-8112DN + 02b6 DCP-8152DN + 02b7 DCP-8157DN + 02b8 MFC-8512DN + 02ba MFC-8912DW + 02bb MFC-8952DW + 02bc DCP-J540N + 02bd DCP-J740N + 02be MFC-J710D + 02bf MFC-J840N + 02c0 DCP-J940N + 02c1 MFC-J960DN + 02c2 DCP-J4110DW + 02c3 MFC-J4310DW + 02c4 MFC-J4410DW + 02c5 MFC-J4610DW + 02c6 DCP-J4210N + 02c7 MFC-J4510N + 02c8 MFC-J4910CDW + 02c9 MFC-J4810DN + 02ca MFC-8712DW + 02cb MFC-8710DW + 02cc MFC-J2310 + 02cd MFC-J2510 + 02ce DCP-7055W + 02cf DCP-7057W + 02d0 DCP-1510 + 02d1 MFC-1810 + 02d3 DCP-9020CDW + 02d4 MFC-8810DW + 02dd DCP-J4215N + 02de DCP-J132W + 02df DCP-J152W + 02e0 DCP-J152N + 02e1 DCP-J172W + 02e2 DCP-J552DW + 02e3 DCP-J552N + 02e4 DCP-J752DW + 02e5 DCP-J752N + 02e6 DCP-J952N + 02e7 MFC-J245 + 02e8 MFC-J470DW + 02e9 MFC-J475DW + 02ea MFC-J285DW + 02eb MFC-J650DW + 02ec MFC-J870DW + 02ed MFC-J870N + 02ee MFC-J720D + 02ef MFC-J820DN + 02f0 MFC-J980DN + 02f1 MFC-J890DN + 02f2 MFC-J6520DW + 02f3 MFC-J6570CDW + 02f4 MFC-J6720DW + 02f5 MFC-J6920DW + 02f6 MFC-J6970CDW + 02f7 MFC-J6975CDW + 02f8 MFC-J6770CDW + 02f9 DCP-J132N + 02fa MFC-J450DW + 02fb MFC-J875DW + 02fc DCP-J100 + 02fd DCP-J105 + 02fe MFC-J200 + 02ff MFC-J3520 + 0300 MFC-J3720 + 030f DCP-L8400CDN + 0310 DCP-L8450CDW + 0311 MFC-L8600CDW + 0312 MFC-L8650CDW + 0313 MFC-L8850CDW + 0314 MFC-L9550CDW + 0318 MFC-7365DN + 0320 MFC-L2740DW + 0321 DCP-L2500D + 0322 DCP-L2520DW + 0324 DCP-L2520D + 0326 DCP-L2540DN + 0328 DCP-L2540DW + 0329 DCP-L2560DW + 0330 HL-L2380DW + 0331 MFC-L2700DW + 0335 FAX-L2700DN + 0337 MFC-L2720DW + 0338 MFC-L2720DN + 0339 DCP-J4120DW + 033a MFC-J4320DW + 033c MFC-J2320 + 033d MFC-J4420DW + 0340 MFC-J4620DW + 0341 MFC-J2720 + 0342 MFC-J4625DW + 0343 MFC-J5320DW + 0346 MFC-J5620DW + 0347 MFC-J5720DW + 0349 DCP-J4220N + 034b MFC-J4720N + 034e MFC-J5720CDW + 034f MFC-J5820DN + 0350 MFC-J5620CDW + 0351 DCP-J137N + 0353 DCP-J557N + 0354 DCP-J757N + 0355 DCP-J957N + 0356 MFC-J877N + 0357 MFC-J727D + 0358 MFC-J987DN + 0359 MFC-J827DN + 035a MFC-J897DN + 035b DCP-1610W + 035c DCP-1610NW + 035d MFC-1910W + 035e MFC-1910NW + 0360 DCP-1618W + 0361 MFC-1919NW + 0364 MFC-J5625DW + 0365 MFC-J4520DW + 0366 MFC-J5520DW + 0367 DCP-7080D + 0368 DCP-7080 + 0369 DCP-7180DN + 036a DCP-7189DW + 036b MFC-7380 + 036c MFC-7480D + 036d MFC-7880DN + 036e MFC-7889DW + 036f DCP-9022CDW + 0370 MFC-9142CDN + 0371 MFC-9332CDW + 0372 MFC-9342CDW + 0373 MFC-L2700D + 0376 DCP-1600 + 0377 MFC-1900 + 0378 DCP-1608 + 0379 DCP-1619 + 037a MFC-1906 + 037b MFC-1908 + 037c ADS-2000e + 037d ADS-2100e + 037e ADS-2500We + 037f ADS-2600We + 0380 DCP-J562DW + 0381 DCP-J562N + 0383 DCP-J962N + 0384 MFC-J480DW + 0385 MFC-J485DW + 0386 MFC-J460DW + 0388 MFC-J680DW + 0389 MFC-J880DW + 038a MFC-J885DW + 038b MFC-J880N + 038c MFC-J730DN + 038d MFC-J990DN + 038e MFC-J830DN + 038f MFC-J900DN + 0390 MFC-J5920DW + 0392 MFC-L2705DW + 0393 DCP-T300 + 0394 DCP-T500W + 0395 DCP-T700W + 0396 MFC-T800W + 0397 DCP-J963N + 03b3 MFC-J6925DW + 03b4 MFC-J6573CDW + 03b5 MFC-J6973CDW + 03b6 MFC-J6990CDW + 03bb MFC-L2680W + 03bc MFC-L2700DN + 03bd DCP-J762N + 03fd ADS-2700W 1000 Printer 1002 Printer 2002 PTUSB Printing 2004 PT-2300/2310 p-Touch Laber Printer - 2015 QL-500 P-touch label printer - 2016 QL-550 P-touch label printer + 2007 PT-2420PC P-touch Label Printer + 2015 QL-500 label printer + 2016 QL-550 printer 201a PT-18R P-touch label printer - 201b QL-650TD P-Touch Label Printer - 2027 QL-560 P-Touch Label Printer - 202b PT-7600 P-Touch Label Printer + 201b QL-650TD Label Printer + 2020 QL-1050 Label Printer + 2027 QL-560 Label Printer + 2028 QL-570 Label Printer + 202a QL-1060N Label Printer + 202b PT-7600 P-touch Label Printer + 202c PT-1230PC P-touch Label Printer E mode + 202d PT-2430PC P-touch Label Printer + 2030 PT-1230PC P-touch Label Printer EL mode + 2041 PT-2730 P-touch Label Printer + 2042 QL-700 Label Printer + 2043 QL-710W Label Printer + 2044 QL-720NW Label Printer + 204d QL-720NW Label Printer (mass storage mode) + 2061 PT-P700 P-touch Label Printer + 2064 PT-P700 P-touch Label Printer RemovableDisk + 209b QL-800 Label Printer + 209c QL-810W Label Printer + 209d QL-820NWB Label Printer + 20a7 QL-1100 Label Printer + 20a8 QL-1110NWB Label Printer + 20a9 QL-1100 Label Printer (mass storage) + 20aa QL-1110NWB Label Printer (mass storage) + 20ab QL-1115NWB Label Printer + 20ac QL-1115NWB Label Printer (mass storage) + 20c0 QL-600 Label Printer 2100 Card Reader Writer + 2102 Sewing machine + 60a0 ADS-2000 + 60a1 ADS-2100 + 60a4 ADS-2500W + 60a5 ADS-2600W + 60a6 ADS-1000W + 60a7 ADS-1100W + 60a8 ADS-1500W + 60a9 ADS-1600W 04fa Dallas Semiconductor 2490 DS1490F 2-in-1 Fob, 1-Wire adapter 4201 DS4201 Audio DAC @@ -5056,11 +6199,12 @@ 0015 ViewMate Desktop Mouse CC2201 00d3 00052486 / Laser Mouse M1052 [hama] 0171 SPCA1527A/SPCA1528 SD card camera (Mass Storage mode) - 0201 RS232C Adapter + 0201 SPCP825 RS232C Adapter 0232 Fingerprint 0538 Wireless Optical Mouse 2.4G [Bright] 0561 Flexcam 100 05d8 Wireless keyboard/mouse + 05da SPEEDLINK SNAPPY Wireless Mouse Nano 0c15 SPIF215A SATA bridge 0c25 SATALink SPIF225A 1528 SPCA1527A/SPCA1528 SD card camera (webcam mode) @@ -5072,13 +6216,16 @@ 5330 Digitrex 2110 5331 Vivitar Vivicam 10 5360 Sunplus Generic Digital Camera + 5563 Digital Media Player MP3/WMA [The Sharper Image] 5720 Card Reader Driver + 6333 Siri A9 UVC chipset 7333 Finet Technology Palmpix DC-85 757a Aiptek, MP315 MP3 Player ffff PureDigital Ritz Disposable 04fd Soliton Systems, K.K. 0003 Smart Card Reader II 04fe PFU, Ltd + 0006 Happy Hacking Keyboard Lite2 04ff E-CMOS Corp. 0500 Siam United Hi-Tech 0001 DART Keyboard Mouse @@ -5093,12 +6240,17 @@ 16e1 n10 Handheld Sync 16e2 n20 Pocket PC Sync 16e3 n30 Handheld Sync + 2008 Liquid Gallant Duo E350 (preloader) 3202 Liquid 3203 Liquid (Debug mode) 3230 BeTouch E120 3317 Liquid 3325 Iconia tablet A500 3341 Iconia tablet A500 + 33c3 Liquid Gallant Duo E350 + 33c4 Liquid Gallant Duo E350 (debug mode) + 33c7 Liquid Gallant Duo E350 (USB tethering) + 33c8 Liquid Gallant Duo E350 (debug mode, USB tethering) d001 Divio NW801/DVC-V6+ Digital Camera 0503 Hitachi America, Ltd 0504 Hayes Microcomputer Products @@ -5135,7 +6287,7 @@ 0004 Direct Connect 0012 F8T012 Bluetooth Adapter 0013 F8T013 Bluetooth Adapter - 0017 B8T017 Bluetooth+EDR 2.1 + 0017 B8T017 Bluetooth+EDR 2.1 / F4U017 USB 2.0 7-port Hub 003a Universal Media Reader 0050 F5D6050 802.11b Wireless Adapter v2000 [Atmel at76c503a] 0081 F8T001v2 Bluetooth @@ -5165,9 +6317,11 @@ 0257 F5U257 Serial 0304 FSU304 USB 2.0 - 4 Ports Hub 0307 USB 2.0 - 7 ports Hub [FSU307] + 038c F2CU038 HDMI Adapter 0409 F5U409 Serial 0416 Staples 12416 7 port desktop hub 0551 F6C550-AVR UPS + 065a F8T065BF Mini Bluetooth 4.0 Adapter 0706 2-N-1 7-Port Hub (Lower half) 0802 Nostromo n40 Gamepad 0803 Nostromo 1745 GamePad @@ -5180,11 +6334,13 @@ 1103 F9L1103 N750 DB 802.11abgn 2x3:3 [Ralink RT3573] 1106 F9L1106v1 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526] 1109 F9L1109v1 802.11a/b/g/n/ac Wireless Adapter [Realtek RTL8812AU] + 110a F9L1101v2 802.11abgn Wireless Adapter [Realtek RTL8192DU] 11f2 ISY Wireless Micro Adapter IWL 2000 [RTL8188CUS] 1202 F5U120-PC Parallel Printer Port 1203 F5U120-PC Serial Port 2103 F7D2102 802.11n N300 Micro Wireless Adapter v3000 [Realtek RTL8192CU] 21f1 N300 WLAN N Adapter [ISY] + 21f2 RTL8192CU 802.11n WLAN Adapter [ISY IWL 4000] 258a F5U258 Host to Host cable 3101 F1DF102U/F1DG102U Flip Hub 3201 F1DF102U/F1DG102U Flip KVM @@ -5192,7 +6348,7 @@ 5055 F5D5055 Gigabit Network Adapter [AX88xxx] 6050 F6D6050 802.11abgn Wireless Adapter [Broadcom BCM4323] 6051 F5D6051 802.11b Wireless Network Adapter [ZyDAS ZD1201] - 615a F7D4101 / F9L1101 802.11abgn Wireless Adapter [Broadcom BCM4323] + 615a F7D4101 / F9L1101v1 802.11abgn Wireless Adapter [Broadcom BCM4323] 7050 F5D7050 Wireless G Adapter v1000/v2000 [Intersil ISL3887] 7051 F5D7051 802.11g Adapter v1000 [Broadcom 4320 USB] 705a F5D7050 Wireless G Adapter v3000 [Ralink RT2571W] @@ -5262,6 +6418,7 @@ 1080 NET1080 USB-USB Bridge 1200 SSDC Adapter II 1265 File-backed Storage Gadget + 3424 Lumidigm Venus fingerprint sensor a0f0 Cambridge Electronic Devices Power1401 mk 2 a140 USB Clik! 40 a141 (OME) PocketZip 40 MP3 Player Driver @@ -5271,7 +6428,7 @@ a4a2 Linux-USB Ethernet/RNDIS Gadget a4a3 Linux-USB user-mode isochronous source/sink a4a4 Linux-USB user-mode bulk source/sink - a4a5 Pocketbook Pro 903 + a4a5 Pocketbook Pro 903 / Mobius 2 Action Cam / xDuoo X3 a4a6 Linux-USB Serial Gadget a4a7 Linux-USB Serial Gadget (CDC ACM mode) a4a8 Linux-USB Printer Gadget @@ -5291,7 +6448,7 @@ 7569 Live! Pro (A) 756a Live! Pro Audio (O) 0529 Aladdin Knowledge Systems - 0001 HASP v0.06 + 0001 HASP copy protection dongle 030b eToken R1 v3.1.3.x 0313 eToken R1 v3.2.3.x 031b eToken R1 v3.3.3.x @@ -5393,6 +6550,7 @@ dccf Sound Vision Stream Driver 0547 Anchor Chips, Inc. 0001 ICSI Bluetooth Device + 0080 I3SYSTEM HYUNY 1002 Python2 WDM Encoder 1006 Hantek DSO-2100 UF 2131 AN2131 EZUSB Microcontroller @@ -5402,7 +6560,11 @@ 2727 Xircom PGUNET USB-USB Bridge 2750 EZ-Link (EZLNKUSB.SYS) 2810 Cypress ATAPI Bridge + 4018 AmScope MU1803 4d90 AmScope MD1900 camera + 6010 AmScope MU1000 camera + 6510 Touptek UCMOS05100KPA + 7000 PowerSpec MCE460 Front Panel LED Display 7777 Bluetooth Device 9999 AN2131 uninitialized (?) 0548 Tyan Computer Corp. @@ -5413,7 +6575,7 @@ 054c Sony Corp. 0001 HUB 0002 Standard HUB - 0010 DSC-S30/S70/S75/F505V/F505/FD92/W1 Cybershot/Mavica Digital Camera + 0010 Cyber-shot, Mavica (msc) 0014 Nogatech USBVision (SY) 0022 Storage Adapter V2 (TPP) 0023 CD Writer @@ -5433,6 +6595,7 @@ 003c VAIO-MX LCD Control 0045 Digital Imaging Video 0046 Network Walkman + 0049 UP-D895 004a Memory Stick Hi-Fi System 004b Memory Stick Reader/Writer 004e DSC-xxx (ptp) @@ -5484,6 +6647,7 @@ 014c Aiwa AM-NX9 Net MD Music Recorder MDLP 014d Memory Stick Reader/Writer 0154 Eyetoy Audio Device + 0155 Eyetoy Video Device 015f IC Recorder (BM) 0169 Clie PEG-TJ35 PDA Serial 016a Clie PEG-TJ35 PDA Mass Storage @@ -5516,6 +6680,7 @@ 01d0 DVD+RW External Drive DRU-700A 01d5 IC RECORDER 01de VRD-VC10 [Video Capture] + 01e7 UP-D897 01e8 UP-DR150 Photo Printer 01e9 Net MD 01ea Hi-MD WALKMAN @@ -5529,6 +6694,7 @@ 021b Net MD 021c Hi-MD WALKMAN 021d Net MD + 0226 UP-CR10L 0227 Printing Support 022c Net MD 022d Hi-MD AUDIO @@ -5559,6 +6725,8 @@ 02c4 Device 02d1 DVD RW 02d2 PSP Slim + 02d4 UP-CX1 + 02d8 SBAC-US10 SxS PRO memory card reader/writer 02e1 FeliCa S330 [PaSoRi] 02ea PlayStation 3 Memory Card Adaptor 02f9 DSC-H9 @@ -5571,10 +6739,15 @@ 0348 HandyCam HDR-TG3E 035b Walkman NWZ-A828 035c NWZ-A726/A728/A729 + 035f UP-DR200 Photo Printer 0382 Memory Stick PRO-HG Duo Adaptor (MSAC-UAH1) 0385 Walkman NWZ-E436F 0387 IC Recorder (P) 03bc Webbie HD - MHS-CM1 + 03c3 UP-DR80MD + 03c4 Stryker SDP1000 + 03c5 UP-DR80 + 03cc SD Card Reader 03d1 DPF-X95 03d3 DR-BT100CX 03d5 PlayStation Move motion controller @@ -5584,7 +6757,27 @@ 0440 DSC-H55 0485 MHS-PM5 HD camcorder 04cb WALKMAN NWZ-E354 + 0541 DSC-HX100V [Cybershot Digital Still Camera] + 05c4 DualShock 4 [CUH-ZCT1x] + 0689 Walkman NWZ-B173F 06bb WALKMAN NWZ-F805 + 06c3 RC-S380 + 07c4 ILCE-6000 (aka Alpha-6000) in Mass Storage mode + 082f Walkman NWZW Series + 0847 WG-C10 Portable Wireless Server + 0884 MDR-ZX770BN [Wireless Noise Canceling Stereo Headset] + 088c Portable Headphone Amplifier + 08b7 ILCE-6000 (aka Alpha-6000) in MTP mode + 094e ILCE-6000 (aka Alpha-6000) in PC Remote mode + 0994 ILCE-6000 (aka Alpha-6000) in charging mode + 09cc DualShock 4 [CUH-ZCT2x] + 0ba0 Dualshock4 Wireless Adaptor + 0bb5 Headset MDR-1000X + 0c02 ILCE-7M3 [A7III] in Mass Storage mode + 0c03 ILCE-7M3 [A7III] in MTP mode + 0c34 ILCE-7M3 [A7III] in PC Remote mode + 0cd3 WH-1000XM3 [Wireless Noise-Canceling Headphones] + 0cda PlayStation Classic controller 1000 Wireless Buzz! Receiver 054d Try Corp. 054e Proside Corp. @@ -5593,6 +6786,9 @@ 0002 InkJet Color Printer 0004 InkJet Color Printer 0005 InkJet Color Printer + 000b Workcentre 24 + 014e CM215b Printer + 0165 DocuPrint M215b 0551 CompuTrend Systems, Inc. 0552 Philips Monitors 0553 STMicroelectronics Imaging Division (VLSI Vision) @@ -5622,6 +6818,7 @@ 2009 UC-210T Ethernet 2011 UC-2324 4xSerial Ports [mos7840] 2202 CS124U Miniview II KVM Switch + 2212 Keyboard/Mouse 2213 CS682 2-Port USB 2.0 DVI KVM Switch 2221 Winbond Hermon 2404 4-port switch @@ -5630,7 +6827,7 @@ 4000 DSB-650 10Mbps Ethernet [klsi] 7000 Hub 7820 UC-2322 2xSerial Ports [mos7820] - 8021 CS1764A [CubiQ DVI KVMP Switch] + 8021 Hub 0558 Truevision, Inc. 1009 GW Instek GDS-1000 Oscilloscope 100a GW Instek GDS-1000A Oscilloscope @@ -5685,6 +6882,7 @@ 0408 BearPaw 2448 CU Pro 0409 BearPaw 2448 TA Pro 040b ScanExpress A3 USB 1200 PRO + 0501 ScanExpress A3 2400 Pro 0873 ScanExpress 600 USB 1000 BearPaw 4800 TA Pro a350 gSmart 350 Camera @@ -5734,8 +6932,14 @@ 2800 MIC K/B 2801 MIC K/B Mouse 2802 Kbd Hub + 3002 Keyboard 3004 Genius KB-29E + 3013 BakkerElkhuizen Wired Keyboard S-board 840 Design + 3020 BakkerElkhuizen Wired Keyboard S-board 840 Design USB-Hub + 3027 Sun-Flex ProTouch 3107 Keyboard + 3132 Optical mouse M-DY4DR / M-DY6DR + 4006 FID 638 Mouse (Sun Microsystems) 0567 Xyratex International, Ltd 0568 Quartz Ingenierie 0569 SegaSoft @@ -5743,27 +6947,27 @@ 0000 PenPartner 0001 PenPartner 4x5 0002 PenPartner 6x8 - 0003 Cintiq Partner - 0010 Graphire - 0011 Graphire 2 4x5 - 0012 Graphire 2 5x7 - 0013 Graphire 3 4x5 - 0014 Graphire 3 6x8 - 0015 Graphire 4 4x5 - 0016 Graphire 4 6x8 - 0017 CTE-450 [Bamboo Fun] - 0018 Bamboo Fun 6x8 - 0019 Bamboo One Medium - 0020 Intuos 4x5 - 0021 Intuos 6x8 - 0022 Intuos 9x12 - 0023 Intuos 12x12 - 0024 Intuos 12x18 - 0026 Intuos5 touch S - 0027 Intuos5 touch M - 0028 Intuos5 touch L - 0029 Intuos5 S - 002a Intuos5 M + 0003 PTU-600 [Cintiq Partner] + 0010 ET-0405 [Graphire] + 0011 ET-0405A [Graphire2 (4x5)] + 0012 ET-0507A [Graphire2 (5x7)] + 0013 CTE-430 [Graphire3 (4x5)] + 0014 CTE-630 [Graphire3 (6x8)] + 0015 CTE-440 [Graphire4 (4x5)] + 0016 CTE-640 [Graphire4 (6x8)] + 0017 CTE-450 [Bamboo Fun (small)] + 0018 CTE-650 [Bamboo Fun (medium)] + 0019 CTE-631 [Bamboo One] + 0020 GD-0405 [Intuos (4x5)] + 0021 GD-0608 [Intuos (6x8)] + 0022 GD-0912 [Intuos (9x12)] + 0023 GD-1212 [Intuos (12x12)] + 0024 GD-1218 [Intuos (12x18)] + 0026 PTH-450 [Intuos5 touch (S)] + 0027 PTH-650 [Intuos5 touch (M)] + 0028 PTH-850 [Intuos5 touch (L)] + 0029 PTK-450 [Intuos5 (S)] + 002a PTK-650 [Intuos5 (M)] 0030 PL400 0031 PL500 0032 PL600 @@ -5773,51 +6977,170 @@ 0037 PL700 0038 PL510 0039 DTU-710 - 003f Cintiq 21UX (DTZ-2100) - 0041 Intuos2 4x5 - 0042 Intuos2 6x8 - 0043 Intuos2 9x12 - 0044 Intuos2 12x12 - 0045 Intuos2 12x18 + 003a DTI-520 + 003b Integrated Hub + 003f DTZ-2100 [Cintiq 21UX] + 0041 XD-0405-U [Intuos2 (4x5)] + 0042 XD-0608-U [Intuos2 (6x8)] + 0043 XD-0912-U [Intuos2 (9x12)] + 0044 XD-1212-U [Intuos2 (12x12)] + 0045 XD-1218-U [Intuos2 (12x18)] 0047 Intuos2 6x8 - 0060 Volito - 0061 PenStation2 - 0062 Volito2 4x5 - 0063 Volito2 2x3 - 0064 PenPartner2 - 0065 Bamboo - 0069 Bamboo One - 0081 Graphire Wireless 6x8 + 0057 DTK-2241 + 0059 DTH-2242 tablet + 005b DTH-2200 [Cintiq 22HD Touch] tablet + 005d DTH-2242 touchscreen + 005e DTH-2200 [Cintiq 22HD Touch] touchscreen + 0060 FT-0405 [Volito, PenPartner, PenStation (4x5)] + 0061 FT-0203 [Volito, PenPartner, PenStation (2x3)] + 0062 CTF-420 [Volito2] + 0063 CTF-220 [BizTablet] + 0064 CTF-221 [PenPartner2] + 0065 MTE-450 [Bamboo] + 0069 CTF-430 [Bamboo One] + 006a CTE-460 [Bamboo One Pen (S)] + 006b CTE-660 [Bamboo One Pen (M)] + 0081 CTE-630BT [Graphire Wireless (6x8)] + 0084 ACK-40401 [Wireless Accessory Kit] 0090 TPC90 0093 TPC93 + 0097 TPC97 009a TPC9A - 00b0 Intuos3 4x5 - 00b1 Intuos3 6x18 - 00b2 Intuos3 9x12 - 00b3 Intuos3 12x12 - 00b4 Intuos3 12x19 - 00b5 Intuos3 6x11 (PTZ-631W) - 00b7 Intuos3 4x6 - 00b8 Intuos4 4x6 - 00b9 Intuos4 6x9 - 00ba Intuos4 8x13 - 00bb Intuos4 12x19 + 00a2 STU-300B [LCD signature pad] + 00b0 PTZ-430 [Intuos3 (4x5)] + 00b1 PTZ-630 [Intuos3 (6x8)] + 00b2 PTZ-930 [Intuos3 (9x12)] + 00b3 PTZ-1230 [Intuos3 (12x12)] + 00b4 PTZ-1231W [Intuos3 (12x19)] + 00b5 PTZ-631W [Intuos3 (6x11)] + 00b7 PTZ-431W [Intuos3 (4x6)] + 00b8 PTK-440 [Intuos4 (4x6)] + 00b9 PTK-640 [Intuos4 (6x9)] + 00ba PTK-840 [Intuos4 (8x13)] + 00bb PTK-1240 [Intuos4 (12x19)] 00c0 DTF-521 00c4 DTF-720 - 00c5 Cintiq 20WSX - 00c6 Cintiq 12WX + 00c5 DTZ-2000W [Cintiq 20WSX] + 00c6 DTZ-1200W [Cintiq 12WX] 00c7 DTU-1931 - 00cc Cintiq 21UX (DTK-2100) - 00d1 Bamboo Pen & Touch (CTH-460-DE) - 00d3 Bamboo Fun (CTH-661) - 00d6 Bamboo Pen & Touch (CTH-460) - 00db Bamboo Fun (CTH-661SE-NL) - 00dd Bamboo Pen (CTL-470) + 00cc DTK-2100 [Cintiq 21UX] + 00ce DTU-2231 + 00d0 CTT-460 [Bamboo Touch] + 00d1 CTH-460 [Bamboo Pen & Touch] + 00d2 CTH-461 [Bamboo Fun/Craft/Comic Pen & Touch (S)] + 00d3 CTH-661 [Bamboo Fun/Comic Pen & Touch (M)] + 00d4 CTL-460 [Bamboo Pen (S)] + 00d5 CTL-660 [Bamboo Pen (M)] + 00d6 CTH-460 [Bamboo Pen & Touch] + 00d7 CTH-461 [Bamboo Fun/Craft/Comic Pen & Touch (S)] + 00d8 CTH-661 [Bamboo Fun/Comic Pen & Touch (M)] + 00d9 CTT-460 [Bamboo Touch] + 00da CTH-461SE [Bamboo Pen & Touch Special Edition (S)] + 00db CTH-661SE [Bamboo Pen & Touch Special Edition (M)] + 00dc CTT-470 [Bamboo Touch] + 00dd CTL-470 [Bamboo Connect] 00de CTH-470 [Bamboo Fun Pen & Touch] - 00f6 Cintiq 24HD touch (DTH-2400) touchscreen - 00f8 Cintiq 24HD touch (DTH-2400) tablet + 00df CTH-670 [Bamboo Create/Fun] + 00e2 TPCE2 + 00e3 TPCE3 + 00e5 TPCE5 + 00e6 TPCE6 + 00ec TPCEC + 00ed TPCED + 00ef TPCEF + 00f0 DTU-1631 + 00f4 DTK-2400 [Cintiq 24HD] tablet + 00f6 DTH-2400 [Cintiq 24HD touch] touchscreen + 00f8 DTH-2400 [Cintiq 24HD touch] tablet + 00f9 DTK-2200 [Cintiq 22HD] hub + 00fa DTK-2200 [Cintiq 22HD] tablet + 00fb DTU-1031 + 0100 TPC100 + 0101 TPC101 + 010d TPC10D + 010e TPC10E + 010f TPC10F + 0116 TPC116 + 012c TPC12C + 0221 MDP-123 [Inkling] + 0300 CTL-471 [Bamboo Splash, One by Wacom (S)] + 0301 CTL-671 [One by Wacom (M)] + 0302 CTH-480 [Intuos Pen & Touch (S)] + 0303 CTH-680 [Intuos Pen & Touch (M)] + 0304 DTK-1300 [Cintiq 13HD] + 0307 DTH-A1300 [Cintiq Companion Hybrid] tablet + 0309 DTH-A1300 [Cintiq Companion Hybrid] touchscreen + 030e CTL-480 [Intuos Pen (S)] + 0314 PTH-451 [Intuos pro (S)] + 0315 PTH-651 [Intuos pro (M)] + 0317 PTH-851 [Intuos pro (L)] + 0318 CTH-301 [Bamboo] + 0319 CTH-300 [Bamboo Pad wireless] + 0323 CTL-680 [Intuos Pen (M)] + 032a DTK-2700 [Cintiq 27QHD] + 032b DTH-2700 [Cintiq 27QHD touch] tablet + 032c DTH-2700 [Cintiq 27QHD touch] touchscreen + 032f DTU-1031X + 0331 ACK-411050 [ExpressKey Remote] + 0333 DTH-1300 [Cintiq 13HD Touch] tablet + 0335 DTH-1300 [Cintiq 13HD Touch] touchscreen + 0336 DTU-1141 + 033b CTL-490 [Intuos Draw (S)] + 033c CTH-490 [Intuos Art/Photo/Comic (S)] + 033d CTL-690 [Intuos Draw (M)] + 033e CTH-690 [Intuos Art (M)] + 0343 DTK-1651 + 0347 DTH-W1620 [MobileStudio Pro 16] internal hub + 0348 DTH-W1620 [MobileStudio Pro 16] external hub + 034a DTH-W1320 [MobileStudio Pro 13] touchscreen + 034b DTH-W1620 [MobileStudio Pro 16] touchscreen + 034d DTH-W1320 [MobileStudio Pro 13] tablet + 034e DTH-W1620 [MobileStudio Pro 16] tablet + 034f DTH-1320 [Cintiq Pro 13] tablet + 0350 DTH-1620 [Cintiq Pro 16] tablet + 0351 DTH-2420 [Cintiq Pro 24 PT] tablet + 0352 DTH-3220 [Cintiq Pro 32] tablet + 0353 DTH-1320 [Cintiq Pro 13] touchscreen + 0354 DTH-1620 [Cintiq Pro 16] touchscreen + 0355 DTH-2420 [Cintiq Pro 24 PT] touchscreen + 0356 DTH-3220 [Cintiq Pro 32] touchscreen + 0357 PTH-660 [Intuos Pro (M)] + 0358 PTH-860 [Intuos Pro (L)] + 0359 DTU-1141B + 035a DTH-1152 tablet + 0368 DTH-1152 touchscreen + 0374 CTL-4100 [Intuos (S)] + 0375 CTL-6100 [Intuos (M)] + 0376 CTL-4100WL [Intuos BT (S)] + 0378 CTL-6100WL [Intuos BT (M)] + 037a CTL-472 [One by Wacom (S)] + 037b CTL-672 [One by Wacom (M)] + 037c DTK-2420 [Cintiq Pro 24 P] + 037d DTH-2452 tablet + 037e DTH-2452 touchscreen + 0382 DTK-2451 tablet + 038a DTH-3220 [Cintiq Pro 32] internal hub + 038d DTH-3220 [Cintiq Pro 32] internal hub + 038e DTH-3220 [Cintiq Pro 32] external hub + 038f DTH-3220 [Cintiq Pro 32] internal hub + 0390 DTK-1660 [Cintiq 16] + 0392 PTH-460 [Intuos Pro (S)] + 0396 DTK-1660E + 0398 DTH-W1320 [MobileStudio Pro 13] tablet + 0399 DTH-W1620 [MobileStudio Pro 16] tablet + 039a DTH-W1320 [MobileStudio Pro 13] touchscreen + 039b DTH-W1620 [MobileStudio Pro 16] touchscreen + 039c DTH-W1320 [MobileStudio Pro 16] external hub + 039d DTH-W1320 [MobileStudio Pro 16] internal hub + 03aa DTH-W1620 [MobileStudio Pro 16] tablet + 03ac DTH-W1620 [MobileStudio Pro 16] touchscreen 0400 PenPartner 4x5 + 4001 TPC4001 + 4004 TPC4004 4850 PenPartner 6x8 + 5000 TPC5000 + 5002 TPC5002 + 5010 TPC5010 056b Decicon, Inc. 056c eTEK Labs 0006 KwikLink Host-Host Connector @@ -5829,10 +7152,122 @@ 0001 Monitor 0002 HID Monitor Controls 0003 Device Bay Controller + 4001 Monitor 056e Elecom Co., Ltd 0002 29UO Mouse - 0072 Mouse + 0057 Micro Grast Pop M-PGDL + 005c Micro Grast Pop M-PG2DL + 005d Micro Grast Fit M-FGDL + 005e Micro Grast Fit M-FG2DL + 0062 Optical mouse M-D18DR + 0063 Laser mouse M-SODL + 0069 Laser mouse M-GE1UL + 0071 Laser mouse M-GE3DL + 0072 Laser mouse M-LS6UL + 0073 Laser mouse M-LS7UL + 0074 Optical mouse M-FW1UL + 0075 Laser mouse M-FW2DL + 0077 Laser mouse M-LY2UL + 0079 Laser mouse M-D21DL + 007b Laser mouse M-D20DR + 007c Laser Bluetooth mouse M-BT5BL + 007e Option mouse M-M8UR + 007f Option mouse M-M9UR + 0081 Option mouse M-DY6DR + 0082 Laser mouse M-D22DR + 0088 Micro Grast2 Bit M-BG3DL + 0089 Micro Grast2 Pop M-PG3DL + 008c M-NE3DL Mouse + 008d ORIME M-NE4DR + 008f M-BT8BL Bluetooth Mouse + 0092 Wireless BlueLED Mouse (M-BL2DB) + 009c IR Mouse M-IR02DR + 009d IR Mouse M-IR03DR + 009f BlueLED Mouse M-HS1DB + 00a1 IR Mouse M-IR05DR + 00a4 Blue LED Mouse M-BL06DB + 00a5 M-NV1BR Bluetooth Mouse + 00a7 Blue LED Mouse M-BL08DB + 00a8 M-BL09DB Mouse + 00a9 M-BL10UB Mouse + 00aa M-BL11DB Mouse + 00ac M-A-BL01UL / M-BL15DB Mouse + 00b4 Track on Glass Mouse M-TG02DL + 00b5 Track on Glass Mouse M-TG03UL + 00b6 Track on Glass Mouse M-TG04DL + 00b8 M-A-BL01UL or M-ASKL2 Mouse + 00b9 M-A-BL02DB or M-ASKL Mouse + 00cb M-BL21DB Mouse + 00cd M-XG1UB Mouse + 00ce M-XG1DB Mouse + 00cf M-XG1BB Bluetooth Mouse + 00d0 M-XG2UB Mouse + 00d1 M-XG2DB Mouse + 00d2 M-XG2BB Bluetooth Mouse + 00d3 M-XG3DL Mouse + 00d4 M-LS11DL Mouse + 00da M-XG4UB Mouse + 00db M-XG4DB Mouse + 00dc M-XG4BB Bluetooth Mouse + 00dd M-LS12UL Mouse + 00de M-LS13UL Mouse + 00df M-BL22DB Mouse + 00e1 M-WK01DB or M-A-BL04DB + 00e2 M-A-BL03DB + 00e3 M-XGx10UB + 00e4 M-XGx10DB + 00e5 M-XGx10BB + 00e6 M-XGx20DL or M-XGx20DB UltimateLaser Mouse + 00f1 M-XT1DRBK USB EX-G Wireless Optical TrackBall + 00f2 M-XT1URBK EX-G Optical Trackball + 00f3 M-BL23DB + 00f4 M-BT13BL LBT-UAN05C2 + 00f7 M-KN1DB + 00f8 M-BL22DB Mouse (other version) + 00f9 M-XT2URBK EX-G Optical TrackBall + 00fa M-XT2DRBK EX-G Wireless Optical TrackBall + 00fb M-XT3URBK EX-G Optical TrackBall + 00fc M-XT3DRBK EX-G Wireless Optical TrackBall + 00fd M-XT4DRBK EX-G Wireless Optical TrackBall + 00fe M-DT1URBK or M-DT2URBK DEFT Optical TrackBall + 00ff M-DT1DRBK or M-DT2DRBK DEFT Wireless Optical Mouse + 0101 M-BL25UBS + 0103 M-BT16BBS + 0104 M-BL26UBC + 0105 M-BL26DBC + 0107 M-LS15UL + 0108 M-LS15DL + 0109 M-LS16UL Mouse + 010a M-LS16DL / M-KN2DLS + 010b M-BL21DB Mouse + 010c M-HT1URBK HUGE Optical TrackBall + 010d M-HT1DRBK HUGE Wireless Optical TrackBall + 010e M-KS1DBS / M-FPG3DBS + 010f M-FBG3DB + 0115 M-BT13BL + 0121 M-ED01DB + 0122 M-NK01DB + 0124 Dual connect Mouse M-DC01MB Bluetooth + 0128 TrackBall Mouse M-XPT1MR Wired + 0129 TrackBall Mouse M-XPT1MR Wireless + 0130 TrackBall Mouse M-XPT1MR Bluetooth + 0131 TrackBall Mouse M-DPT1MR Wired + 0132 TrackBall Mouse M-DPT1MR Wireless + 0133 TrackBall Mouse M-DPT1MR Bluetooth + 0136 M-BT20BB + 0137 BlueTooth 4.0 Mouse M-BT21BB + 0138 M-A-BL07DB + 0140 M-G01UR + 0141 M-Y9UB + 0142 M-DY13DB + 0144 M-FBL01DB + 1055 TK-DCP03 WIRED + 1057 TK-DCP03 BT + 2003 JC-U3613M + 2004 JC-U3613M 200c LD-USB/TX + 200f JC-U4013S Gamepad + 2012 JC-U4013S Gamepad 4002 Laneed 100Mbps Ethernet LD-USB/TX [pegasus] 4005 LD-USBL/TX 400b LD-USB/TX @@ -5852,6 +7287,7 @@ 0040 Wondereye CP-115 Webcam 0041 Webcam Notebook 0042 Webcam Notebook + 0320 DVBSky T330 DVB-T2/C tuner 1232 V.90 modem 1234 Typhoon Redfun Modem V90 56k 1252 HCF V90 Data Fax Voice Modem @@ -5859,12 +7295,19 @@ 1300 SoftK56 Data Fax Voice CARP 1301 Modem Enumerator 1328 TrendNet TFM-561 modem + 1804 HP Dock Audio 2000 SoftGate 802.11 Adapter 2002 SoftGate 802.11 Adapter 262a tm5600 Video & Audio Grabber Capture + 680c DVBSky T680C DVB-T2/C tuner + 6831 DVBSky S960 DVB-S2 tuner 8390 WinFast PalmTop/Novo TV Video 8392 WinFast PalmTop/Novo TV Video + 960c DVBSky S960C DVB-S2 tuner + c686 Geniatech T220A DVB-T2 TV Stick + c688 Geniatech T230 DVB-T2 TV Stick cafc CX861xx ROM Boot Loader + cafd CX82310 ROM Boot Loader cafe AccessRunner ADSL Modem cb00 ADSL Modem cb01 ADSL Modem @@ -5951,7 +7394,7 @@ 2000 ISDN-Connector FRITZ!X 2200 BlueFRITZ! 2300 Teledat X130 DSL - 2800 ISDN-Connector TA + 2800 Teledat 2a/b / X120 / NetXXL ISDN Terminal Adapter 3200 Teledat X130 DSL 3500 FRITZ!Card DSL SL 3701 FRITZ!Box SL @@ -5959,7 +7402,7 @@ 3800 BlueFRITZ! Bluetooth Stick 3a00 FRITZ!Box Fon 3c00 FRITZ!Box WLAN - 3d00 Fritz!Box + 3d00 FRITZ!Box Fon WLAN 7050/7140/7170/IAD3331 3e01 FRITZ!Box (Annex A) 4001 FRITZ!Box Fon (Annex A) 4101 FRITZ!Box WLAN (Annex A) @@ -5975,14 +7418,26 @@ 8402 Fritz!WLAN N 2.4 [Atheros AR9001U] 8403 Fritz!WLAN N v2 [Atheros AR9271] 84ff AVM Fritz!WLAN USB N (in CD-ROM-mode) + 8501 FRITZ WLAN N v2 [RT5572/rt2870.bin] 057d Shark Multimedia, Inc. 057e Nintendo Co., Ltd + 0300 USB-EXI Adapter (GCP-2000) + 0304 RVT-H Reader 0305 Broadcom BCM2045A Bluetooth Radio [Nintendo Wii] 0306 Wii Remote Controller RVL-003 + 0337 Wii U GameCube Controller Adapter + 2000 Switch + 2006 Joy-Con L + 2007 Joy-Con R + 2009 Switch Pro Controller + 200e Joy-Con Charging Grip + 3000 SDK Debugger 057f QuickShot, Ltd 6238 USB StrikePad 0580 Denron, Inc. 0581 Racal Data Group + 0107 Tera Barcode Scanner 2.4 GHz Receiver + 020c Tera 2D Barcode Scanner EVHK0012 0582 Roland Corp. 0000 UA-100(G) 0002 UM-4/MPU-64 MIDI Interface @@ -6146,6 +7601,12 @@ 0159 DUO-CAPTURE EX 015b INTEGRA-7 015d R-88 + 01b5 Boutique Series Synthesizer (Normal mode) + 01b6 Boutique Series Synthesizer (Storage mode) + 01df Rubix22 + 01e0 Rubix24 + 01e1 Rubix44 + 01ef Go:KEYS MIDI 0505 EDIROL UA-101 0583 Padix Co., Ltd (Rockfire) 0001 4 Axis 12 button +POV @@ -6156,6 +7617,7 @@ 2033 RM-203 USB Nest [mode 4] 2050 PX-205 PSX Bridge 205f PSX/USB converter + 2060 2-axis 8-button gamepad 206f USB, 2-axis 8-button gamepad 3050 QF-305u Gamepad 3379 Rockfire X-Force @@ -6210,6 +7672,7 @@ 0584 RATOC System, Inc. 0008 Fujifilm MemoryCard ReaderWriter 0220 U2SCX SCSI Converter + 0304 U2SCX-LVD (SCSI Converter) b000 REX-USB60 b020 REX-USB60F 0585 FlashPoint Technology, Inc. @@ -6230,8 +7693,10 @@ 000f Digital Camera 0586 ZyXEL Communications Corp. 0025 802.11b/g/n USB Wireless Network Adapter - 0102 omni.net II ISDN TA - 1000 Omni NET Modem / ISDN TA + 0100 omni.net + 0102 omni.net II ISDN TA [HFC-S] + 0110 omni.net Plus + 1000 omni.net LCD Plus - ISDN TA 1500 Omni 56K Plus 2011 Scorpion-980N keyboard 3304 LAN Modem @@ -6259,13 +7724,16 @@ 341a NWD-270N Wireless N-lite USB Adapter 341e NWD2105 802.11bgn Wireless Adapter [Ralink RT3070] 341f NWD2205 802.11n Wireless N Adapter [Realtek RTL8192CU] + 3425 NWD6505 802.11a/b/g/n/ac Wireless Adapter [MediaTek MT7610U] 343e N220 802.11bgn Wireless Adapter 0587 America Kotobuki Electronics Industries, Inc. 0588 Sapien Design 0589 Victron 058a Nohau Corp. 058b Infineon Technologies + 0015 Flash Loader utility 001c Flash Drive + 0041 Flash Loader utility 058c In Focus Systems 0007 Flash 0008 LP130 @@ -6287,10 +7755,12 @@ 001e Projector 001f Projector ffe5 IN34 Projector + ffeb Projector IN76 058d Micrel Semiconductor 058e Tripath Technology, Inc. 058f Alcor Micro Corp. 1234 Flash Drive + 198b Webcam (Gigatech P-09) 2412 SCard R/W CSR-145 2802 Monterey Keyboard 5492 Hub @@ -6304,10 +7774,12 @@ 6362 Flash Card Reader/Writer 6364 AU6477 Card Reader Controller 6366 Multi Flash Reader - 6377 Multimedia Card Reader + 6377 AU6375 4-LUN card reader 6386 Memory Card 6387 Flash Drive 6390 USB 2.0-IDE bridge + 6391 IDE Bridge + 6998 AU6998 Flash Disk Controller 9213 MacAlly Kbd Hub 9215 AU9814 Hub 9254 Hub @@ -6322,18 +7794,22 @@ 9361 Multimedia Card Reader 9368 Multimedia Card Reader 9380 Flash Drive + 9381 Flash Drive 9382 Acer/Sweex Flash drive 9384 qdi U2Disk T209M 9410 Keyboard 9472 Keyboard Hub 9510 ChunghwaTL USB02 Smartcard Reader - 9520 EMV Certified Smart Card Reader + 9520 Watchdata W 1981 + 9540 AU9540 Smartcard Reader 9720 USB-Serial Adapter a014 Asus Integrated Webcam + b002 Acer Integrated Webcam 0590 Omron Corp. 0004 Cable Modem 000b MR56SVS 0028 HJ-720IT / HEM-7080IT-E / HEM-790IT + 0051 FT232BM [E58CIFQ1 with FTDI USB2Serial Converter] 0591 Questra Consulting 0592 Powerware Corp. 0002 UPS (X-Slot) @@ -6347,6 +7823,7 @@ 0001 Touchscreen 0002 Touch Screen Controller 0500 PCT Multitouch HID Controller + 0543 DELL XPS touchscreen 0597 Trisignal Communications 0598 Niigata Canotec Co., Inc. 0599 Brilliance Semiconductor, Inc. @@ -6371,6 +7848,7 @@ 0060 PCMCIA PocketZip Dock 0061 Varo PocketZip 40 MP3 Player 006d HipZip MP3 Player + 0070 eGo Portable Hard Drive 007c Ultra Max USB/1394 007d HTC42606 0G9AT00 [Iomega HDD] 007e Mini 256MB/512MB Flash Drive [IOM2D5] @@ -6388,6 +7866,7 @@ 017c HDD/1394B 0251 Optical 0252 Optical + 0275 ST332082 0A 0278 LDHD-UPS [Professional Desktop Hard Drive eSATA / USB2.0] 027a LPHD250-U [Portable Hard Drive Silver Series 250 Go] 0470 Prestige Portable Hard Drive @@ -6407,15 +7886,29 @@ 0213 PocketDrive USB2 0323 LaCie d2 Drive USB2 0421 Big Disk G465 + 0525 BigDisk Extreme 500 0641 Mobile Hard Drive + 0828 d2 Quadra + 0829 BigDisk Extreme+ + 1004 Little Disk 20 GB 100c Rugged Triple Interface Mobile Hard Drive 1010 Desktop Hard Drive + 1016 Desktop Hard Drive + 1018 Desktop Hard Drive 1019 Desktop Hard Drive 1021 Little Disk 1027 iamaKey V2 102a Rikiki Hard Drive + 103d D2 1049 rikiki Harddrive 1052 P'9220 Mobile Drive + 1053 P'9230 2TB [Porsche Design Desktop Drive 2TB] + 1061 Rugged USB3-FW + 1064 Rugged 16 and 32 GB + 106b Rugged Mini HDD + 106d Porsche Design Mobile Drive + 106e Porsche Design Desktop Drive + 1094 Rugged THB a601 HardDrive a602 CD R/W 05a0 Vetronix Corp. @@ -6423,6 +7916,11 @@ 05a2 Fuji Film Microdevices Co., Ltd 05a3 ARC International 8388 Marvell 88W8388 802.11a/b/g WLAN + 9230 Camera + 9320 Camera + 9331 Camera + 9422 Camera + 9520 Camera 05a4 Ortek Technology, Inc. 1000 WKB-1000S Wireless Ergo Keyboard with Touchpad 2000 WKB-2000 Wireless Keyboard with Touchpad @@ -6439,7 +7937,18 @@ 0002 CVA122 Cable Voice Adapter (WDM) 0003 CVA124E Cable Voice Adapter (WDM) 0004 CVA122E Cable Voice Adapter (WDM) + 0008 STA1520 Tuning Adapter + 0a00 Integrated Management Controller Hub + 0a01 Virtual Keyboard/Mouse + 0a02 Virtual Mass Storage + 0a03 Virtual Ethernet/RNDIS 05a7 Bose Corp. + 4000 Bluetooth Headset + 4001 Bluetooth Headset in DFU mode + 4002 Bluetooth Headset Series 2 + 4003 Bluetooth Headset Series 2 in DFU mode + bc50 SoundLink Wireless Mobile speaker + bc51 SoundLink Wireless Mobile speaker in DFU mode 05a8 Spacetec IMC Corp. 05a9 OmniVision Technologies, Inc. 0511 OV511 Webcam @@ -6447,11 +7956,13 @@ 0519 OV519 Microphone 1550 VEHO Filmscanner 2640 OV2640 Webcam + 2642 Integrated Webcam for Dell XPS 2010 2643 Monitor Webcam 264b Monitor Webcam 2800 SuperCAM 4519 Webcam Classic 7670 OV7670 Webcam + 8065 GAIA Sensor FPGA Demo Board 8519 OV519 Webcam a511 OV511+ Webcam a518 D-Link DSB-C310 Webcam @@ -6507,7 +8018,7 @@ 0223 Internal Keyboard/Trackpad (ANSI) 0224 Internal Keyboard/Trackpad (ISO) 0225 Internal Keyboard/Trackpad (JIS) - 0229 Internal Keyboard/Trackpad (MacBook Pro) (ANSI) + 0229 Internal Keyboard/Trackpad (ANSI) 022a Internal Keyboard/Trackpad (MacBook Pro) (ISO) 022b Internal Keyboard/Trackpad (MacBook Pro) (JIS) 0230 Internal Keyboard/Trackpad (MacBook Pro 4,1) (ANSI) @@ -6527,14 +8038,20 @@ 0247 Internal Keyboard/Trackpad (JIS) 024a Internal Keyboard/Trackpad (MacBook Air) (ISO) 024d Internal Keyboard/Trackpad (MacBook Air) (ISO) + 024f Aluminium Keyboard (ANSI) 0250 Aluminium Keyboard (ISO) 0252 Internal Keyboard/Trackpad (ANSI) 0253 Internal Keyboard/Trackpad (ISO) 0254 Internal Keyboard/Trackpad (JIS) + 0259 Internal Keyboard/Trackpad + 025a Internal Keyboard/Trackpad 0263 Apple Internal Keyboard / Trackpad (MacBook Retina) + 0267 Magic Keyboard A1644 + 0269 Magic Mouse 2 (Lightning connector) + 0273 Internal Keyboard/Trackpad (ISO) 0301 USB Mouse [Mitsumi, M4848] 0302 Optical Mouse [Fujitsu] - 0304 Optical USB Mouse [Mitsumi] + 0304 Mighty Mouse [Mitsumi, M1152] 0306 Optical USB Mouse [Fujitsu] 030a Internal Trackpad 030b Internal Trackpad @@ -6545,6 +8062,7 @@ 1002 Extended Keyboard Hub [Mitsumi] 1003 Hub in Pro Keyboard [Mitsumi, A1048] 1006 Hub in Aluminum Keyboard + 1008 Mini DisplayPort to Dual-Link DVI Adapter 1101 Speakers 1105 Audio in LED Cinema Display 1107 Thunderbolt Display Audio @@ -6576,6 +8094,7 @@ 1263 iPod Nano 4.Gen 1265 iPod Nano 5.Gen 1266 iPod Nano 6.Gen + 1267 iPod Nano 7.Gen 1281 Apple Mobile Device [Recovery Mode] 1290 iPhone 1291 iPod Touch 1.Gen @@ -6586,20 +8105,33 @@ 1297 iPhone 4 1299 iPod Touch 3.Gen 129a iPad + 129c iPhone 4(CDMA) 129e iPod Touch 4.Gen 129f iPad 2 12a0 iPhone 4S 12a2 iPad 2 (3G; 64GB) + 12a3 iPad 2 (CDMA) + 12a4 iPad 3 (wifi) + 12a5 iPad 3 (CDMA) 12a6 iPad 3 (3G, 16 GB) + 12a8 iPhone 5/5C/5S/6/SE 12a9 iPad 2 12aa iPod Touch 5.Gen [A1421] + 12ab iPad 4/Mini1 1300 iPod Shuffle 1301 iPod Shuffle 2.Gen 1302 iPod Shuffle 3.Gen 1303 iPod Shuffle 4.Gen + 1392 Apple Watch charger + 1393 AirPods case + 1395 Smart Battery Case [iPhone 6] + 1398 Smart Battery Case 1401 Modem 1402 Ethernet Adapter [A1277] 1500 SuperDrive [A1379] + 8005 OHCI Root Hub Simulation + 8006 EHCI Root Hub Simulation + 8007 XHCI Root Hub USB 2.0 Simulation 8202 HCF V.90 Data/Fax Modem 8203 Bluetooth HCI 8204 Built-in Bluetooth 2.0+EDR HCI @@ -6620,9 +8152,13 @@ 8242 Built-in IR Receiver 8281 Bluetooth Host Controller 8286 Bluetooth Host Controller + 8289 Bluetooth Host Controller + 828c Bluetooth Host Controller + 8290 Bluetooth Host Controller 8300 Built-in iSight (no firmware loaded) 8403 Internal Memory Card Reader 8404 Internal Memory Card Reader + 8406 Internal Memory Card Reader 8501 Built-in iSight [Micron] 8502 Built-in iSight 8505 Built-in iSight @@ -6631,7 +8167,9 @@ 8509 FaceTime HD Camera 850a FaceTime Camera 8510 FaceTime HD Camera (Built-in) + 8600 iBridge 911c Hub in A1082 [Cinema HD Display 23"] + 9127 Hub in Thunderbolt Display 912f Hub in 30" Cinema Display 9215 Studio Display 15" 9217 Studio Display 17" @@ -6658,12 +8196,14 @@ 1389 Bluetooth Wireless Adapter 05b4 LG Semicon Co., Ltd 4857 M-Any DAH-210 - 6001 Digisette DUO-MP3 AR-100 + 6001 HYUNDAI GDS30C6001 SSFDC / MMC I/F Controller 05b5 Dialogic Corp. 05b6 Proxima Corp. 05b7 Medianix Semiconductor, Inc. -05b8 Agiler, Inc. +05b8 SYSGRATION 3002 Scroll Mouse + 3126 APT-905 Wireless presenter + 3223 ISY Wireless Presenter 05b9 Philips Research Laboratories 05ba DigitalPersona, Inc. 0007 Fingerprint Reader @@ -6684,6 +8224,9 @@ 0008 AccelePort USB 8 05c6 Qualcomm, Inc. 0114 Select RW-200 CDMA Wireless Modem + 0a02 Jolla Device Developer Mode + 0a07 Jolla Device MTP + 0afe Jolla Device Charging Only 1000 Mass Storage Device 3100 CDMA Wireless Modem/Phone 3196 CDMA Wireless Modem @@ -6691,19 +8234,28 @@ 6000 Siemens SG75 6503 AnyData APE-540H 6613 Onda H600/N501HS ZTE MF330 + 6764 A0001 Phone [OnePlus One] 9000 SIMCom SIM5218 modem 9001 Gobi Wireless Modem 9002 Gobi Wireless Modem + 9003 Quectel UC20 9008 Gobi Wireless Modem (QDL mode) 9018 Qualcomm HSUSB Device - 9025 Qualcomm HSUSB Device + 9025 HSUSB Device + 9090 Quectel UC15 + 9091 Intex Aqua Fish & Jolla C Diagnostic Mode + 9092 Nokia 8110 4G + 90ba Audio 1.0 device + 90bb Snapdragon interface (MIDI + ADB) + 90dc Fairphone 2 (Charging & ADB) 9201 Gobi Wireless Modem (QDL mode) 9202 Gobi Wireless Modem 9203 Gobi Wireless Modem + 9205 Gobi 2000 9211 Acer Gobi Wireless Modem (QDL mode) 9212 Acer Gobi Wireless Modem 9214 Acer Gobi 2000 Wireless Modem (QDL mode) - 9215 Acer Gobi 2000 Wireless Modem + 9215 Quectel EC20 LTE modem / Acer Gobi 2000 Wireless Modem 9221 Gobi Wireless Modem (QDL mode) 9222 Gobi Wireless Modem 9224 Sony Gobi 2000 Wireless Modem (QDL mode) @@ -6717,6 +8269,7 @@ 9265 Asus Gobi 2000 Wireless Modem 9274 iRex Technologies Gobi 2000 Wireless Modem (QDL mode) 9275 iRex Technologies Gobi 2000 Wireless Modem + f003 Nokia 8110 4G 05c7 Qtronix Corp. 0113 PC Line Mouse 1001 Lynx Mouse @@ -6725,9 +8278,19 @@ 6001 Ten-Keypad 05c8 Cheng Uei Precision Industry Co., Ltd (Foxlink) 0103 FO13FF-65 PC-CAM + 010b Webcam (UVC) 021a HP Webcam + 0233 HP Webcam 0318 Webcam + 0361 SunplusIT INC. HP Truevision HD Webcam + 036e Webcam + 0374 HP EliteBook integrated HD Webcam + 03a1 XiaoMi Webcam + 03b1 Webcam + 03bc HP Wide Vision HD Integrated Webcam + 03cb HP Wide Vision HD Integrated Webcam 0403 Webcam + 041b HP 2.0MP High Definition Webcam 05c9 Semtech Corp. 05ca Ricoh Co., Ltd 0101 RDC-5300 Camera @@ -6738,10 +8301,13 @@ 0403 Printing Support 0405 Type 101 0406 Type 102 + 0437 Aficio SP 3510SF + 044e SP C250SF (multifunction device: printer, scanner, fax) 1803 V5 camera [R5U870] 1810 Pavilion Webcam [R5U870] 1812 Pavilion Webcam 1814 HD Webcam + 1815 Dell Laptop Integrated Webcam 1820 Integrated Webcam 1830 Visual Communication Camera VGP-VCC2 [R5U870] 1832 Visual Communication Camera VGP-VCC3 [R5U870] @@ -6755,8 +8321,10 @@ 183b Visual Communication Camera VGP-VCC8 [R5U870] 183d Sony Vaio Integrated Webcam 183e Visual Communication Camera VGP-VCC9 [R5U870] + 183f Sony Visual Communication Camera Integrated Webcam 1841 Fujitsu F01/ Lifebook U810 [R5U870] 1870 Webcam 1000 + 1880 R5U880 18b0 Sony Vaio Integrated Webcam 18b1 Sony Vaio Integrated Webcam 18b3 Sony Vaio Integrated Webcam @@ -6881,6 +8449,7 @@ 20e0 ScanMaker 9700XL 20ed ScanMaker 4700 20ee Micortek ScanMaker X12USL + 2838 RT2832U 3008 Scanner 300a 4800 ICE Scanner 300b 4800 Scanner @@ -6889,6 +8458,7 @@ 3021 1200dpi Scanner 3022 Scanner 4800dpi 3023 USB1200II Scanner + 3025 ScanMaker S460 30c1 USB600 Scanner 30ce ScanMaker 3800 30cf ScanMaker 4800 @@ -6907,6 +8477,7 @@ 40ff ScanMaker 3600 5003 Goya 5013 3200 Scanner + 6072 XT-3500 A4 HD Scanner 80a3 ScanMaker V6USL (#2) 80ac ScanMaker V6UL/SpicyU 05db Sun Corp. (Suntac?) @@ -6973,6 +8544,8 @@ 4d02 MP3 Player 4d12 MP3 Player 4d30 MP3 Player + a201 JumpDrive S70 4GB + a209 JumpDrive S70 a300 JumpDrive2 a400 JumpDrive trade; Pro 40-501 a410 JumpDrive 128MB/256MB @@ -6993,14 +8566,25 @@ a560 JumpDrive FireFly a701 JumpDrive FireFly a731 JumpDrive FireFly + a762 JumpDrive FireFly + a768 JumpDrive Retrax a790 JumpDrive 2GB a811 16GB Gizmo! a813 16gB flash thumb drive + a815 JumpDrive V10 + a81d LJDTT16G [JumpDrive 16GB] + a833 JumpDrive S23 64GB + a838 JumpDrive Tough b002 USB CF Reader b018 Multi-Card Reader b047 SDHC Reader [RW047-7000] + b051 microSD RDR UHS-I Card Reader [LRWM03U-7000] + ba02 Workflow CFR1 + ba0a Workflow DD512 c753 JumpDrive TwistTurn + c75c JumpDrive V10 05dd Delta Electronics, Inc. + a011 HID UPS Battery ff31 AWU-120 ff32 FriendlyNET AeroLAN AL2011 ff35 PCW 100 - Wireless 802.11b Adapter @@ -7010,6 +8594,7 @@ 0700 Bar Code Scanner (CS1504) 0800 Spectrum24 Wireless LAN Adapter 1200 Bar Code Scanner + 1701 Bar Code Scanner (CDC) 1900 SNAPI Imaging Device 2000 MC3090 Rugged Mobile Computer 200d MC70 Rugged Mobile Computer @@ -7032,6 +8617,7 @@ 0131 CF/SM Reader/Writer 0142 Multiple Slides Scanner-3600 0143 Multiple Frames Film Scanner-36series + 0145 Reflecta CrystalScan 7200 Photo-Scanner 0180 Plustek Scanner 0182 Wize Media 1000 0189 ScanJet 4600 series @@ -7043,12 +8629,15 @@ 0502 GL620USB-A GeneLink USB-USB Bridge 0503 Webcam 0504 HID Keyboard Filter + 0510 Camera 0604 USB 1.1 Hub - 0605 USB 2.0 Hub + 0605 Hub 0606 USB 2.0 Hub / D-Link DUB-H4 USB 2.0 Hub 0607 Logitech G110 Hub - 0608 USB-2.0 4-Port HUB - 0610 4-port hub + 0608 Hub + 0610 Hub + 0612 Hub + 0616 hub 0660 USB 2.0 Hub 0700 SIIG US2256 CompactFlash Card Reader 0701 USB 2.0 IDE Adapter @@ -7068,15 +8657,24 @@ 0711 Card Reader 0712 Delkin Mass Storage Device 0715 USB 2.0 microSD Reader - 0716 USB 2.0 Multislot Card Reader/Writer + 0716 Multislot Card Reader/Writer 0717 All-in-1 Card Reader 0718 IDE/SATA Adapter 0719 SATA adapter + 0722 SD/MMC card reader 0723 GL827L SD/MMC/MS Flash Card Reader 0726 SD Card Reader 0727 microSD Reader/Writer 0731 GL3310 SATA 3Gb/s Bridge Controller - 0736 microSD Reader/Writer + 0732 All-in-One Cardreader + 0736 Colour arc SD Card Reader [PISEN] + 0738 Card reader + 0741 microSD Card Reader + 0743 SDXC and microSDXC CardReader + 0745 Logilink CR0012 + 0748 All-in-One Cardreader + 0749 SD Card Reader and Writer + 0751 microSD Card Reader 0760 USB 2.0 Card Reader/Writer 0761 Genesys Mass Storage Device 0780 USBFS DFU Adapter @@ -7118,6 +8716,7 @@ 0007 Kinesis Advantage PRO MPC/USB Keyboard 0081 Kinesis Integrated Hub 00ff VEC Footpedal + 0203 Y-mouse Keyboard & Mouse Adapter 020b PS2 Adapter 0232 X-Keys Switch Interface, Programming Mode 0261 X-Keys Switch Interface, SPLAT Mode @@ -7127,26 +8726,34 @@ 05f7 RFC Distribution(s) PTE, Ltd 05f9 PSC Scanning, Inc. 1104 Magellan 2200VS + 1206 Gryphon series (OEM mode) + 120c Gryphon GD4430-BK 2202 Point of Sale Handheld Scanner - 2206 Datalogic Gryphon GFS4170 - 2601 Datalogin Magellan 1000i Barcode Scanner + 2206 Gryphon series (keyboard emulation mode) + 220c Datalogic Gryphon GD4430 + 2601 Datalogic Magellan 1000i Barcode Scanner 2602 Datalogic Magellan 1100i Barcode Scanner + 4204 Gryphon series (RS-232 emulation mode) 5204 Datalogic Gryphon GFS4170 (config mode) 05fa Siemens Telecommunications Systems, Ltd 3301 Keyboard with PS/2 Mouse Port 3302 Keyboard 3303 Keyboard with PS/2 Mouse Port -05fc Harman Multimedia +05fc Harman + 0001 Soundcraft Si Multi Digital Card + 0010 Soundcraft Si MADI combo card 7849 Harman/Kardon SoundSticks 05fd InterAct, Inc. 0239 SV-239 HammerHead Digital 0251 Raider Pro 0253 ProPad 8 Digital 0286 SV-286 Cyclone Digital + 1007 Mad Catz Controller 107a PowerPad Pro X-Box pad 262a 3dfx HammerHead FX 262f HammerHead Fx daae Game Shark + dbae Datel XBoxMC 05fe Chic Technology Corp. 0001 Mouse 0003 Cypress USB Mouse @@ -7156,6 +8763,9 @@ 0011 Browser Mouse 0014 Gamepad 1010 Optical Wireless + 2001 Microsoft Wireless Receiver 700 + 3030 Controller + 3031 Controller 05ff LeCroy Corp. 0600 Barco Display Systems 0601 Jazz Hipster Corp. @@ -7163,8 +8773,11 @@ 0602 Vista Imaging, Inc. 1001 ViCam Webcam 0603 Novatek Microelectronics Corp. - 00f1 Keyboard + 0002 Sino Wealth keyboard/mouse 2.4 GHz receiver + 00f1 Keyboard (Labtec Ultra Flat Keyboard) + 00f2 Keyboard (Labtec Ultra Flat Keyboard) 6871 Mouse + 8611 NTK96550 based camera 0604 Jean Co., Ltd 0605 Anchor C&C Co., Ltd 0606 Royal Information Electronics Co., Ltd @@ -7179,10 +8792,13 @@ 060b Solid Year 0001 MacAlly Keyboard 0230 KSK-8003 UX Keyboard + 0540 DeltaCo TB-106U Keyboard 1006 Japanese Keyboard - 260U 2101 Keyboard 2231 KSK-6001 UELX Keyboard 2270 Gigabyte K8100 Aivia Gaming Keyboard + 500a Cougar 500k Gaming Keyboard + 5253 Thermaltake MEKA G-Unit Gaming Keyboard 5811 ACK-571U Wireless Keyboard 5903 Japanese Keyboard - 595U 6001 SolidTek USB 2p HUB @@ -7202,6 +8818,8 @@ 0615 Quabbin Wire & Cable Co., Inc. 0616 Future Techno Designs PVT, Ltd 0617 Swiss Federal Insitute of Technology + 000a Thymio-II + 000c Thymio-II Wireless 0618 MacAlly 0101 Mouse 0619 Seiko Instruments, Inc. @@ -7233,24 +8851,34 @@ 0622 Iotech, Inc. 0623 Littelfuse, Inc. 0624 Avocent Corp. + 0013 SC Secure KVM 0248 Virtual Hub 0249 Virtual Keyboard/Mouse 0251 Virtual Mass Storage + 0252 Virtual SD card reader 0294 Dell 03R874 KVM dongle 0402 Cisco Virtual Keyboard and Mouse 0403 Cisco Virtual Mass Storage + 1774 Cybex SC985 0625 TiMedia Technology Co., Ltd 0626 Nippon Systems Development Co., Ltd 0627 Adomax Technology Co., Ltd 0628 Tasking Software, Inc. 0629 Zida Technologies, Ltd -062a Creative Labs +062a MosArt Semiconductor Corp. 0000 Optical mouse 0001 Notebook Optical Mouse + 0020 Logic3 Gamepad + 0033 Competition Pro Steering Wheel 0102 Wireless Keyboard/Mouse Combo [MK1152WC] 0201 Defender Office Keyboard (K7310) S Zodiak KM-9010 0252 Emerge Uni-retractable Laser Mouse + 2410 Wireless PS3 gamepad 3286 Nano Receiver [Sandstrom Laser Mouse SMWLL11] + 4101 Wireless Keyboard/Mouse + 4102 Wireless Mouse + 4106 Wireless Mouse 2.4G + 4c01 2,4Ghz Wireless Transceiver [for Delux M618 Plus Wireless Vertical Mouse] 6301 Trust Wireless Optical Mouse MI-4150K 9003 VoIP Conference Hub (A16GH) 9004 USR9602 USB Internet Mini Phone @@ -7273,6 +8901,7 @@ 0a13 AV600U 0a15 Konica Minolta SC-110 0a16 Konica Minolta SC-215 + 0a2a AV220 C2 0a30 UMAX Astra 6700 Scanner 0a41 Avision AM3000/MF3000 Series 0f01 fi-4010CU @@ -7295,7 +8924,7 @@ 1000 CD-ROM Drive 800d TASCAM Portastudio DP-01FX 800e TASCAM US-122L - 801d DR-100 + 801d TASCAM DR-100 8021 TASCAM US-122mkII d001 CD-R/RW Unit d002 CD-R/RW Unit @@ -7318,29 +8947,42 @@ 064c Ji-Haw Industrial Co., Ltd 064d TriTech Microelectronics, Ltd 064e Suyin Corp. + 2100 Sony Visual Communication Camera + 3410 RGBIR Camera + 9700 Asus Integrated Webcam a100 Acer OrbiCam a101 Acer CrystalEye Webcam a102 Acer/Lenovo Webcam [CN0316] a103 Acer/HP Integrated Webcam [CN0314] a110 HP Webcam a114 Lemote Webcam + a116 UVC 1.3MPixel WebCam + a127 HP Integrated Webcam a136 Asus Integrated Webcam [CN031B] a219 1.3M WebCam (notebook emachines E730, Acer sub-brand) c107 HP webcam [dv6-1190en] + c335 HP TrueVision HD d101 Acer CrystalEye Webcam + d213 UVC HD Webcam d217 HP TrueVision HD e201 Lenovo Integrated Webcam e203 Lenovo Integrated Webcam e258 HP TrueVision HD Integrated Webcam + e263 HP TrueVision HD Integrated Webcam f102 Lenovo Integrated Webcam [R5U877] f103 Lenovo Integrated Webcam [R5U877] + f207 Lenovo EasyCamera Integrated Webcam + f209 HP Webcam f300 UVC 0.3M Webcam 064f WIBU-Systems AG - 03e9 CmStick (article no. 1001) - 03f2 CmStick/M (article no. 1010) - 03f3 CmStick/M (article no. 1011) - 0bd7 BOX/U - 0bd8 BOX/RU + 03e9 CmStick (MSD, article no. 1001-xx-xxx) + 03f2 CmStick/M (MSD, article no. 1010-xx-xxx) + 03f3 CmStick/M (MSD, article no. 1011-xx-xxx) + 0bd7 Wibu-Box/U (article no. 3031-xx-xxx) + 0bd8 Wibu-Box/RU (article no. 3032-xx-xxx) + 2af9 CmStick (HID, article no. 1001-xx-xxx) + 2b03 CmStick/M (HID, article no. 1011-xx-xxx) + 5213 CmStick/M (COMPOSITE, article no. 1011-xx-xxx) 0650 Dynapro Systems 0651 Likom Technology Sdn. Bhd. 0652 Stargate Solutions, Inc. @@ -7354,6 +8996,7 @@ 0656 Glory Mark Electronic, Ltd 0657 Tekcon Electronics Corp. 0658 Sigma Designs, Inc. + 0200 Aeotec Z-Stick Gen5 (ZW090) - UZB 0659 Aethra 065a Optoelectronics Co., Ltd 0001 Opticon OPR-2001 / NLV-1001 (keyboard mode) @@ -7504,6 +9147,7 @@ 82e0 MP3 Player 8320 TrekStor i.Beat fun 835d MP3 Player + 83b5 Transcend T.sonic 530 MP3 Player 9000 MP3 Player 9001 MP3 Player 9002 MP3 Player @@ -7520,8 +9164,8 @@ 0110 Vigor 128 ISDN TA 0530 Vigor530 IEEE 802.11G Adapter (ISL3880+NET2280) 0550 Vigor550 - 1688 miniVigor 128 ISDN TA - 6694 USB ISDN TA + 1688 miniVigor 128 ISDN TA [HFC-S] + 6694 miniVigor 128 ISDN TA 0676 Teles AG 0677 Aiwa Co., Ltd 07d5 TM-ED1285(USB) @@ -7535,6 +9179,7 @@ 0600 IDE Bridge 0610 Onext EG210U MODEM 0611 AlDiga AL-11U Quad-band GSM/GPRS/EDGE modem + 1231 Orico SATA External Hard Disk Drive Lay-Flat Docking Station with USB 3.0 & eSATA interfaces. 2303 PL2303 Serial Port 2305 PL2305 Parallel Port 2306 Raylink Bridge Controller @@ -7549,6 +9194,7 @@ 2515 Flash Disk Embedded Hub 2517 Flash Disk Mass Storage Device 2528 Storage device (8gB thumb drive) + 2571 LG Electronics GE24LU21 25a1 PL25A1 Host-Host Bridge 2773 PL2773 SATAII bridge controller 3400 Hi-Speed Flash Disk with TruePrint AES3400 @@ -7556,6 +9202,7 @@ 3507 PL3507 ATAPI6 Bridge aaa0 Prolific Pharos aaa2 PL2303 Serial Adapter (IODATA USB-RSAQ3) + aaa3 PL2303x Serial Adapter 067c Efficient Networks, Inc. 1001 Siemens SpeedStream 100MBps Ethernet 1022 Siemens SpeedStream 1022 802.11b Adapter @@ -7614,6 +9261,8 @@ 3009 Magicolor 2300W 300b PagePro 1350W 300c PagePro 1300W + 301b Develop D 1650iD + 3023 Develop D 2050iD 302e Develop D 1650iD PCL 3034 Develop D 2050iD PCL 4001 Dimage 2300 @@ -7647,15 +9296,18 @@ 068e CH Products, Inc. 00d3 OEM 3 axis 5 button joystick 00e2 HFX OEM Joystick + 00f0 Multi-Function Panel 00f1 Pro Throttle 00f2 Flight Sim Pedals 00f3 Fighterstick 00f4 Combatstick - 00fa Flight Sim Pedals + 00fa Ch Throttle Quadrant 00ff Flight Sim Yoke 0500 GameStick 3D 0501 CH Pro Pedals 0504 F-16 Combat Stick +068f Nihon KOHDEN + c00d MEK-6500 0690 Golden Bridge Electech, Inc. 0693 Hagiwara Sys-Com Co., Ltd 0002 FlashGate SmartMedia Card Reader @@ -7667,11 +9319,16 @@ 0694 Lego Group 0001 Mindstorms Tower 0002 Mindstorms NXT + 0005 Mindstorms EV3 + 0006 Mindstorms EV3 Firmware Update 0698 Chuntex (CTX) 1786 1300ex Monitor 2003 CTX M730V built in Camera 9999 VLxxxx Monitor+Hub 0699 Tektronix, Inc. + 0347 AFG 3022B + 0365 TDS 2004B + 036a TDS 2024B 069a Askey Computer Corp. 0001 VC010 Webcam [pwc] 0303 Cable Modem @@ -7718,7 +9375,8 @@ 0006 Cyborg Gold Joystick 0109 P880 Pad 0160 ST290 Pro - 0200 Xbox Adrenalin Hub + 0200 Racing Wheel + 0201 Adrenalin Gamepad 0241 Xbox Adrenalin Gamepad 0255 X52 Flight Controller 040b P990 Dual Analog Pad @@ -7774,6 +9432,7 @@ a2ae Pro Flight Instrument Panel a502 Gaming Mouse f518 P3200 Rumble Force Game Pad + f51a P3600 ff04 R440 Force Wheel ff0c Cyborg Force Rumble Pad ff0d P2600 Rumble Force Pad @@ -7849,6 +9508,7 @@ 06bf Leoco Corp. 06c2 Phidgets Inc. (formerly GLAB) 0030 PhidgetRFID + 0031 RFID reader 0038 4-Motor PhidgetServo v3.0 0039 1-Motor PhidgetServo v3.0 003a 8-Motor PhidgetAvancedServo @@ -7878,6 +9538,7 @@ 0007 Monitor Control 0009 Monitor Control 06ca Newer Technology, Inc. + 2003 uSCSI 06cb Synaptics, Inc. 0001 TouchPad 0002 Integrated TouchPad @@ -7890,6 +9551,10 @@ 000e HID Device 0010 Wireless TouchPad 0013 DisplayPad + 009a Metallica MIS Touch Fingerprint Reader + 00a2 Metallica MOH Touch Fingerprint Reader + 00bd Prometheus MIS Touch Fingerprint Reader + 2970 touchpad 06cc Terayon Communication Systems 0101 Cable Modem 0102 Cable Modem @@ -7949,7 +9614,22 @@ 038c CP900DW(ID) Port 0393 CP9500D/DW Port 0394 CP9000D/DW Port + 0398 P93D 03a1 CP9550D/DW Port + 03a5 CP9550DW-S + 03a9 CP-9600DW + 03aa CP3020DA + 03ad CP-9800D/DW + 03ae CP-9800DW-S + 0f10 Hori/Namco FlightStick 2 + 3b10 P95D + 3b21 CP-9810D/DW + 3b30 CP-D70DW / CP-D707DW + 3b31 CP-K60DW-S + 3b36 CP-D80DW + 3b50 CP-W5000DW + 3b60 CP-D90DW + 3b80 CP-M1 06d4 Cisco Systems 06d5 Toshiba 4000 Japanese Keyboard @@ -8111,6 +9791,7 @@ 3020 Hercules Webcam EC300 a300 Dual Analog Leader GamePad b000 Hercules DJ Console + b121 Hercules P32 DJ c000 Hercules Muse Pocket d002 Hercules DJ Console e000 HWGUSB2-54 WLAN @@ -8159,6 +9840,7 @@ 0231 PS/2 Mouse Port 0232 Serial On Port 0240 PS/2 to USB Converter + 0260 PS/2 Keyboard and Mouse 0300 BAY-3U1S1P Parallel Port 0302 Parallel Port 0900 SVGA Adapter @@ -8166,7 +9848,7 @@ 5100 Magic Control Technology Corp. (USB2VGA dongle) 0713 Interval Research Corp. 0714 NewMotion, Inc. - 0003 ADB to USB convertor + 0003 ADB converter 0717 ZNK Corp. 0718 Imation Corp. 0002 SuperDisk 120MB @@ -8186,21 +9868,26 @@ 0622 TDK Trans-It 4GB 0624 TDK Trans-It 16GB 1120 RDX External dock (redbud) + 4006 8x Slim DVD Multi-Format Recorder External d000 Disc Stakka CD/DVD Manager 0719 Tremon Enterprises Co., Ltd 071b Domain Technologies, Inc. 0002 DTI-56362-USB Digital Interface Unit 0101 Audio4-USB DSP Data Acquisition Unit + 0184 Archos 2 8GB EM184RB 0201 Audio4-5410 DSP Data Acquisition Unit 0301 SB-USB JTAG Emulator 3203 Rockchip Media Player 32bb Music Mediatouch 071c Xionics Document Technologies, Inc. 071d Eicon Networks Corp. - 1000 Diva ISDN TA - 1003 Diva + 1000 Diva 2.01 S/T [PSB2115F] + 1003 Diva ISDN 2.0 + 1005 Diva ISDN 4.0 [HFC-S] 2000 Teledat Surf 071e Ariston Technologies +0720 Keyence Corp. + 8001 LJ-V7001 0723 Centillium Communications Corp. 0002 Palladia 300/400 Adsl Modem 0726 Vanguard International Semiconductor-America @@ -8210,15 +9897,55 @@ 072f Advanced Card Systems, Ltd 0001 AC1030-based SmartCard Reader 0008 ACR 80 Smart Card Reader + 0100 AET65 + 0101 AET65 + 0102 AET62 + 0103 AET62 + 0901 ACR1281U-C4 (BSI) 1000 PLDT Drive 1001 PLDT Drive + 2011 ACR88U + 2100 ACR128U + 2200 ACR122U + 220a ACR1281U-C5 (BSI) + 220c ACR1283 Bootloader + 220f ACR1281U-C2 (qPBOC) + 2211 ACR1261 1S Dual Reader + 2214 ACR1222 1SAM PICC Reader + 2215 ACR1281 2S CL Reader + 221a ACR1251U-A1 + 221b ACR1251U-C + 2224 ACR1281 1S Dual Reader + 222b ACR1222U-C8 + 222c ACR1283L-D2 + 222d [OEM Reader] + 222e ACR123U + 2242 ACR1251 1S Dual Reader 8002 AET63 BioTRUSTKey 8003 ACR120 8103 ACR120 + 8201 APG8201 + 8900 ACR89U-A1 + 8901 ACR89U-A2 + 8902 ACR89U-A3 9000 ACR38 AC1038-based Smart Card Reader + 9006 CryptoMate 90cc ACR38 SmartCard Reader + 90ce [OEM Reader] 90cf ACR38 SAM Smart Card Reader 90d0 PertoSmart EMV - Card Reader + 90d2 ACR83U + 90d8 ACR3801 + 90db CryptoMate64 + b000 ACR3901U + b100 ACR39U + b101 ACR39K + b102 ACR39T + b103 ACR39F + b104 ACR39U-SAM + b106 ACOS5T2 + b200 ACOS5T1 + b301 ACR32-A1 0731 Susteen, Inc. 0528 SonyEricsson DCU-11 Cable 0732 Goldfull Electronics & Telecommunications Corp. @@ -8231,8 +9958,8 @@ 0630 VQ630 Dual Mode Digital Camera(Bulk) 0631 Hercules Dualpix 0780 Smart Cam Deluxe(composite) - 1310 Epsilon 1.3/Jenoptik JD C1.3/UMAX AstraPix 470 - 1311 Digital Dream Epsilon 1.3 + 1310 Epsilon 1.3/Jenoptik JD C1.3/UMAX AstraPix 470 (mass storage mode) + 1311 Epsilon 1.3/Jenoptik JD C1.3/UMAX AstraPix 470 (PC Cam mode) 1314 Mercury 2.1MEG Deluxe Classic Cam 2211 Jenoptik jdc 21 LCD Camera 2221 Mercury Digital Pro 3.1p @@ -8250,18 +9977,46 @@ c541 ISDN TA 280 0736 Lorom Industrial Co., Ltd 0738 Mad Catz, Inc. + 2215 X-55 Rhino Stick + 2237 V.1 Stick + 4506 Wireless Controller 4507 XBox Device - 4516 XBox Device - 4520 XBox Device - 4526 XBox Device - 4536 XBox Device - 4540 XBox Device - 4556 XBox Device + 4516 Control Pad + 4520 Control Pad Pro + 4522 LumiCON + 4526 Control Pad Pro + 4530 Universal MC2 Racing Wheel and Pedals + 4536 MicroCON + 4540 Beat Pad + 4556 Lynx Wireless Controller 4566 XBox Device 4576 XBox Device - 4586 XBox Device - 4588 XBox Device + 4586 MicroCON Wireless Controller + 4588 Blaster + 45ff Beat Pad + 4716 Wired Xbox 360 Controller + 4718 Street Fighter IV FightStick SE for Xbox 360 + 4726 Xbox 360 Controller + 4728 Street Fighter IV FightPad for Xbox 360 + 4730 MC2 Racing Wheel for Xbox 360 + 4736 MicroCON for Xbox 360 + 4738 Street Fighter IV Wired Controller for Xbox 360 + 4740 Beat Pad for Xbox 360 + 4743 Beat Pad Pro + 4758 Arcade Game Stick + 4a01 FightStick TE 2 for Xbox One + 6040 Beat Pad Pro 8818 Street Fighter IV Arcade FightStick (PS3) + 9871 Portable Drum Kit + a109 S.T.R.I.K.E.7 Keyboard + a215 X-55 Rhino Throttle + b726 Modern Warfare 2 Controller for Xbox 360 + b738 Marvel VS Capcom 2 TE FightStick for Xbox 360 + beef Joytech Neo SE Advanced Gamepad + cb02 Saitek Cyborg Rumble Pad + cb03 Saitek P3200 Rumble Pad + cb29 Saitek Aviator Stick AV8R02 + f738 Super Street Fighter IV FightStick TE S for Xbox 360 073a Chaplet Systems, Inc. 2230 infrared dongle for remote 073b Suncom Technologies @@ -8276,6 +10031,7 @@ 0522 Pole Display (SPC522-3415 2 x 20 Line Display) 0624 Pole Display (SP324-3415 4 x 20 Line Display) 073d Eutron S.p.a. + 0000 SmartKey 0005 Crypto Token 0007 CryptoIdentity CCID 0025 SmartKey 3 @@ -8283,8 +10039,13 @@ 0d00 StarSign Bio Token 3.0 EU 073e NEC, Inc. 0301 Game Pad +0742 Stollmann + 2008 ISDN TA [HFC-S] + 2009 ISDN TA [HFC-S] + 200a ISDN TA [HFC-S] 0745 Syntech Information Co., Ltd 0746 Onkyo Corp. + 4700 Integra MZA-4.7 5500 SE-U55 Audio Device 0747 Labway Corp. 0748 Strong Man Enterprise Co., Ltd @@ -8301,9 +10062,11 @@ 0002 PS/2 Adapter 0755 Aureal Semiconductor 0757 Network Technologies, Inc. + 0a00 SUN Adapter +0758 Carl Zeiss Microscopy GmbH 075b Sophisticated Circuits, Inc. 0001 Kick-off! Watchdog -0763 Midiman +0763 M-Audio 0115 O2 / KeyRig 25 0117 Trigger Finger 0119 MidAir @@ -8329,7 +10092,7 @@ 1015 M-Audio Keystation 1020 Midisport 4x4 1021 MidiSport 4x4 - 1030 Midisport 8x8 + 1030 M-Audio MIDISPORT 8x8 1031 MidiSport 8x8/s Loader 1033 MidiSport 8x8/s 1040 M-Audio MidiSport 2x4 Loader @@ -8354,7 +10117,7 @@ 201b M-Audio RunTime DFU 201d M-Audio Producer 2024 M-Audio Fast Track MKII - 2080 M-Audio RunTime DFU + 2080 M-Audio Fast Track Ultra 2081 M-Audio RunTime DFU / Fast Track Ultra 8R 2803 M-Audio Audiophile DFU 2804 M-Audio MobilePre DFU @@ -8367,10 +10130,15 @@ 0764 Cyber Power System, Inc. 0005 Cyber Power UPS 0501 CP1500 AVR UPS + 0601 PR1500LCDRT2U UPS 0765 X-Rite, Inc. 5001 Huey PRO Colorimeter + 5010 X-Rite Pantone Color Sensor + 5020 i1 Display Pro + 6003 ColorMunki Smile d094 X-Rite DTP94 [Quato Silver Haze Pro] 0766 Jess-Link Products Co., Ltd + 0017 Packard Bell Carbon 001b Packard Bell Go 0204 TopSpeed Cyberlink Remote Control 0767 Tokheim Corp. @@ -8388,13 +10156,16 @@ 1021 CardMan 1021 1221 CardMan 1221 1784 CardMan 6020 - 3021 CardMan 3121 + 3021 CardMan 3021 / 3121 + 3022 CardMan 3121 (HID Technologies) 3610 CardMan 3620 3621 CardMan 3621 3821 CardMan 3821 4321 CardMan 4321 5121 CardMan 5121 5125 CardMan 5125 + 5321 CardMan 5321 + 5340 CardMan 5021 CL 6622 CardMan 6121 a011 CCID Smart Card Reader Keyboard a021 CCID Smart Card Reader @@ -8402,6 +10173,8 @@ c000 CardMan 3x21 CS c001 CardMan 5121 CS 076c Partner Tech + 0204 CD7220 Communications Port + 0302 RP-600 076d Denso Corp. 076e Kuan Tech Enterprise Co., Ltd 076f Jhen Vei Electronic Co., Ltd @@ -8415,7 +10188,9 @@ 0776 Inalways Corp. 0777 Comda Enterprise Corp. 0778 Volex, Inc. -0779 Fairchild Semiconductor +0779 ON Semiconductor (formerly Fairchild) + 0133 FUSB307B + 0134 FUSB308B 077a Sankyo Seiki Mfg. Co., Ltd 077b Linksys 08be BEFCMU10 v4 Cable Modem @@ -8433,6 +10208,10 @@ 07af iMic 1016 AirClick 627a Radio SHARK +077e Softing AG + 008a NetLink Compact MPI/Profibus adapter + 0160 EDICblue + 0220 VAS5054A 077f Well Excellent & Most Corp. 0780 Sagem Monetel GmbH 1202 ORGA 900 Smart Card Terminal Virtual Com Port @@ -8462,10 +10241,25 @@ 540e Cruzer Contour Flash Drive 5530 Cruzer 5567 Cruzer Blade + 556b Cruzer Edge + 556c Ultra + 556d Memory Vault 5571 Cruzer Fit + 5575 Cruzer Glide + 5576 Cruzer Facet + 5577 Cruzer Pop (8GB) + 557d Cruzer Force 5580 SDCZ80 Flash Drive + 5581 Ultra + 5583 Ultra Fit + 5588 Extreme Pro + 5589 SD8SB8U512G[Extreme 500] + 558c Extreme Portable SSD + 5590 Ultra Dual + 5591 Ultra Flair 5e10 Encrypted 6100 Ultra II SD Plus 2GB + 6500 uSSD 5000 7100 Cruzer Mini 7101 Pen Flash 7102 Cruzer Mini @@ -8504,6 +10298,7 @@ 74c3 Sansa Fuze V2 (msc) 74d0 Sansa Clip+ (mtp) 74d1 Sansa Clip+ (msc) + 74e5 Sansa Clip Zip 8181 Pen Flash 8183 Hi-Speed Mass Storage Device 8185 SDCZ2 Cruzer Mini Flash Drive (older, thick) @@ -8522,7 +10317,10 @@ a7c1 Storage device (SD card reader) a7e8 SDDR-113 MicroMate SDHC Reader b2b3 SDDR-103 MobileMate SD+ Reader + b2b5 SDDR-104 MobileMate SD+ Reader b4b5 SDDR-89 V4 ImageMate 12-in-1 Reader + b6b7 SDDR-99 V4 ImageMate 5-in-1 Reader + b6ba CF SDDR-289 0782 Trackerball 0783 C3PO 0003 LTC31 SmartCard Reader @@ -8549,6 +10347,7 @@ 0063 LDR Device 0064 LDR-R Device 00b3 DVD Multi-plus unit LDR-H443U2 + 00cc LHD Device 0105 LAN-TX/U1H2 10/100 Ethernet Adapter [pegasus II] 010c Realtek RTL8187 Wireless 802.11g 54Mbps Network Adapter 0160 LAN-GTJ/U2A @@ -8618,8 +10417,8 @@ 0986 AN986 Pegasus Ethernet 8266 Infineon WildCard-USB Wireless LAN Adapter 8511 ADM8511 Pegasus II Ethernet - 8513 AN8513 Ethernet - 8515 AN8515 Ethernet + 8513 ADM8513 Pegasus II Ethernet + 8515 ADM8515 Pegasus II Ethernet 07aa Corega K.K. 0001 Ether USB-T Ethernet [klsi] 0004 FEther USB-TX Ethernet [pegasus] @@ -8630,7 +10429,8 @@ 0017 FEther USB2-TX 0018 Wireless LAN USB-11 mini 2 001a ULUSB-11 Key - 001c CG-WLUSB2GTST 802.11g Wireless Adapter [Intersil ISL3887] + 001c CG-WLUSB2GT 802.11g Wireless Adapter [Intersil ISL3880] + 0020 CG-WLUSB2GTST 802.11g Wireless Adapter [Intersil ISL3887] 002e CG-WLUSB2GPX [Ralink RT2571W] 002f CG-WLUSB2GNL 0031 CG-WLUSB2GS 802.11bg [Atheros AR5523] @@ -8647,8 +10447,9 @@ fc01 IDE bridge fc02 Cable II USB-2 fc03 USB2-IDE IDE bridge + fc77 Quattro 3.0 fcd6 Freecom HD Classic - fcf6 DataBar 512 MB + fcf6 DataBar fcf8 Freecom Classic SL Network Drive fcfe Hard Drive 80GB 07af Microtech @@ -8661,8 +10462,8 @@ 0002 ISDN TA128 Plus 0003 ISDN TA128 Deluxe 0005 ISDN TA128 SE - 0006 ISDN TA128 CE - 0007 ISDN TA + 0006 ISDN TA 128 [HFC-S] + 0007 ISDN TA [HFC-S] 0008 ISDN TA 07b1 IMP, Inc. 07b2 Motorola BCS, Inc. @@ -8681,6 +10482,7 @@ 5101 SurfBoard SB5101 Cable Modem 5120 SurfBoard SB5120 Cable Modem (RNDIS) 5121 Surfboard 5121 Cable Modem + 6002 MTR7000 Cable Tuning Adapter 7030 WU830G 802.11bg Wireless Adapter [Envara WiND512] 07b3 Plustek, Inc. 0001 OpticPro 1212U Scanner @@ -8703,18 +10505,21 @@ 0413 OpticSlim 1200 Scanner 0601 OpticPro ST24 Scanner 0800 OpticPro ST48 Scanner + 0807 OpticFilm 7200 scanner 0900 OpticBook 3600 Scanner 090c OpticBook 3600 Plus Scanner 0a06 TVcam VD100 0b00 SmartPhoto F50 + 0c00 OpticPro ST64 Scanner 0c03 OpticPro ST64+ Scanner 0c04 Optic Film 7200i scanner 0c0c PL806 Scanner 0c26 OpticBook 4600 Scanner 0c2b Mobile Office D428 Scanner - 0e08 Plustek OpticBook A300 Scanner + 0e08 OpticBook A300 Scanner 1300 OpticBook 3800 Scanner 1301 OpticBook 4800 Scanner + 130f Bookreader v200 07b4 Olympus Optical Co., Ltd 0100 Camedia C-2100/C-3000 Ultra Zoom Camera 0102 Camedia E-10/C-220/C-50 Camera @@ -8722,9 +10527,11 @@ 0109 C-370Z/C-500Z/D-535Z/X-450 010a MAUSB-10 xD and SmartMedia Card Reader 0112 MAUSB-100 xD Card Reader - 0113 Mju 500 + 0113 Mju 500 / Stylus Digital Camera (PTP) 0114 C-350Z Camera 0118 Mju Mini Digital/Mju Digital 500 Camera / Stylus 850 SW + 0125 Tough TG-1 Camera + 0126 VR340/D750 Digital Camera 0184 P-S100 port 0202 Foot Switch RS-26 0203 Digital Voice Recorder DW-90 @@ -8738,6 +10545,7 @@ 0244 Digital Voice Recorder VN-8500PC 024f Digital Voice Recorder DS-7000 0280 m:robe 100 + 0295 Digital Voice Recorder VN-541PC 07b5 Mega World International, Ltd 0017 Joystick 0213 Thrustmaster Firestorm Digital 3 Gamepad @@ -8767,7 +10575,7 @@ 4104 XX9 420a UF200 Ethernet 5301 GW-US54ZGL 802.11bg - 6001 802.11bg + 6001 WUG2690 802.11bg Wireless Module [ZyDAS ZD1211+AL2230] 8188 AboCom Systems Inc [WN2001 Prolink Wireless-N Nano Adapter] a001 WUG2200 802.11g Wireless Adapter [Envara WiND512] abc1 DU-E10 Ethernet [pegasus] @@ -8803,6 +10611,7 @@ 07bc Canon Computer Systems, Inc. 07bd Webgear, Inc. 07be Veridicom + 1935 Elektron Music Machines 07c0 Code Mercenaries Hard- und Software GmbH 1113 JoyWarrior24F8 1116 JoyWarrior24F14 @@ -8834,6 +10643,7 @@ a200 DF-UT-06 Hama MMC/SD Reader a400 CompactFlash & Microdrive Reader a600 Card Reader + a604 12-in-1 Card Reader ad01 Mass Storage Device ae01 Mass Storage Device af01 Mass Storage Device @@ -8845,6 +10655,7 @@ b00b USB to Memory Stick(LC1) c010 Kingston FCR-HS2/ATA Card Reader 07c5 APG Cash Drawer + 0500 Cash Drawer 07c6 ShareWave, Inc. 0002 Bodega Wireless Access Point 0003 Bodega Wireless Network Adapter @@ -8860,6 +10671,7 @@ 0837 H837 Hybrid ATSC/QAM 1228 MPEG-2 Capture Device (M038) 1830 AVerTV Volar Video Capture (H830) + 1871 TD310 DVB-T/T2/C dongle 3835 AVerTV Volar Green HD (A835B) 850a AverTV Volar Black HD (A850) 850b AverTV Red HD+ (A850T) @@ -8868,6 +10680,7 @@ a815 AVerTV DVB-T Volar X (A815) a827 AVerTV Hybrid Volar HX (A827) a867 AVerTV DVB-T (A867) + b300 A300 DVB-T TV receiver b800 MR800 FM Radio e880 MPEG-2 Capture Device (E880) e882 MPEG-2 Capture Device (E882) @@ -8933,6 +10746,10 @@ 0501 Mass Storage 07cd Elektor 0001 USBuart Serial Port +07ce Nidec Copal + c007 DPB-4000 + c009 DPB-6000 + c010 CPB-7000 07cf Casio Computer Co., Ltd 1001 QV-8000SX/5700/3000EX Digicam; Exilim EX-M20 1003 Exilim EX-S500 @@ -8950,8 +10767,11 @@ 4104 Cw75 Device 4107 CW-L300 Device 4500 LV-20 Digital Camera + 6101 fx-9750gII + 6102 fx-CP400 6801 PL-40R 6802 MIDI Keyboard + 6803 CTK-3500 (MIDI keyboard) 07d0 Dazzle 0001 Digital Video Creator I 0002 Global Village VideoFX Grabber @@ -9021,6 +10841,8 @@ 07de Diamond Multimedia 2820 VC500 Video Capture Dongle 07df David Electronics Co., Ltd +07e0 NCP engineering GmbH + 4742 VPN GovNet Box 07e1 Ambient Technologies, Inc. 5201 V.90 Modem 07e2 Elmeg GmbH & Co., Ltd @@ -9050,16 +10872,23 @@ 07f9 Dotop Technology, Inc. 07fa DrayTek Corp. 0778 miniVigor 128 ISDN TA + 0846 ISDN TA [HFC-S] + 0847 ISDN TA [HFC-S] 1012 BeWAN ADSL USB ST (grey) 1196 BWIFI-USB54AR 802.11bg a904 BeWAN ADSL a905 BeWAN ADSL ST +07fc Thomann + 1113 SWISSONIC EasyKeys61 Midikeyboard 07fd Mark of the Unicorn 0000 FastLane MIDI Interface - 0001 FastLane Quad MIDI Interface + 0001 MIDI Interface 0002 MOTU Audio for 64 bit + 0004 MicroBook + 0008 M Series 07ff Unknown 00ff Portable Hard Drive + ffff Mad Catz Gamepad 0801 MagTek 0001 Mini Swipe Reader (Keyboard Emulation) 0002 Mini Swipe Reader @@ -9067,6 +10896,7 @@ 0802 Mako Technologies, LLC 0803 Zoom Telephonics, Inc. 1300 V92 Faxmodem + 3095 V.92 56K Mini External Modem Model 3095 4310 4410a Wireless-G Adapter [Intersil ISL3887] 4410 4410b Wireless-G Adapter [ZyDAS ZD1211B] 5241 Cable Modem @@ -9092,6 +10922,8 @@ 0001 Dual PSX Adaptor 0002 Dual PCS Adaptor 0003 PlayStation Gamepad + e001 Twin controller + e501 SNES Gamepad 0813 Mattel, Inc. 0001 Intel Play QX3 Microscope 0002 Dual Mode Camera Plus @@ -9105,6 +10937,8 @@ 081c Mipsys 081e AlphaSmart, Inc. df00 Handheld +081f Manta + e401 MM812 0822 Reudo Corp. 2001 IRXpress Infrared Device 0825 GC Protronics @@ -9183,6 +11017,7 @@ 1005 Digimax 220 1009 Digimax V4 1012 6500 Document Camera + 103f Digimax S500 1058 S730 Camera 1064 Digimax D830 Camera 1542 Digimax 50 Duo @@ -9201,6 +11036,7 @@ 4505 SMCWUSB-G 802.11bg 4507 SMCWUSBT-G2 802.11g Wireless Adapter [Atheros AR5523] 4521 Siemens S30863-S1016-R107-2 802.11g Wireless Adapter [Intersil ISL3887] + 4531 T-Com Sinus 154 data II [Intersil ISL3887] 5046 SpeedStream 10/100 Ethernet [pegasus] 5501 Wireless Adapter 11g 6500 Cable Modem @@ -9249,6 +11085,7 @@ 4300 WG111U Double 108 Mbps Wireless [Atheros AR5004X / AR5005UX] 4301 WG111U (no firmware) Double 108 Mbps Wireless [Atheros AR5004X / AR5005UX] 5f00 WPN111 802.11g Wireless Adapter [Atheros AR5523] + 68e1 LB1120-100NAS 6a00 WG111v2 54 Mbps Wireless [RealTek RTL8187L] 7100 WN121T RangeMax Next Wireless-N [Marvell TopDog] 9000 WN111(v1) RangeMax Next Wireless [Marvell 88W8362+88W8060] @@ -9256,12 +11093,21 @@ 9010 WNDA3100v1 802.11abgn [Atheros AR9170+AR9104] 9011 WNDA3100v2 802.11abgn [Broadcom BCM4323] 9012 WNDA4100 802.11abgn 3x3:3 [Ralink RT3573] + 9014 WNDA3100v3 802.11abgn 2x2:2 [MediaTek MT7632U] 9018 WNDA3200 802.11abgn Wireless Adapter [Atheros AR7010+AR9280] 9020 WNA3100(v1) Wireless-N 300 [Broadcom BCM43231] + 9021 WNA3100M(v1) Wireless-N 300 [Realtek RTL8192CU] 9030 WNA1100 Wireless-N 150 [Atheros AR9271] 9040 WNA1000 Wireless-N 150 [Atheros AR9170+AR9101] 9041 WNA1000M 802.11bgn [Realtek RTL8188CUS] + 9042 On Networks N150MA 802.11bgn [Realtek RTL8188CUS] + 9043 WNA1000Mv2 802.11bgn [Realtek RTL8188CUS?] + 9050 A6200 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526] + 9051 A6200v2 802.11a/b/g/n/ac (2x2) Wireless Adapter [Realtek RTL8812AU] + 9052 A6100 AC600 DB Wireless Adapter [Realtek RTL8811AU] + 9054 Nighthawk A7000 802.11ac Wireless Adapter AC1900 [Realtek 8814AU] a001 PA101 10 Mbps HPNA Home Phoneline RJ-1 + f001 On Networks N300MA 802.11bgn [Realtek RTL8192CU] 084d Minton Optic Industry Co., Inc. 0001 Jenoptik JD800i 0003 S-Cam F5/D-Link DSC-350 Digital Camera @@ -9284,6 +11130,8 @@ 0852 CSEM 0853 Topre Corporation 0100 HHKB Professional + 0119 RealForce 105UB + 0200 RealForce Compact Keyboard 0854 ActiveWire, Inc. 0100 I/O Board 0101 I/O Board, rev1 @@ -9303,6 +11151,7 @@ 0022 Parallel Port 0023 2 port to Serial Converter 0024 Parallel Port + 0026 PortGear SCSI 0027 1 port to Serial Converter 0028 PortGear to SCSI Converter 0032 PortStation SCSI Module @@ -9312,7 +11161,10 @@ 8023 2 port to Serial 8027 PGSDB9 Serial Port 085c ColorVision, Inc. - 0200 Monitor Spyder + 0100 Spyder 1 + 0200 Spyder 2 + 0300 Spyder 3 + 0400 Spyder 4 0862 Teletrol Systems, Inc. 0863 Filanet Corp. 0864 NetGear, Inc. @@ -9396,8 +11248,13 @@ 5036 Portable secure storage for software licenses 0892 DioGraphy, Inc. 0101 Smartdio Reader/Writer +0894 TSI Incorporated + 0010 Remote NDIS Network Device 0897 Lauterbach + 0001 ICE In-Circuit Emulator 0002 Power Debug/Power Debug II + 0004 PowerDebug + 0005 PowerDebug PRO 089c United Technologies Research Cntr. 089d Icron Technologies Corp. 089e NST Co., Ltd @@ -9413,7 +11270,13 @@ 0013 USBee AX-Plus 0014 USBee AX-Pro 0015 USBee DX +08ac Macraigor Systems LLC + 2024 usbWiggler 08ae Macally (Mace Group, Inc.) +08b0 Metrohm + 0006 814 Sample Processor + 0015 857 Titrando + 001a 852 Titrando 08b4 Sorenson Vision, Inc. 08b7 NATSU 0001 Playstation adapter @@ -9421,14 +11284,21 @@ 01f4 USBSIMM1 08b9 RadioShack Corp. (Tandy) 08bb Texas Instruments - 2702 Speakers - 2704 Audio Codec - 2706 PCM2706 Audio Codec + 2702 PCM2702 16-bit stereo audio DAC + 2704 PCM2704 16-bit stereo audio DAC + 2705 PCM2705 stereo audio DAC + 2706 PCM2706 stereo audio DAC + 2707 PCM2707 stereo audio DAC + 27c4 PCM2704C stereo audio DAC + 27c5 PCM2705C stereo audio DAC + 27c6 PCM2706C stereo audio DAC + 27c7 PCM2707C stereo audio DAC 2900 PCM2900 Audio Codec 2901 PCM2901 Audio Codec 2902 PCM2902 Audio Codec 2904 PCM2904 Audio Codec 2910 PCM2912 Audio Codec + 2912 PCM2912A Audio Codec 29b0 PCM2900B Audio CODEC 29b2 PCM2902 Audio CODEC 29b3 PCM2903B Audio CODEC @@ -9483,6 +11353,7 @@ 2011 Pocket CAM 3 Mega (storage) 2016 PocketCam 2 Mega 2018 Pencam SD 2M + 2019 Pencam SD 2M (mass storage mode) 2020 Slim 3000F 2022 Slim 3200 2024 Pocket DV3500 @@ -9527,8 +11398,10 @@ 0100 Interface ADSL 0101 Interface ADSL 0102 ADSL - 0301 RNIS + 0301 RNIS ISDN TA [HFC-S] 08e4 Pioneer Corp. + 0184 DDJ-WeGO + 0185 DDJ-WeGO2 08e5 Litronic 08e6 Gemalto (was Gemplus) 0001 GemPC-Touch 430 @@ -9593,6 +11466,7 @@ 0002 CECT M800 memory card 08ee CCSI/Hesso 08f0 Corex Technologies + 0005 CardScan 800c 08f1 CTI Electronics Corp. 08f2 Gotop Information Inc. 007f Super Q2 Tablet @@ -9699,6 +11573,12 @@ 0002 SigmaDrive Adapter (TPP) 0906 Faraday Technology Corp. 0908 Siemens AG + 01f4 SIMATIC NET CP 5711 + 01fe SIMATIC NET PC Adapter A2 + 04b1 MediSET + 04b2 NC interface + 04b3 keyboard front panel Cockpit + 04b4 SCR_CCID 2701 ShenZhen SANZHAI Technology Co.,Ltd Spy Pen VGA 0909 Audio-Technica Corp. 090a Trumpion Microelectronics, Inc. @@ -9712,6 +11592,7 @@ 0373 Silicon Motion Camera 037a Silicon Motion Camera 037b Silicon Motion Camera + 037c 300k Pixel Camera 1000 Flash Drive 1132 5-in-1 Card Reader 337b Silicon Motion Camera @@ -9726,11 +11607,13 @@ 937b Silicon Motion Camera b370 Silicon Motion SM370 Camera b371 Silicon Motion SM371 Camera + f37d Endoscope camera 090d Multiport Computer Vertriebs GmbH 090e Shining Technology, Inc. 090f Fujitsu Devices, Inc. 0910 Alation Systems, Inc. 0911 Philips Speech Processing + 0c1c SpeechMike III 149a SpeechMike II Pro Plus LFH5276 2512 SpeechMike Pro 0912 Voquette, Inc. @@ -9771,6 +11654,8 @@ 0003 GPS (various models) 0004 iQue 3600 0200 Data Card Programmer (install) + 086e Forerunner 735XT + 097f Forerunner 235 1200 Data Card Programmer 21a5 etrex Cx (msc) 2236 nuvi 360 @@ -9782,9 +11667,18 @@ 2380 Oregon series 23cc n端vi 1350 2459 GPSmap 62/78 series + 2491 Edge 800 + 2518 eTrex 10 2519 eTrex 30 2535 Edge 800 + 253c GPSmap 62sc 255b Nuvi 2505LM + 2613 Edge 200 TWN + 26a1 Nuvi 55 + 2802 fenix 3 + 28db Drive 5 + 47fb nuviCam + 4cdb Fenix 6 0920 Echelon Co. 7500 Network Interface 0921 GoHubs, Inc. @@ -9792,14 +11686,24 @@ 0922 Dymo-CoStar Corp. 0007 LabelWriter 330 0009 LabelWriter 310 + 0013 LabelManager 400 + 0019 LabelWriter 400 001a LabelWriter 400 Turbo 0020 LabelWriter 450 + 0400 LabelWriter SE450 + 1001 LabelManager PnP + 8003 M10 Digital Postal Scale + 8004 M25 Digital Postal Scale + 8009 S250 Digital Postal Scale 0923 IC Media Corp. 010f SIIG MobileCam 0924 Xerox 23dd DocuPrint M760 (X760_USB) 3ce8 Phaser 3428 Printer + 3cea Phaser 3125 + 3cec Phaser 3250 3d5b Phaser 6115MFP TWAIN Scanner + 3d6d WorkCentre 6015N/NI 420f WorkCentre PE220 Series 421f M20 Scanner 423b Printing Support @@ -9808,6 +11712,9 @@ fffb DocuPrint M750 (X750_USB) 0925 Lakeview Research 0005 Gamtec.,Ltd SmartJoy PLUS Adapter + 03e8 Wii Classic Controller Adapter + 1031 WiseGroup Ltd, Gameport Controller + 1700 PS/SS/N64 Joypad 3881 Saleae Logic 8101 Phidgets, Inc., 1-Motor PhidgetServo v2.0 8104 Phidgets, Inc., 4-Motor PhidgetServo v2.0 @@ -9816,9 +11723,11 @@ 0927 Summus, Ltd 0928 PLX Technology, Inc. (formerly Oxford Semiconductor, Ltd) 8000 Firmware uploader + ffff Blank Oxford Device 0929 American Biometric Co. 092a Toshiba Information & Industrial Sys. And Services 092b Sena Technologies, Inc. + 4210 20S - Bluetooth Motorcycle headset & universal intercom 092f Northern Embedded Science/CAVNEX 0004 JTAG-4 0005 JTAG-5 @@ -9826,6 +11735,9 @@ 0009 Gigabeat F/X (HDD audio player) 000c Gigabeat F (mtp) 0010 Gigabeat S (mtp) + 01bf 2.5"External Hard Disk + 0200 Integrated Bluetooth (Taiyo Yuden) + 021c Atheros AR3012 Bluetooth 0301 PCX1100U Cable Modem (WDM) 0302 PCX2000 Cable Modem (WDM) 0305 Cable Modem PCX3000 @@ -9843,11 +11755,14 @@ 0509 BT EDR Dongle 0706 PocketPC e740 0707 Pocket PC e330 Series - 0708 Pocket PC e350Series + 0708 Pocket PC e350 Series 0709 Pocket PC e750 Series 070a Pocket PC e400 Series 070b Pocket PC e800 Series 0a07 WLM-10U1 802.11abgn Wireless Adapter [Ralink RT3572] + 0a08 WLM-20U2/GN-1080 802.11abgn Wireless Adapter [Atheros AR7010+AR9280] + 0a0b WLU5053 802.11abgn Wireless Module [Broadcom BCM43236B] + 0a13 AX88179 Gigabit Ethernet [Toshiba] 0b05 PX1220E-1G25 External hard drive 0b09 PX1396E-3T01 External hard drive 0b1a STOR.E ALU 2S @@ -9860,6 +11775,7 @@ 130c F3607gw Mobile Broadband Module 1311 F3607gw v2 Mobile Broadband Module 1400 Memory Stick 2GB + 140b Memory Stick 64GB 642f TravelDrive 6506 TravelDrive 2C 6507 TravelDrive 2C @@ -9899,8 +11815,9 @@ 653d Kingston DataTraveler 2.0 Stick (1GB) 653e Flash Memory 6540 TransMemory Flash Memory - 6544 Kingston DataTraveler 2.0 Stick (2GB) - 6545 Kingston DataTraveler 102 Flash Drive / HEMA Flash Drive 2 GB / PNY Attache 4GB Stick + 6544 TransMemory-Mini / Kingston DataTraveler 2.0 Stick + 6545 Kingston DataTraveler 102/2.0 / HEMA Flash Drive 2 GB / PNY Attache 4GB Stick + a002 SunplusIT SATA bridge 0931 Harmonic Data Systems, Ltd 0932 Crescentec Corp. 0300 VideoAdvantage @@ -9913,11 +11830,17 @@ 0933 Quantum Corp. 0934 Spirent Communications 0936 NuTesla + 000a Moebius + 000b iMoebius 000c Rhythmedics 6 BioData Integrator + 000d Hypurius + 000e Millennius + 000f Purius 0030 Composite Device, Mass Storage Device (Flash Drive) amd HID 003c Rhythmedics HID Bootloader 0939 Lumberg, Inc. - 0b15 Toshiba Stor.E Alu 2 1TB (PX1710E-1HJ0) + 0b15 Toshiba Stor.E Alu 2 + 0b16 Toshiba StorE HDD 093a Pixart Imaging, Inc. 0007 CMOS 100K-R Rev. 1.90 010e Digital camera, CD302N/Elta Medi@ digi-cam/HE-501A @@ -9938,10 +11861,14 @@ 260e PAC7311 Gigaware VGA PC Camera:Trust WB-3350p:SIGMA cam 2350 260f PAC7311 SnakeCam 2621 PAC731x Trust Webcam + 2622 Webcam Genius 2624 Webcam + 2628 Webcam Genius iLook 300 + 2700 GE 1.3 MP MiniCam Pro 093b Plextor Corp. 0010 Storage Adapter 0011 PlexWriter 40/12/40U + 0012 PlexWriter 48/24/48U 0041 PX-708A DVD RW 0042 PX-712UF DVD RW a002 ConvertX M402U XLOADER @@ -9985,63 +11912,107 @@ 0951 Kingston Technology 0008 Ethernet 000a KNU101TX 100baseTX Ethernet + 1539 Iron Key D300 (Virtual CD-ROM and USB Stick) 1600 DataTraveler II Pen Drive 1601 DataTraveler II+ Pen Drive 1602 DataTraveler Mini 1603 DataTraveler 1GB/2GB Pen Drive 1606 Eee PC 701 SD Card Reader [ENE UB6225] 1607 DataTraveler 100 + 160b DataTraveler 2.0 (2GB) 160d DataTraveler Vault Privacy + 160e DT110P/1GB Capless 1613 DataTraveler DT101C Flash Drive 1616 DataTraveler Locker 4GB + 161a Dell HyperVisor internal flash drive 1621 DataTraveler 150 (32GB) 1624 DataTraveler G2 1625 DataTraveler 101 II 162a DataTraveler 112 4GB Pen Drive + 162b DataTraveler HyperX 3.0 162d DataTraveler 102 1630 DataTraveler 200 (32GB) 1642 DT101 G2 1643 DataTraveler G3 1653 Data Traveler 100 G2 8 GiB 1656 DataTraveler Ultimate G2 + 1660 Data Traveller 108 + 1665 Digital DataTraveler SE9 + 1666 DataTraveler 100 G3/G4/SE9 G2/50 1689 DataTraveler SE9 168a DataTraveler Micro 168c DT Elite 3.0 + 16a4 HyperX 7.1 Audio + 16b3 HyperX Savage + 16d2 HX-KB4BL1-US [HYPERX Alloy FPS Pro] + 16d4 HyperX SavageEXO [0382] + 16d5 DataTraveler Elite G2 + 16df HyperX QuadCast + 16e4 HyperX Pulsefire Raid 0954 RPM Systems Corp. -0955 NVidia Corp. - 7030 Tegra 3 (recovery mode) - 7100 Notion Ink Adam - 7820 Tegra 2 AC100 developer mode +0955 NVIDIA Corp. + 7005 Bootloader + 7018 T186 [Tegra Parker] + 701a U-Boot running on Tegra + 7020 L4T (Linux for Tegra) running on Tegra + 7030 T30 [Tegra 3] recovery mode + 7100 Tegra Device + 7140 T124 [Tegra K1/Logan 32-bit] + 7210 SHIELD Controller + 7321 Switch [Tegra Erista] recovery mode + 7721 T210 [TX1 Tegra Erista] recovery mode + 7820 T20 [Tegra 2] recovery mode + 7c18 T186 [TX2 Tegra Parker] recovery mode b400 SHIELD (debug) b401 SHIELD + cf05 SHIELD Tablet (debug) + cf06 SHIELD Tablet + cf07 SHIELD Tablet + cf08 SHIELD Tablet + cf09 SHIELD Tablet 0956 BSquare Corp. 0957 Agilent Technologies, Inc. 0200 E-Video DC-350 Camera 0202 E-Video DC-350 Camera + 0407 33220A Waveform Generator 0518 82357B GPIB Interface 0a07 34411A Multimeter + 1507 33210A Waveform Generator 1745 Test and Measurement Device (IVI) + 1f01 N5181A MXG Analog Signal Generator 2918 U2702A oscilloscope + fb18 LC Device 0958 CompuLink Research, Inc. 0959 Cologne Chip AG - 2bd0 Intelligent ISDN (Ver. 3.60.04) + 2bd0 Intelligent ISDN (Ver. 3.60.04) [HFC-S] 095a Portsmith 3003 Express Ethernet 095b Medialogic Corp. 095c K-Tec Electronics 095d Polycom, Inc. 0001 Polycom ViaVideo -0967 Acer (??) +0964 BITRAN +0967 Acer NeWeb Corp. 0204 WarpLink 802.11b Adapter 0968 Catalyst Enterprises, Inc. 096e Feitian Technologies, Inc. + 0005 ePass2000 0120 Microcosm Ltd Dinkey + 0305 ePass2000Auto + 0309 ePass3000GM + 0401 ePass3000 + 0405 Zzkey Dongle + 0608 SC Reader KP382 + 0702 ePass3003 + 0703 ePass3003Auto 0802 ePass2000 (G&D STARCOS SPK 2.4) 0807 ePass2003 0971 Gretag-Macbeth AG + 2000 i1 Pro + 2001 i1 Monitor 2003 Eye-One display 2005 Huey - 2007 ColorMunki + 2007 ColorMunki Photo 0973 Schlumberger 0001 e-gate Smart Card 0974 Datagraphix, a business unit of Anacomp @@ -10066,6 +12037,7 @@ 0984 Apricorn 0040 SATA Wire (2.5") 0200 Hard Drive Storage (TPP) + 1407 Secure Key 3.0 0985 cab Produkttechnik GmbH & Co KG 0045 Mach4/200 Label Printer 00a3 A3/200 or A3/300 Label Printer @@ -10080,8 +12052,12 @@ 0996 Integrated Telecom Express, Inc. 099a Zippy Technology Corp. 0638 Sanwa Supply Inc. Small Keyboard + 2620 Graphics tablet [Polostar PT1001, Zeniq PT1001, Leogics PT1001] 610c EL-610 Super Mini Electron luminescent Keyboard + 6330 SANWA Supply Inc. Slim Keyboard + 713a WK-713 Multimedia Keyboard 7160 Hyper Slim Keyboard +099e Trimble Navigation, Ltd 09a3 PairGain Technologies 09a4 Contech Research, Inc. 09a5 VCON Telecommunications @@ -10095,6 +12071,9 @@ 3642 Prism 2.x 802.11b Adapter 09ab Japan Cash Machine Co., Ltd. 09ae Tripp Lite + 0002 Any Device (see discussion) +09b0 Fargo + 2400 HDP5000 09b2 Franklin Electronic Publishers, Inc. 0001 eBookman Palm Computer 09b3 Altius Solutions, Inc. @@ -10129,13 +12108,31 @@ 09c1 Arris Interactive LLC 1337 TOUCHSTONE DEVICE 09c2 Nisca Corp. -09c3 ActivCard, Inc. +09c3 HID Global 0007 Reader V2 0008 ZFG-9800-AC SmartCard Reader 0014 ActivIdentity ActivKey SIM USB Token + 0028 Crescendo Key + 0029 Crescendo Key + 002a Crescendo Key + 002b Crescendo Key + 002c Crescendo Key + 002e Crescendo Key 09c4 ACTiSYS Corp. 0011 ACT-IR2000U IrDA Dongle 09c5 Memory Corp. +09ca BMC Messsysteme GmbH + 5544 PIO +09cb FLIR Systems + 1001 Network Adapter + 1002 Ex-Series RNDIS interface + 1004 Ex-Series UVC interface + 1005 Ex-Series RNDIS and UVC interface + 1006 Ex-Series RNDIS and MSD interface + 1007 Ex-Series UVC and MSD interface + 1008 Serial Port + 1996 FLIR ONE Camera + 4007 Breach 09cc Workbit Corp. 0404 BAFO USB-ATA/ATAPI Bridge Controller 09cd Psion Dacom Home Networks, Ltd @@ -10145,13 +12142,17 @@ 09d1 NeoMagic, Inc. 09d2 Vreelin Engineering, Inc. 09d3 Com One - 0001 ISDN TA -09d7 Novatel Wireless - 0100 NovAtel FlexPack GPS receiver + 0001 ISDN TA / Light Rider 128K + 000b Bluetooth Adapter class 2 +09d7 Hexagon NovAtel Inc. + 0100 GPS/GNSS/SPAN sensor +09d8 ELATEC GmbH + 0320 TWN3 Multi125 + 0406 TWN4 MIFARE NFC 09d9 KRF Tech, Ltd -09da A4 Tech Co., Ltd +09da A4Tech Co., Ltd. 0006 Optical Mouse WOP-35 / Trust 450L Optical Mouse - 000a Optical Mouse Opto 510D + 000a Optical Mouse Opto 510D / OP-620D 000e X-F710F Optical Mouse 3xFire Gaming Mouse 0018 Trust Human Interface Device 001a Wireless Mouse & RXM-15 Receiver @@ -10160,10 +12161,15 @@ 024f RF Receiver and G6-20D Wireless Optical Mouse 0260 KV-300H Isolation Keyboard 032b Wireless Mouse (Battery Free) + 09da Bloody V8 Mouse + 1068 Bloody A90 Mouse + 112c Bloody V5 Mouse + 3a60 Bloody V8M Core 2 Mouse 8090 X-718BK Oscar Optical Gaming Mouse 9033 X-718BK Optical Mouse 9066 F3 V-Track Gaming Mouse 9090 XL-730K / XL-750BK / XL-755BK Mice + f613 Bloody V7M Mouse 09db Measurement Computing Corp. 0075 MiniLab 1008 0076 PMD-1024 @@ -10180,6 +12186,7 @@ 09e6 Silutia, Inc. 09e7 Real 3D, Inc. 09e8 AKAI Professional M.I. Corp. + 0045 MPK Mini Mk II MIDI Controller 0062 MPD16 MIDI Pad Controller Unit 006d EWI electronic wind instrument 0071 MPK25 MIDI Keyboard @@ -10210,6 +12217,7 @@ 0a00 Liquid Audio 0a01 ViA, Inc. 0a05 Unknown Manufacturer + 0001 Hub 7211 hub 0a07 Ontrak Control Systems Inc. 0064 ADU100 Data Acquisition Interface @@ -10219,6 +12227,8 @@ 00d0 ADU208 Relay I/O Interface 00da ADU218 Solid-State Relay I/O Interface 0a0b Cybex Computer Products Co. +0a0d Servergy, Inc + 2514 CTS-1000 Internal Hub 0a11 Xentec, Inc. 0a12 Cambridge Silicon Radio, Ltd 0001 Bluetooth Dongle (HCI mode) @@ -10232,6 +12242,7 @@ 0009 Nanosira4-EDR WHQL Reference Radio 000a Nanosira4-EDR-ROM 000b Nanosira5-ROM + 0042 SPI Converter 0043 Bluetooth Device 0100 Casira with BlueCore2-External Module 0101 Casira with BlueCore2-Flash Module @@ -10253,7 +12264,7 @@ 9988 Trek2000 TD-G2 0a17 Pentax Corp. 0004 Optio 330 - 0006 Optio S + 0006 Optio S / S4 0007 Optio 550 0009 Optio 33WR 000a Optio 555 @@ -10262,6 +12273,7 @@ 0015 Optio S40/S5i 003b Optio 50 (mass storage mode) 003d Optio S55 + 0041 Optio S5z 0043 *ist DL 0047 Optio S60 0052 Optio 60 Digital Camera @@ -10316,6 +12328,8 @@ 5023 Mass Storage Device 5024 Mass Storage Device 5025 Mass Storage Device +0a4a Ploytec GmbH + a400 AUDIO JUNCTION 2.0 0a4b Fujitsu Media Devices, Ltd 0a4c Computex Co., Ltd 15d9 OPTICAL MOUSE @@ -10365,6 +12379,7 @@ 0a5b EAsics NV 0a5c Broadcom Corp. 0201 iLine10(tm) Network Adapter + 0bdc 802.11a/b/g/n/ac Wireless Adapter 2000 Bluetooth Device 2001 Bluetooth Device 2009 BCM2035 Bluetooth @@ -10398,6 +12413,10 @@ 2150 BCM2046 Bluetooth Device 2151 Bluetooth 2154 BCM92046DG-CL1ROM Bluetooth 2.1 UHE Dongle + 216a BCM43142A0 Bluetooth + 216c BCM43142A0 Bluetooth Device + 216d BCM43142A0 Bluetooth 4.0 + 216f BCM20702A0 Bluetooth 217d HP Bluethunder 217f BCM2045B (BDC-2.1) 2198 Bluetooth 3.0 Device @@ -10414,6 +12433,7 @@ 21e3 HP Portable Valentine 21e6 BCM20702 Bluetooth 4.0 [ThinkPad] 21e8 BCM20702A0 Bluetooth 4.0 + 21ec BCM20702A0 Bluetooth 4.0 21f1 HP Portable Bumble Bee 22be BCM2070 Bluetooth 3.0 + HS 4500 BCM2046B1 USB 2.0 Hub (part of BCM2046 Bluetooth) @@ -10423,17 +12443,28 @@ 5801 BCM5880 Secure Applications Processor with fingerprint swipe sensor 5802 BCM5880 Secure Applications Processor with fingerprint touch sensor 5803 BCM5880 Secure Applications Processor with secure keyboard + 5804 BCM5880 Secure Applications Processor with fingerprint swipe sensor 6300 Pirelli Remote NDIS Device - bd11 TiVo AG0100 802.11bg Wireless Adapter [Broadcom BCM4320] + 6410 BCM20703A1 Bluetooth 4.1 + LE + bd11 BCM4320 802.11bg Wireless Adapter + bd12 BCM4326U 802.11bg Wireless Adapter bd13 BCM4323 802.11abgn Wireless Adapter + bd16 BCM4319 802.11bgn Wireless Adapter bd17 BCM43236 802.11abgn Wireless Adapter + bd1d BCM43526 802.11a/b/g/n/ac (2x2) Wireless Adapter + bd1e BCM43143 802.11bgn (1x1) Wireless Adapter + bd1f BCM43242 802.11abgn Wireless Adapter d11b Eminent EM4045 [Broadcom 4320 USB] 0a5d Diatrend Corp. 0a5f Zebra 0009 LP2844 Printer + 0050 P120i / WM120i 0081 GK420t Label Printer + 0084 GX420d Desktop Label Printer 008b HC100 wristbands Printer + 008c ZP 450 Printer 00d1 Zebra GC420d Label Printer + 0110 ZD500 Desktop Label Printer 930a Printer 0a62 MPMan 0010 MPMan MP-F40 MP3 Player @@ -10471,6 +12502,34 @@ 0a84 Maui Innovative Peripherals 0a85 Idexx Labs 0a86 NITGen Co., Ltd +0a89 Aktiv + 0001 Guardant Stealth/Net + 0002 Guardant ID + 0003 Guardant Stealth 2 + 0004 Rutoken + 0005 Guardant Fidus + 0006 Guardant Stealth 3 + 0007 Guardant Stealth 2 + 0008 Guardant Stealth 3 Sign/Time + 0009 Guardant Code + 000a Guardant Sign Pro + 000b Guardant Sign Pro HID + 000c Guardant Stealth 3 Sign/Time + 000d Guardant Code HID + 000f Guardant System Firmware Update + 0020 Rutoken S + 0025 Rutoken lite + 0026 Rutoken lite HID + 002a Rutoken Mass Storage + 002b Guardant Mass Storage + 0030 Rutoken ECP + 0040 Rutoken ECP HID + 0060 Rutoken Magistra + 0061 Rutoken Magistra + 0069 Reader + 0080 Rutoken PinPad Ex + 0081 Rutoken PinPad In + 0082 Rutoken PinPad 2 0a8d Picturetel 0a8e Japan Aviation Electronics Industry, Ltd 2011 Filter Driver For JAE XMC R/W @@ -10573,11 +12632,15 @@ 0070 NRP-Z57 0083 NRP-Z85 0095 NRP-Z86 + 0117 HMF / HMP / HMS-X / HMO series Oscilloscopes + 0118 HMF / HMP / HMS-X / HMO series Oscilloscopes + 0119 HMF / HMP / HMS-X / HMO series Oscilloscopes 0aae NEC infrontia Corp. (Nitsuko) 0aaf Digitalway Co., Ltd 0ab0 Arrow Strong Electronics Co., Ltd 0ab1 FEIG ELECTRONIC GmbH 0002 OBID RFID-Reader + 0004 OBID classic-pro 0aba Ellisys 8001 Tracker 110 Protocol Analyzer 8002 Explorer 200 Protocol Analyzer @@ -10611,7 +12674,9 @@ c303 Saturn USB 2.0 Camera c326 Namuga 1.3M Webcam c33f Webcam + c412 Lenovo IdeaCentre Web Camera c429 Lenovo ThinkCentre Web Camera + c42d Lenovo IdeaCentre Web Camera 0ac9 Micro Solutions, Inc. 0000 Backpack CD-ReWriter 0001 BACKPACK 2 Cable @@ -10628,6 +12693,8 @@ 0401 Spectrum III Hybrid Smartcard Reader 0630 Spectrum III Mag-Only Insert Reader (SPT3-355 Series) USB-CDC 0810 SecurePIN (IDPA-506100Y) PIN Pad + 2030 ValueMag Magnetic Stripe Reader + 3710 ViVOpay Kiosk III 0ace ZyDAS 1201 ZD1201 802.11b 1211 ZD1211 802.11g @@ -10695,18 +12762,22 @@ 0af9 Hama, Inc. 0010 USB SightCam 100 0011 Micro Innovations IC50C Webcam +0afa DMC Co., Ltd. + 07d2 Controller Board for Projected Capacitive Touch Screen DUS3000 0afc Zaptronix Ltd 0afd Tateno Dennou, Inc. 0afe Cummins Engine Co. 0aff Jump Zone Network Products, Inc. 0b00 INGENICO 0b05 ASUSTek Computer, Inc. + 0001 MeMO Pad HD 7 (CD-ROM mode) + 0301 MyPal A696 GPS PDA 1101 Mass Storage (UISDMC4S) 1706 WL-167G v1 802.11g Adapter [Ralink RT2571] 1707 WL-167G v1 802.11g Adapter [Ralink RT2571] 1708 Mass Storage Device - 170b Mass Storage Device - 170c WL-159g 802.11bg + 170b Multi card reader + 170c WL-159g 802.11bg [ZyDAS ZD1211B+AL2230] 170d 802.11b/g Wireless Network Adapter 1712 BT-183 Bluetooth 2.0+EDR adapter 1715 2045 Bluetooth 2.0 Device with trace filter @@ -10718,11 +12789,11 @@ 1723 WL-167G v2 802.11g Adapter [Ralink RT2571W] 1724 RT2573 1726 Laptop OLED Display - 172a ASUS 802.11n Network Adapter + 172a 802.11n Network Adapter 172b 802.11n Network Adapter 1731 802.11n Network Adapter 1732 802.11n Network Adapter - 1734 ASUS AF-200 + 1734 AF-200 173c BT-183 Bluetooth 2.0 173f My Cinema U3100 Mini 1742 802.11n Network Adapter @@ -10736,20 +12807,50 @@ 1779 My Cinema U3100 Mini Plus [AF9035A] 1784 USB-N13 802.11n Network Adapter (rev. A1) [Ralink RT3072] 1786 USB-N10 802.11n Network Adapter [Realtek RTL8188SU] + 1788 BT-270 Bluetooth Adapter 1791 WL-167G v3 802.11n Adapter [Realtek RTL8188SU] + 179c Bluetooth Adapter 179d USB-N53 802.11abgn Network Adapter [Ralink RT3572] 179e Eee Note EA800 (network mode) 179f Eee Note EA800 (tablet mode) + 17a0 Xonar U3 sound card 17a1 Eee Note EA800 (mass storage mode) 17ab USB-N13 802.11n Network Adapter (rev. B1) [Realtek RTL8192CU] + 17ba N10 Nano 802.11n Network Adapter [Realtek RTL8192CU] + 17c2 ROG Spitfire + 17c7 WL-330NUL + 17c9 USB-AC53 802.11a/b/g/n/ac Wireless Adapter [Broadcom BCM43526] + 17cb Broadcom BCM20702A0 Bluetooth + 17d1 AC51 802.11a/b/g/n/ac Wireless Adapter [Mediatek MT7610U] + 17d2 USB-AC56 802.11a/b/g/n/ac Wireless Adapter [Realtek RTL8812AU] + 17d3 USB-N10 v2 802.11b/g/n Wireless Adapter [MediaTek MT7601U] + 17db USB-AC50 802.11a/b/g/n/ac (1x1) Wireless Adapter [MediaTek MT7610U] + 17e8 USB-N14 802.11b/g/n (2x2) Wireless Adapter [Ralink RT5372] + 17eb USB-AC55 802.11a/b/g/n/ac Wireless Adapter [MediaTek MT7612U] + 17f5 Xonar U5 sound card + 180a Broadcom BCM20702 Single-Chip Bluetooth 4.0 + LE + 1817 USB-AC68 802.11a/b/g/n/ac (4x4) Wireless Adapter [Realtek RTL8814AU] + 1825 Qualcomm Bluetooth 4.1 + 18f0 Realtek 8188EUS [USB-N10 Nano] 4c80 Transformer Pad TF300TG 4c90 Transformer Pad Infinity TF700 4c91 Transformer Pad Infinity TF700 (Debug mode) + 4ca0 Transformer Pad TF701T + 4ca1 Transformer Pad TF701T (Debug mode) 4d00 Transformer Prime TF201 4d01 Transformer Prime TF201 (debug mode) 4daf Transformer Pad Infinity TF700 (Fastboot) + 5410 MeMO Pad HD 7 (MTP mode) + 5412 MeMO Pad HD 7 (PTP mode) + 550f Fonepad 7 6101 Cable Modem 620a Remote NDIS Device + 7772 Zenfone GO (ZB500KL) (MTP mode) + 7773 Zenfone GO (ZB500KL) (Debug, MTP mode) + 7774 Zenfone GO (ZB500KL) (RNDIS mode) + 7775 Zenfone GO (ZB500KL) (Debug, RNDIS mode) + 7776 Zenfone GO (ZB500KL) (PTP mode) + 7777 Zenfone GO (ZB500KL) (Debug, PTP mode) b700 Broadcom Bluetooth 2.1 0b0b Datamax-O'Neil 106e Datamax E-4304 @@ -10762,11 +12863,31 @@ 0b0d ProjectLab 0000 CenturyCD 0b0e GN Netcom + 0305 Jabra EVOLVE Link MS + 0311 Jabra EVOLVE 65 + 0312 enc060:Buttons Volume up/down/mute + phone [Jabra] + 0343 Jabra UC VOICE 150a + 0348 Jabra UC VOICE 550a MS + 034c Jabra UC Voice 750 MS + 034d Jabra UC VOICE 750 + 0410 Jabra SPEAK 410 0420 Jabra SPEAK 510 + 0422 Jabra SPEAK 510 USB + 0933 Jabra Freeway + 094d GN Netcom / Jabra REVO Wireless + 1017 Jabra PRO 930 1022 Jabra PRO 9450, Type 9400BS (DECT Headset) + 1041 Jabra PRO 9460 + 1900 Jabra Biz 1900 + 2007 GN 2000 Stereo Corded Headset + 2456 Jabra SPEAK 810 + 245e Jabra Link 370 620c Jabra BT620s 9330 Jabra GN9330 Headset + a346 Jabra Engage 75 Stereo + a50a Alienware Wireless Gaming Headset AW988 0b0f AVID Technology + 0400 DNxID 0b10 Pcally 0b11 I Tech Solutions Co., Ltd 0b1e Electronic Warfare Assoc., Inc. (EWA) @@ -10784,6 +12905,12 @@ 0006 SM Media-Shuttle Card Reader 0b33 Contour Design, Inc. 0020 ShuttleXpress + 0030 ShuttlePro v2 + 0401 RollerMouse Free 2 + 0700 RollerMouse Pro + 08a0 Perfit Mouse + 1000 RollerMouse Red + 1010 Vidamic Technomouse IQ 0b37 Hitachi ULSI Systems Co., Ltd 0b38 Gear Head 0003 Keyboard @@ -10839,12 +12966,18 @@ 300c TT-connect T-3650 CI 300d TT-connect CT-3650 CI 300e TT-connect C-2400 + 3011 TT-connect S2-4600 + 3012 TT-connect CT2-4650 CI + 3014 TT-TVStick CT2-4400 + 3015 TT-connect CT2-4650 CI + 3017 TT-connect S2-4650 CI 0b49 ASCII Corp. 064f Trance Vibrator 0b4b Pine Corp. Ltd. 0100 D'music MP3 Player 0b4d Graphtec America, Inc. 110a Graphtec CC200-20 + 1123 Electronic Cutting Tool [Silhouette Portrait] 0b4e Musical Electronics, Ltd 6500 MP3 Player 8028 MP3 Player @@ -10887,7 +13020,7 @@ 0b7b Taiko Denki Co., Ltd 0b7c ITRAN Communications, Ltd 0b7d Astrodesign, Inc. -0b81 id3 Semiconductors +0b81 id3 Technologies 0001 Biothentic II smartcard reader with fingerprint sensor 0002 DFU-Enabled Devices (DFU) 0012 BioPAD biometric module (DFU + CDC) @@ -10916,10 +13049,12 @@ 0b95 ASIX Electronics Corp. 1720 10/100 Ethernet 1780 AX88178 + 1790 AX88179 Gigabit Ethernet + 6802 AX68002 KVM Switch SoC 7720 AX88772 772a AX88772A Fast Ethernet 772b AX88772B - 7e2b AX88772B + 7e2b AX88772B Fast Ethernet Controller 0b96 Sewon Telecom 0b97 O2 Micro, Inc. 7732 Smart Card Reader @@ -10949,6 +13084,7 @@ 0118 U5 802.11g Adapter 011b Wireless MAXg Adapter [Broadcom 4320] 0121 USR5423 802.11bg Wireless Adapter [ZyDAS ZD1211B] + 0303 USR5637 56K Faxmodem 6112 FaxModem Model 5633 0bb0 Concord Camera Corp. 0100 Sound Vision Stream @@ -10959,8 +13095,10 @@ 6098 USB Cable Modem 0bb3 Ofuji Technology 0bb4 HTC (High Tech Computer Corp.) + 0001 Android Phone via mass storage [Wiko Cink Peax 2] 00ce mmO2 XDA GSM/GPRS Pocket PC 00cf SPV C500 Smart Phone + 0306 Vive Hub Bluetooth 4.1 (Broadcom BCM920703) 0a01 PocketPC Sync 0a02 Himalaya GSM/GPRS Pocket PC 0a03 PocketPC Sync @@ -11129,8 +13267,9 @@ 0b2f Rhodium 0b51 Qtek 8310 mobile phone [Tornado Noble] 0bce Vario MDA - 0c01 Dream / ADP1 / G1 / Magic / Tattoo + 0c01 Dream / ADP1 / G1 / Magic / Tattoo / FP1 0c02 Dream / ADP1 / G1 / Magic / Tattoo (Debug) + 0c03 Android Phone [Fairphone First Edition (FP1)] 0c13 Diamond 0c1f Sony Ericsson XPERIA X1 0c5f Snap @@ -11144,10 +13283,24 @@ 0c9e Incredible 0ca2 Desire HD (debug mode) 0ca5 Android Phone [Evo Shift 4G] + 0cab Desire / Desire HD / Hero / Thunderbolt (HTC Sync Mode) + 0cae T-Mobile MyTouch 4G Slide [Doubleshot] + 0de5 One (M7) + 0dea M7_UL [HTC One] + 0f25 One M8 + 0f63 Desire 610 Via MTP + 0f64 Desire 601 + 0fb4 Remote NDIS based Device + 0ff0 One Mini (M4) 0ff8 Desire HD (Tethering Mode) 0ff9 Desire / Desire HD / Hero / Thunderbolt (Charge Mode) 0ffe Desire HD (modem mode) 0fff Android Fastboot Bootloader + 2008 Android Phone via MTP [MT65xx] + 200b Android Phone via PTP [Wiko Cink Peax 2] + 2134 Vive Hub (SMSC USB2137B) + 2744 Vive Hub (HTC CB USB2) + 2c87 Vive 0bb5 Murata Manufacturing Co., Ltd 0bb6 Network Alchemy 0bb7 Joytech Computer Co., Ltd @@ -11166,19 +13319,54 @@ 2100 FreeAgent Go 2200 FreeAgent Go FW 2300 Expansion Portable + 231a Expansion Portable + 231c Expansion Portable 2320 USB 3.0 bridge [Portable Expansion Drive] + 2321 Expansion Portable + 2322 SRD0NF1 Expansion Portable (STEA) + 2340 FreeAgent External Hard Drive + 3000 FreeAgent Desktop 3008 FreeAgent Desk 1TB + 3101 FreeAgent XTreme 640GB + 3312 SRD00F2 Expansion Desktop Drive (STBV) + 331a Desktop HDD 5TB (ST5000DM000) 3320 SRD00F2 [Expansion Desktop Drive] + 3322 SRD0NF2 [Expansion Desktop Drive] + 3323 Seagate RSS LLC 3332 Expansion + 3343 desktop drive stgy8000400 + 5020 FreeAgent GoFlex 5021 FreeAgent GoFlex USB 2.0 + 5030 FreeAgent GoFlex Upgrade Cable STAE104 5031 FreeAgent GoFlex USB 3.0 + 5032 SATA cable + 5070 FreeAgent GoFlex Desk + 5071 FreeAgent GoFlex Desk 50a1 FreeAgent GoFlex Desk 50a5 FreeAgent GoFlex Desk USB 3.0 5121 FreeAgent GoFlex 5161 FreeAgent GoFlex dock + 6126 Maxtor D3 Station 5TB + 61b5 Maxtor HX-M201TCB [M3 Portable 2TB] + 61b6 Maxtor HX-M101TCB/GM [M3 Portable 1TB] + 61b7 Maxtor M3 Portable a003 Backup Plus a0a1 Backup Plus Desktop a0a4 Backup Plus Desktop Drive + aa14 STJ4000400 [Seagate Basic Portable Drive 4TB] + ab00 Slim Portable Drive + ab1e Backup Plus Portable Drive + ab20 Backup Plus Portable Drive + ab21 Backup Plus Slim + ab24 Backup Plus Portable Drive + ab26 Backup Plus Slim Portable Drive 1 TB + ab28 Seagate Backup Plus Portable 5TB SRD00F1 + ab2d SRD00F1 [Backup Plus Ultra Slim] + ab31 Backup Plus Desktop Drive (5TB) + ab34 Backup Plus + ab38 Backup Plus Hub (Mass Storage) + ab44 Backup Plus Hub + ac20 Backup Plus Slim 2TB 0bc3 IPWireless, Inc. 0001 UMTS-TDD (TD-CDMA) modem 0bc4 Microcube Corp. @@ -11212,6 +13400,7 @@ 0106 Mass Storage Device 0107 Mass Storage Device 0108 Mass Storage Device + 0109 microSDXC Card Reader [Hama 00091047] 0111 RTS5111 Card Reader Controller 0113 Mass Storage Device 0115 Mass Storage Device (Multicard Reader) @@ -11224,7 +13413,7 @@ 0139 RTS5139 Card Reader Controller 0151 Mass Storage Device (Multicard Reader) 0152 Mass Storage Device - 0153 Mass Storage Device + 0153 3-in-1 (SD/SDHC/SDXC) Card Reader 0156 Mass Storage Device 0157 Mass Storage Device 0158 USB 2.0 multicard reader @@ -11235,13 +13424,39 @@ 0171 Mass Storage Device 0176 Mass Storage Device 0178 Mass Storage Device + 0179 RTL8188ETV Wireless LAN 802.11n Network Adapter 0184 RTS5182 Card Reader 0186 Card Reader + 0301 multicard reader + 0307 Card Reader + 0316 Card Reader + 0326 Card reader + 0411 Hub + 0811 Realtek 8812AU/8821AU 802.11ac WLAN Adapter [USB Wireless Dual-Band Adapter 2.4/5Ghz] + 0821 RTL8821A Bluetooth + 1724 RTL8723AU 802.11n WLAN Adapter + 1a2b RTL8188GU 802.11n WLAN Adapter (Driver CDROM Mode) 2831 RTL2831U DVB-T 2832 RTL2832U DVB-T 2838 RTL2838 DVB-T + 5401 RTL 8153 USB 3.0 hub with gigabit ethernet + 5411 RTS5411 Hub + 568c Integrated Webcam HD + 570c Asus laptop camera + 5730 HP 2.0MP High Definition Webcam + 5751 Integrated Webcam + 5775 HP "Truevision HD" laptop camera + 5776 HP Truevision HD integrated webcam + 57b3 Acer 640 480 laptop camera + 57cc HD Webcam - Realtek Semiconductor + 57cf HD WebCam + 57da Built-In Video Camera + 58c2 Integrated Webcam HD + 58c8 Integrated Webcam HD 8150 RTL8150 Fast Ethernet Adapter 8151 RTL8151 Adapteon Business Mobile Networks BV + 8152 RTL8152 Fast Ethernet Adapter + 8153 RTL8153 Gigabit Ethernet Adapter 8171 RTL8188SU 802.11n WLAN Adapter 8172 RTL8191SU 802.11n WLAN Adapter 8174 RTL8192SU 802.11n WLAN Adapter @@ -11251,11 +13466,29 @@ 817f RTL8188RU 802.11n WLAN Adapter 8187 RTL8187 Wireless Adapter 8189 RTL8187B Wireless 802.11g 54Mbps Network Adapter + 818b RTL8192EU 802.11b/g/n WLAN Adapter 8192 RTL8191SU 802.11n Wireless Adapter 8193 RTL8192DU 802.11an WLAN Adapter 8197 RTL8187B Wireless Adapter 8198 RTL8187B Wireless Adapter 8199 RTL8187SU 802.11g WLAN Adapter + 8723 RTL8723A Bluetooth + 8812 RTL8812AU 802.11a/b/g/n/ac 2T2R DB WLAN Adapter + 8813 RTL8814AU 802.11a/b/g/n/ac Wireless Adapter + 881a RTL8812AU-VS 802.11a/b/g/n/ac 2T2R DB WLAN Adapter + 8821 RTL8821A Bluetooth + 9210 RTL9210 M.2 NVME Adapter + a811 RTL8811AU 802.11a/b/g/n/ac WLAN Adapter + b009 Realtek Bluetooth 4.2 Adapter + b00a Realtek Bluetooth 4.2 Adapter + b00b Realtek Bluetooth 4.2 Adapter + b023 RTL8822BE Bluetooth 4.2 Adapter + b711 RTL8188GU 802.11n WLAN Adapter (After Modeswitch) + b720 RTL8723BU 802.11b/g/n WLAN Adapter + b723 RTL8723B Bluetooth + b728 RTL8723B Bluetooth + b72a RTL8723B Bluetooth + b812 RTL88x2bu [AC1200 Techkey] 0bdb Ericsson Business Mobile Networks BV 1000 BV Bluetooth Device 1002 Bluetooth Device 1.2 @@ -11268,6 +13501,7 @@ 1909 F3307 v2 Mobile Broadband Module 190a F3307 Mobile Broadband Module 190b C3607w v2 Mobile Broadband Module + 1926 H5321 gw Mobile Broadband Module 0bdc Y Media Corp. 0bdd Orange PCS 0be2 Kanda Tsushin Kogyo Co., Ltd @@ -11281,6 +13515,7 @@ 0bee LTK Industries, Ltd 0bef Way2Call Communications 0bf0 Pace Micro Technology PLC + c010 EHD100SD 0bf1 Intracom S.A. 0001 netMod Driver Ver 2.4.17 (CAPI) 0002 netMod Driver Ver 2.4 (CAPI) @@ -11301,10 +13536,15 @@ 100c Keyboard FSC KBPC PX 100f miniCard D2301 802.11bg Wireless Module [SiS 163U] 1017 Keyboard KB SCR + 101f Fujitsu Full HD Pro Webcam +0bfb Grass Valley Group + 0200 TURBO iDDR Front Panel 0bfd Kvaser AB 0004 USBcan II 000b Leaf Light HS 000e Leaf SemiPro HS +0c00 FireFly Mouse Mat + 1607 Apex M500 0c04 MOTO Development Group, Inc. 0c05 Appian Graphics 0c06 Hasbro Games, Inc. @@ -11314,6 +13554,7 @@ 0c09 Comjet Information System a5a5 Litto Version USB2.0 0c0a Highpoint Technologies, Inc. + 6124 RocketStor 6124V 0c0b Dura Micro, Inc. (Acomdata) 27cb 6-in-1 Flash Reader and Writer 27d7 Multi Memory reader/writer MD-005 @@ -11330,10 +13571,10 @@ b001 USB 2.0 Mass Storage IDE adapter b004 MMC/SD Reader and Writer 0c12 Zeroplus - 0005 PSX Vibration Feedback Converter + 0005 PSX Vibration Feedback Converter / Intec Wireless Controller for Xbox 0030 PSX Vibration Feedback Converter 700e Logic Analyzer (LAP-C-16032) - 8801 Xbox Controller + 8801 Nyko Xbox Controller 8802 Xbox Controller 8809 Red Octane Ignition Xbox DDR Pad 880a Pelican Eclipse PL-2023 @@ -11352,6 +13593,8 @@ 0c1a Silicon Motion, Inc. 0c1b MIPS Technologies 0c1c Hang Zhou Silan Electronics Co., Ltd +0c1f Magicard + 1800 Tango 2E 0c22 Tally Printer Corp. 0c23 Lernout + Hauspie 0c24 Taiyo Yuden @@ -11366,14 +13609,16 @@ 0012 Bluetooth Device(BC04-External) 0018 Bluetooth Device(BC04-External) 0019 Bluetooth Device - 0021 Bluetooth Device + 0021 Bluetooth Device (V2.1+EDR) 0c24 Bluetooth Device(SAMPLE) ffff Bluetooth module with BlueCore in DFU mode 0c25 Sampo Corp. 0310 Scream Cam 0c26 Prolific Technology Inc. 0018 USB-Serial Controller [Icom Inc. OPC-478UC] + 002b Icom Inc. IC-R30 0c27 RFIDeas, Inc + 232a pcProx Plus RFID Reader (CDC serial) 3bfa pcProx Card Reader 0c2e Metrologic Instruments 0007 Metrologic MS7120 Barcode Scanner (IBM SurePOS mode) @@ -11382,8 +13627,12 @@ 0206 Metrologic MS4980 Barcode Scanner 0700 Metrologic MS7120 Barcode Scanner (uni-directional serial mode) 0720 Metrologic MS7120 Barcode Scanner (bi-directional serial mode) + 0a64 [Stratos 2700] 0b61 Vuquest 3310g 0b6a Vuquest 3310 Area-Imaging Scanner + 0b81 Barcode scanner Voyager 1400g Series +0c30 Mutoh Industries Ltd + 6010 Kona 1400 Cutting Plotter 0c35 Eagletron, Inc. 0c36 E Ink Corp. 0c37 e.Digital @@ -11401,6 +13650,7 @@ 41d9 i1 phone 0c45 Microdia 0011 EBUDDY + 0520 MaxTrack Wireless Mouse 1018 Compact Flash storage memory card reader 1020 Mass Storage Reader 1028 Mass Storage Reader @@ -11424,6 +13674,8 @@ 1067 Mass Storage Reader 1158 A56AK 184c VoIP Phone + 1a90 2M pixel Microscope Camera (with capture button) [Andonstar V160] + 5101 2.4G Wireless Device [Rii MX3] 6001 Genius VideoCAM NB 6005 Sweex Mini Webcam 6007 VideoCAM Eye @@ -11519,8 +13771,12 @@ 62be PC Camera with Microphone (SN9C202 + OV7663) 62c0 Sonix USB 2.0 Camera 62e0 MSI Starcam Racer + 6300 PC Microscope camera 6310 Sonix USB 2.0 Camera + 6321 HP Integrated Webcam + 6340 Camera 6341 Defender G-Lens 2577 HD720p Camera + 6366 Webcam Vitade AF 63e0 Sonix Integrated Webcam 63f1 Integrated Webcam 63f8 Sonix Integrated Webcam @@ -11529,11 +13785,26 @@ 6417 Integrated Webcam 6419 Integrated Webcam 641d 1.3 MPixel Integrated Webcam + 6433 Laptop Integrated Webcam HD (Composite Device) + 643f Dell Integrated HD Webcam + 644d 1.3 MPixel Integrated Webcam 6480 Sonix 1.3 MP Laptop Integrated Webcam 648b Integrated Webcam + 64ad Dell Laptop Integrated Webcam HD 64bd Sony Visual Communication Camera + 64d0 Integrated Webcam + 64d2 Integrated Webcam + 651b HP Webcam + 652f Backlit Gaming Keyboard + 6705 Integrated HD Webcam + 670c Integrated Webcam HD + 6710 Integrated Webcam + 6712 Integrated Webcam HD + 671d Integrated_Webcam_HD + 7401 TEMPer Temperature Sensor 7402 TEMPerHUM Temperature & Humidity Sensor 7403 Foot Switch + 7404 Foot switch FS1-P 8000 DC31VC 8006 Dual Mode Camera (8006 VGA) 800a Vivitar Vivicam3350B @@ -11544,7 +13815,13 @@ 0c4b Reiner SCT Kartensysteme GmbH 0100 cyberJack e-com/pinpad 0300 cyberJack pinpad(a) + 0400 cyberJack e-com(a) + 0401 cyberJack pinpad(a2) + 0500 cyberJack RFID standard dual interface smartcard reader 0501 cyberJack RFID comfort dual interface smartcard reader + 0502 cyberJack compact + 0504 cyberJack go / go plus + 0505 cyberJack wave 9102 cyberJack RFID basis contactless smartcard reader 0c4c Needham's Electronics 0021 EMP-21 Universal Programmer @@ -11614,6 +13891,16 @@ 0c5a TRS International Mfg., Inc. 0c5e Xytronix Research & Design 0c60 Apogee Electronics Corp. + 0001 MiniMe + 0002 MiniDAC + 0003 ONE + 0004 GiO + 0007 Duet + 0009 Jam + 000a Jam Bootloader + 000b MiC + 000c MiC Bootloader + 8007 Duet DFU Mode 0c62 Chant Sincere Co., Ltd 0c63 Toko, Inc. 0c64 Signality System Engineering Co., Ltd @@ -11643,6 +13930,7 @@ 1600 Ion Quick Play LP turntable 1605 SSS Headphone Set 1607 audio controller + 5663 Audio Device 0c77 Sipix Group, Ltd 1001 SiPix Web2 1002 SiPix SC2100 @@ -11671,6 +13959,11 @@ 0c99 Innochips Co., Ltd 0c9a Hanwool Robotics Corp. 0c9b Jobin Yvon, Inc. +0c9c Brand Innovators BV + 1511 BI-1511 Laser Simulator + 1512 BI-1512 Syncbus Monitor + 1514 BI-1514 HPC + 1532 BI-1532 GPC 0c9d SemTek 0170 3873 Manual Insert card reader 0ca2 Zyfer @@ -11685,8 +13978,15 @@ 2010 myPad110 PC/SC Smart Card Reader 3050 EZ710 Smart Card Reader 0ca7 Information Systems Laboratories +0caa Allied Telesis KK. + 3001 AT-VT-Kit3 Serial Adapter 0cad Motorola CGISS - 9001 PowerPad Pocket PCDevice + 1007 APX Series Consolette + 1020 MOTOTRBO Series Radio (Portable) + 1030 APX Series Radio (Portable) + 1031 APX Series Radio (Mobile) + 1602 IMPRES Battery Data Reader + 9001 PowerPad Pocket PC Device 0cae Ascom Business Systems, Ltd 0caf Buslink 2507 Hi-Speed USB-to-IDE Bridge Controller @@ -11719,7 +14019,6 @@ 0cc4 emsys GmbH 0cc5 Sendo 0cc6 Intermagic Corp. -0cc7 Kontron Medical AG 0cc8 Technotools Corp. 0cc9 BroadMAX Technologies, Inc. 0cca Amphenol @@ -11754,18 +14053,27 @@ 0078 Cinergy T XXS 0086 Cinergy Hybrid XE 008e Cinergy HTC XS + 0096 Grabby 0097 Cinergy T RC MKII 0099 AfaTech 9015 [Cinergy T Stick Dual] 00a5 Cinergy Hybrid Stick 00a9 RTL2838 DVB-T COFDM Demodulator [TerraTec Cinergy T Stick Black] 00b3 NOXON DAB/DAB+ Stick + 00b9 WDR DAB/DAB+ Stick 00e0 NOXON DAB/DAB+ Stick V2 + 0102 Cinergy S2 Stick + 0105 Cinergy S2 Box 10a7 TerraTec G3 + 10ad Cinergy H5 Rev. 2 0cd4 Bang Olufsen 0101 BeolinkPC2 0cd5 LabJack Corporation 0003 U3 0009 UE9 +0cd6 Scheidt & Bachmann + 000c S&B TPU + 000e S&B BKV + 0011 Money Coin Unit 0cd7 NewChip S.r.l. 0cd8 JS Digitech, Inc. 2007 Smart Card Reader/JSTU-9700 @@ -11796,20 +14104,36 @@ 0027 Sphairon Homelink 1202 802.11n Wireless Adapter [Atheros AR9170] 0ce5 Validation Technologies International 0003 Matrix -0ce9 pico Technology +0ce9 Pico Technology 1001 PicoScope3000 series PC Oscilloscope + 1007 PicoScope 2000 series PC Oscilloscope + 1008 PicoScope 5000 series PC Oscilloscope + 1009 PicoScope 4000 series PC Oscilloscope + 100e PicoScope 6000 series PC Oscilloscope + 1012 PicoScope 3000A series PC Oscilloscope + 1016 PicoScope 2000A series PC Oscilloscope + 1018 PicoScope 4000A series PC Oscilloscope + 1200 PicoScope 2000 series PC Oscilloscope + 1201 PicoScope 3000 series PC Oscilloscope + 1202 PicoScope 4000 series PC Oscilloscope + 1203 PicoScope 5000 series PC Oscilloscope + 1204 PicoScope 6000 series PC Oscilloscope + 1211 PicoScope 3000 series PC Oscilloscope + 1212 PicoScope 4000 series PC Oscilloscope 0cf1 e-Conn Electronic Co., Ltd 0cf2 ENE Technology, Inc. 6220 SD Card Reader (SG361) 6225 SD card reader (UB6225) + 6230 SD Card Reader (UB623X) 6250 SD card reader (UB6250) -0cf3 Atheros Communications, Inc. +0cf3 Qualcomm Atheros Communications 0001 AR5523 0002 AR5523 (no firmware) 0003 AR5523 0004 AR5523 (no firmware) 0005 AR5523 0006 AR5523 (no firmware) + 0036 AR9462 Bluetooth 1001 Thomson TG121N [Atheros AR9001U-(2)NG] 1002 TP-Link TL-WN821N v2 / TL-WN822N v1 802.11n [Atheros AR9170] 1006 TP-Link TL-WN322G v3 / TL-WN422G v2 802.11g [Atheros AR9271] @@ -11817,13 +14141,20 @@ 20ff AR7010 (no firmware) 3000 AR3011 Bluetooth (no firmware) 3002 AR3011 Bluetooth + 3004 AR3012 Bluetooth 4.0 3005 AR3011 Bluetooth + 3007 AR3012 Bluetooth 4.0 (no firmware) 3008 Bluetooth (AR3011) + 311d Bluetooth + 311f AR3012 Bluetooth 7015 TP-Link TL-WN821N v3 / TL-WN822N v2 802.11n [Atheros AR7010+AR9287] 9170 AR9170 802.11n 9271 AR9271 802.11n + 9378 QCA9377-7 b002 Ubiquiti WiFiStation 802.11n [Atheros AR9271] b003 Ubiquiti WiFiStationEXT 802.11n [Atheros AR9271] + e006 Dell Wireless 1802 Bluetooth 4.0 LE + e300 QCA61x4 Bluetooth 4.0 0cf4 Fomtex Corp. 0cf5 Cellink Co., Ltd 0cf6 Compucable Corp. @@ -11859,25 +14190,50 @@ 0001 PhotoShuttle 0002 Photo Printer 730 series 0004 Photo Printer 63xPL/PS + 0007 P510K + 0009 P72x Series + 000a P728L + 000b P510L + 000d P518A + 000e P910L + 0010 M610 0100 Photo Printer 63xPL/PS 0102 Photo Printer 64xPS 0103 Photo Printer 730 series 0104 Photo Printer 63xPL/PS 0105 Photo Printer 64xPS + 010e P510S + 0110 P110S + 0111 P510Si + 0112 P518S 0200 Photo Printer 64xDL + 0309 CS-200e + 030a CS-220e + 0501 P75x Series + 0502 P52x Series + 0503 P310L + 050a P310W + 050f P530D + 0800 X610 0d17 NALTEC, Inc. 0d18 coaXmedia 0d19 Hank Connection Industrial Co., Ltd 0d28 NXP - 0204 LPC1768 + 0204 ARM mbed +0d2f Andamiro + 0002 Pump It Up Pad 0d32 Leo Hui Electric Wire & Cable Co., Ltd 0d33 AirSpeak, Inc. 0d34 Rearden Steel Technologies 0d35 Dah Kun Co., Ltd 0d3a Posiflex Technologies, Inc. + 0206 Series 3xxx Cash Drawer + 0207 Series 3xxx Cash Drawer + 0500 Magnetic Stripe Reader 0d3c Sri Cable Technology, Ltd 0d3d Tangtop Technology Co., Ltd 0001 HID Keyboard + 0040 PS/2 Adapter 0d3e Fitcom, inc. 0d3f MTS Systems Corp. 0d40 Ascor, Inc. @@ -11886,6 +14242,7 @@ 0d46 Kobil Systems GmbH 2012 KAAN Standard Plus (Smartcard reader) 3003 mIDentity Light / KAAN SIM III + 3014 Smart Token 4000 mIDentity (mass storage) 4001 mIDentity Basic/Classic (composite device) 4081 mIDentity Basic/Classic (installationless) @@ -11895,6 +14252,7 @@ 0100 Audio 0d49 Maxtor 3000 Drive + 3005 Personal Storage 3000LS 3010 3000LE Drive 3100 Hi-Speed USB-IDE Bridge Controller 3200 Personal Storage 3200 @@ -11904,6 +14262,7 @@ 7000 OneTouch 7010 OneTouch 7100 OneTouch II 300GB External Hard Disk + 7310 OneTouch 4 7410 Mobile Hard Disk Drive (1TB) 7450 Basics Portable USB Device 0d4a NF Corp. @@ -11917,6 +14276,7 @@ 0d4f EADS Airbus France 0d50 Cleware GmbH 0011 USB-Temp2 Thermometer + 0030 Multiplexer 0040 F4 foot switch 0d51 Volex (Asia) Pte., Ltd 0d53 HMI Co., Ltd @@ -11924,6 +14284,8 @@ 0d55 ASKA Technologies, Inc. 0d56 AVLAB Technology, Inc. 0d57 Solomon Microtech, Ltd +0d59 TRC Simulators b.v. + 02a8 Digital Clock 0d5c SMC Networks, Inc. a001 SMC2662W (v1) EZ Connect 802.11b Wireless Adapter [Atmel AT76C503A] a002 SMC2662W v2 / SMC2662W-AR / Belkin F5D6050 [Atmel at76c503a] @@ -11935,6 +14297,7 @@ 0d62 Darfon Electronics Corp. 0003 Smartcard Reader 0004 Keyboard + 001b Keyboard 001c Benq X120 Internet Keyboard Pro 0306 M530 Mouse 0800 Magic Wheel @@ -11942,6 +14305,7 @@ 2026 TECOM Bluetooth Device 2050 Mouse 2106 Dell L20U Multimedia Keyboard + 910e HP Business Slim Keyboard a100 Optical Mouse 0d63 Fritz Gegauf AG 0d64 DXG Technology Corp. @@ -11958,6 +14322,7 @@ 2208 Mass Storage 3105 Dual Mode Digital Camera Disk 3108 Digicam Mass Storage Device + 5566 Contour Roam Model 1600 0d65 KMJP Co., Ltd 0d66 TMT 0d67 Advanet, Inc. @@ -11973,6 +14338,7 @@ 0d77 Power Sentry/Newpoint 0d78 Japan Distributor Corp. 0d7a MARX Datentechnik GmbH + 0001 CrypToken 0d7b Wellco Technology Co., Ltd 0d7c Taiwan Line Tek Electronic Co., Ltd 0d7d Phison Electronics Corp. @@ -12009,10 +14375,13 @@ 0001 Audio Device 0002 Composite Device 0003 Sound Device + 0004 CM6631A Audio Processor + 0005 Blue Snowball 0006 Storm HP-USB500 5.1 Headset 000c Audio Adapter 000d Composite Device 000e Audio Adapter (Planet UP-100, Genius G-Talk) + 0014 Audio Adapter (Unitek Y-247A) 001f CM108 Audio Controller 0102 CM106 Like Sound Device 0103 CM102-A+/102S+ Audio Controller @@ -12021,6 +14390,7 @@ 0107 CM108 Audio Controller 010f CM108 Audio Controller 0115 CM108 Audio Controller + 0139 Multimedia Headset [Gigaware by Ignition L.P.] 013c CM108 Audio Controller 0201 CM6501 5000 Mass Storage Controller @@ -12088,7 +14458,7 @@ 0300 Avaya Wireless Card 1007 Discovery Kids Digital Camera 0d99 Trazer Technologies, Inc. -0d9a RTX Telecom AS +0d9a RTX AS 0001 Bluetooth Device 0d9b Tat Shing Electrical Co. 0d9c Chee Chen Hi-Technology Co., Ltd @@ -12107,8 +14477,10 @@ 0da1 Suzhou Peter's Precise Industrial Co., Ltd 0da2 Land Instruments International, Ltd 0da3 Nippon Electro-Sensory Devices Corp. -0da4 Polar Electro OY +0da4 Polar Electro Oy 0001 Interface + 0003 FlowLink + 0008 Loop 0da7 IOGear, Inc. 0da8 softDSP Co., Ltd 0001 SDS 200A Oscilloscope @@ -12118,7 +14490,10 @@ 0db0 Micro Star International 1020 PC2PC WLAN Card 1967 Bluetooth Dongle + 3713 Primo 73 3801 Motorola Bluetooth 2.1+EDR Device + 3870 MS-3870 802.11bgn Wireless Module [Ralink RT3070] + 3871 MS-3871 802.11bgn Wireless Module [Ralink RT8070] 4011 Medion Flash XL V2.0 Card Reader 4023 Lexar Mobile Card Reader 4600 802.11b/g Turbo Wireless Adapter @@ -12149,12 +14524,23 @@ a97a Bluetooth EDR Device b970 Bluetooth EDR Device b97a Bluetooth EDR Device + ffff Bluetooth Adapter in DFU mode 0db1 Wen Te Electronics Co., Ltd 0db2 Shian Hwi Plug Parts, Plastic Factory 0db3 Tekram Technology Co., Ltd 0db4 Chung Fu Chen Yeh Enterprise Corp. +0db5 Access IS + 0139 Barcode Module - CDC serial + 013a Barcode Module - Virtual Keyboard + 013b Barcode Module - HID + 0160 NFC and Smartcard Module (NSM) + 0164 NFC and Smartcard Module (NSM)with 4 SAM slots 0db7 ELCON Systemtechnik 0002 Goldpfeil P-LAN +0dba Digidesign + 1000 Mbox 1 [Mbox] + 3000 Mbox 2 + b011 Eleven Rack 0dbc A&D Medical 0003 AND Serial Cable [AND Smart Cable] 0dbe Jiuh Shiuh Precision Industry Co., Ltd @@ -12164,6 +14550,7 @@ 021b USB-2.0 IDE Adapter 0300 Storage Adapter 0333 Storage Adapter + 0502 FSC Storagebird XL hard disk 0707 ZIV Drive 0dc0 G7 Solutions (formerly Great Notions) 0dc1 Tamagawa Seiki Co., Ltd @@ -12173,12 +14560,14 @@ 1104 ASEDrive IIIe KB 1701 ASEKey 1702 ASEKey -0dc4 Macpower Peripherals, Ltd +0dc4 inXtron, Inc. 0040 Mass Storage Device 0041 Mass Storage Device 0042 Mass Storage Device 0101 Hi-Speed Mass Storage Device + 0209 SK-3500 S2 020a Oyen Digital MiniPro 2.5" hard drive enclosure + 0290 Mass Storage Device [NT2 U3.1] 0dc5 SDK Co., Ltd 0dc6 Precision Squared Technology Corp. 2301 Wireless Touchpad Keyboard @@ -12193,12 +14582,14 @@ 0003 Mass Storage (P) 0dd3 MediaQ 0dd4 Custom Engineering SPA + 0237 K80 80mm Thermal Printer 0dd5 California Micro Devices 0dd7 Kocom Co., Ltd 0dd8 Netac Technology Co., Ltd + 0562 Netac Portable SSD Z6s 1060 USB-CF-Card e007 OnlyDisk U222 Pendrive - f607 OnlyDisk U208 1G flash drive [U-SAFE] + f607 OnlyDisk U210 1G flash drive [U-SAFE] 0dd9 HighSpeed Surfing 0dda Integrated Circuit Solution, Inc. 0001 Multi-Card Reader 6in1 @@ -12279,11 +14670,15 @@ 005d WLA-2000 v1.001 WLAN [RTL8191SU] 0060 WLA-4000 802.11bgn [Ralink RT3072] 0062 WLA-5000 802.11abgn [Ralink RT3572] + 006f WLA-5100 + 0072 AX88179 Gigabit Ethernet [Sitecom] 061c LN-028 Network USB 2.0 Adapter + 214a IDE/SATA Combo Adapter [CN-330] 21f4 44 St Bluetooth Device 2200 Sitecom bluetooth2.0 class 2 dongle CN-512 2208 Sitecom bluetooth2.0 class 2 dongle CN-520 2209 Sitecom bluetooth2.0 class 1 dongle CN-521 + 3068 DC-104v2 ISDN Adapter [HFC-S] 9071 WL-113 rev 1 Wireless Network USB Adapter 9075 WL-117 Hi-Speed USB Adapter 90ac WL-172 Wireless Network USB Adapter 54g Turbo @@ -12302,6 +14697,9 @@ 0dfa Toyo Communication Equipment Co., Ltd 0dfc GeneralTouch Technology Co., Ltd 0001 Touchscreen + 0003 MultiTouch TouchScreen(Dualtouch) + 0101 5-point Touch Screen + d107 MultiTouch TouchScreen 0e03 Nippon Systemware Co., Ltd 0e08 Winbest Technology Co., Ltd 0e0b Amigo Technology Inc. @@ -12309,6 +14707,8 @@ 9041 802.11n Wireless USB Card 0e0c Gesytec 0101 LonUSB LonTalk Network Adapter +0e0d PicoQuant GmbH + 0003 PicoHarp 300 0e0f VMware, Inc. 0001 Device 0002 Virtual USB Hub @@ -12316,13 +14716,19 @@ 0004 Virtual CCID 0005 Virtual Mass Storage 0006 Virtual Keyboard + 000a Virtual Sensors + 8001 Root Hub + 8002 Root Hub + 8003 Root Hub f80a Smoker FX2 0e16 JMTek, LLC 0e17 Walex Electronic, Ltd 0e1a Unisys 0e1b Crewave +0e1e Green Hills Software 0e20 Pegasus Technologies Ltd. 0101 NoteTaker + 0200 Seiko Instruments InkLink Handwriting System 0e21 Cowon Systems, Inc. 0300 iAudio CW200 0400 MP3 Player @@ -12347,11 +14753,8 @@ 0e34 Micro Computer Control Corp. 0e35 3Pea Technologies, Inc. 0e36 TiePie engineering - 0008 Handyscope HS3 - 0009 Handyscope HS3 (br) - 000a Handyscope HS4 - 000b Handyscope HS4 (br) - 000e Handyscope HS4-DIFF + 0009 Handyscope HS3 + 000b Handyscope HS4 000f Handyscope HS4-DIFF (br) 0010 Handyscope HS2 0011 TiePieSCOPE HS805 (br) @@ -12387,9 +14790,12 @@ 0e4a Shenzhen Bao Hing Electric Wire & Cable Mfr. Co. 0e4c Radica Games, Ltd 1097 Gamester Controller - 2390 Games Jtech Controller + 1103 Gamester Reflex + 2390 Jtech Controller + 3510 Gamester for Xbox 7288 funkey reader 0e50 TechnoData Interware + 0001 Matrix USB-Key 0002 Matrixlock Dongle (HID) 0e55 Speed Dragon Multimedia, Ltd 110a Tanic S110-SG1 + ISSC IS1002N [Slow Infra-Red (SIR) & Bluetooth 1.2 (Class 2) Adapter] @@ -12420,11 +14826,43 @@ 0002 Wrist PDA 0e6a Megawin Technology Co., Ltd 0101 MA100 [USB-UART Bridge IC] + 02c0 Defender Gaming Keyboard + 030b Truly Ergonomic Computer Keyboard (Device Firmware Update mode) + 030c Truly Ergonomic Computer Keyboard 6001 GEMBIRD Flexible keyboard KB-109F-B-DE + 7f5c BPF-015 Key Chain Photo Frame 0e6f Logic3 0003 Freebird wireless Controller 0005 Eclipse wireless Controller 0006 Edge wireless Controller + 0008 After Glow Pro Controller + 0105 Disney's High School Musical 3 Dance Pad for Xbox 360 + 0113 Afterglow AX.1 Gamepad + 011f Rock Candy Wired Controller for Xbox 360 + 0128 Wireless PS3 Controller + 0131 PDP EA Sports Controller + 0133 Wired Controller + 0139 Afterglow Prismatic Wired Controller for Xbox One + 013a PDP Xbox One Controller + 0146 Rock Candy Wired Controller for Xbox One + 0147 PDP Marvel Controller for Xbox One + 015c PDP Arcade Stick for Xbox One + 0161 Camo Wired Controller for Xbox One + 0162 Xbox One Wired Controller + 0163 Legendary Collection Deliverer of Truth + 0164 Battlefield 1 Wired Controller for Xbox One + 0165 Titanfall 2 Wired Controller for Xbox One + 0201 Pelican PL-3601 + 0213 Afterglow Gamepad for Xbox 360 + 021f Rock Candy Gamepad for Xbox 360 + 0246 Rock Candy Gamepad for Xbox One + 0301 Controller + 0346 Rock Candy Wired Controller for Xbox One + 0401 Controller + 0413 Afterglow AX.1 Gamepad for Xbox 360 + 0501 Wired Controller + f501 Hi-TEC Essentials Wired Gamepad + f900 Afterglow AX.1 0e70 Tokyo Electronic Industry Co., Ltd 0e72 Hsi-Chin Electronics Co., Ltd 0e75 TVS Electronics, Ltd @@ -12438,6 +14876,7 @@ 1417 A43 IT 14ad 97 Titanium HD 150e 80 G9 + 3001 40 Titanium 0e7b On-Tech Industry Co., Ltd 0e7e Gmate, Inc. 0001 Yopy 3000 PDA @@ -12446,19 +14885,31 @@ 0e83 Shin An Wire & Cable Co. 0e8c Well Force Electronic Co., Ltd 0e8d MediaTek Inc. + 0002 phone (mass storage mode) [Doro Primo 413] 0003 MT6227 phone 0004 MT6227 phone - 0023 S103 - 1806 Samsung SE-208AB Slim Portable DVD Writer + 0023 S103 / Powertel M6200 + 00a5 GSM modem [Medion Surfstick Model:S4222] + 1806 Samsung SE-208 Slim Portable DVD Writer 1836 Samsung SE-S084 Super WriteMaster Slim External DVD writer + 1887 Slim Portable DVD Writer + 1956 Samsung SE-506 Portable BluRay Disc Writer + 2000 MT65xx Preloader + 2008 Cyrus Technology CS 24 3329 Qstarz BT-Q1000XT + 7612 MT7612U 802.11a/b/g/n/ac Wireless Adapter + 763e MT7630e Bluetooth Adapter + 7668 MT7668 2x2 Dual Band Dual Concurrent 802.11a/b/g/n/ac WiFi with MU-MIMO and Bluetooth 5.0 Radios 0e8f GreenAsia Inc. 0003 MaxFire Blaze2 - 0012 USB Wireless 2.4GHz Gamepad + 0012 Joystick/Gamepad 0016 4 port USB 1.1 hub UH-174 0020 USB to PS/2 Adapter 0021 Multimedia Keyboard Controller + 0022 multimedia keyboard controller 0201 SmartJoy Frag Xpad/PS2 adaptor + 3008 Xbox Controller + 300a steering Wheel 0e90 WiebeTech, LLC 0100 Storage Adapter V1 0e91 VTech Engineering Canada, Ltd @@ -12479,7 +14930,8 @@ 0ea0 Ours Technology, Inc. 2126 7-in-1 Card Reader 2153 SD Card Reader Key - 2168 Transcend JetFlash 2.0 / Astone USB Drive + 2168 Transcend JetFlash 2.0 / Astone USB Drive / Intellegent Stick 2.0 + 2213 WinDroid N287 AH7N2502.013317 6803 OTI-6803 Flash Disk 6808 OTI-6808 Flash Disk 6828 OTI-6828 Flash Disk @@ -12499,7 +14951,10 @@ 0eb3 Saint Technology Corp. 0eb7 Endor AG 0eb8 Mettler Toledo - f000 PS60 Scale + 2200 Ariva Scale + f000 BC60 Scale +0ebb Thermo Fisher Scientific + 0002 FT-IR Spectrometer 0ebe VWeb Corp. 0ebf Omega Technology of Taiwan, Inc. 0ec0 LHI Technology (China) Co., Ltd @@ -12535,11 +14990,17 @@ 0ee3 ComTrue Technology Corp. 1000 Image Tank 1.5 0ee4 Sunrich Technology, Ltd + 0690 SATA 3 Adapter 0eee Digital Stream Technology, Inc. 8810 Mass Storage Drive 0eef D-WAV Scientific Co., Ltd - 0001 eGalax TouchScreen + 0001 Titan6001 Surface Acoustic Wave Touchscreen Controller [eGalax] 0002 Touchscreen Controller(Professional) + 7200 Touchscreen Controller + 7904 Multitouch Capacitive Touchscreen eGalaxTouch EXC7904-21v00_T13 [IIyama Prolite T1932-MSC] + a802 eGalaxTouch EXC7920 + b10e eGalaxTouch EXC3000 + c000 Multitouch Capacitive Touchscreen eGalaxTouch EXC3188-4643-08.00.00.00 Sirius_4643 PCAP3188UR Series [IIyama Prolite PLT1932MSC] 0ef0 Hitachi Cable, Ltd 0ef1 Aichi Micro Intelligent Corp. 0ef2 I/O Magic Corp. @@ -12558,8 +15019,21 @@ 0f08 CSL Wire & Plug (Shen Zhen) Co. 0f0c CAS Corp. 0f0d Hori Co., Ltd + 000a Dead or Alive 4 FightStick for Xbox 360 + 000c Horipad EX Turbo for Xbox 360 + 000d Fighting Stick EX2 for Xbox 360 0011 Real Arcade Pro 3 + 0016 Real Arcade Pro.EX for Xbox 360 + 001b Real Aracde Pro.VX + 0063 Real Arcade Pro Hayabusa for Xbox One + 0067 Horipad One + 0078 Real Arcade Pro V Kai for Xbox One / Xbox 360 + 0090 Horipad Ultimate + 00c1 HORIPAD for Nintendo Switch 0f0e Energy Full Corp. +0f0f Silego Technology Inc + 0006 GreenPak Universal Dev Board (Active Mode) + 8006 GreenPak Universal Dev Board (Reset Mode) 0f11 LD Didactic GmbH 1000 CASSY-S 1010 Pocket-CASSY @@ -12577,6 +15051,9 @@ 2040 Machine Test System 0f12 Mars Engineering Corp. 0f13 Acetek Technology Co., Ltd +0f14 Ingenico + 0012 Vital'Act 3S + 0038 XIRING Smart Card Terminal LEO V2 0f18 Finger Lakes Instrumentation 0002 CCD 0006 Focuser @@ -12598,13 +15075,20 @@ 0f2f Priva Design Services 0f30 Jess Technology Co., Ltd 001c PS3 Guitar Controller Dongle + 010b Philips Recoil 0110 Dual Analog Rumble Pad 0111 Colour Rumble Pad + 0202 Joytech Advanced Controller 0208 Xbox & PC Gamepad + 8888 BigBen XBMiniPad Controller 0f31 Chrysalis Development 0f32 YFC-BonEagle Electric Co., Ltd 0f37 Kokuyo Co., Ltd 0f38 Nien-Yi Industrial Corp. +0f39 TG3 Electronics + 0404 Recreated ZX Spectrum Keyboard + 0876 Keyboard [87 Francium Pro] + 1086 DK2108SZ Keyboard [Ducky Zero] 0f3d Airprime, Incorporated 0112 CDMA 1xEVDO PC Card, PC 5220 0f41 RDC Semiconductor Co., Ltd @@ -12614,6 +15098,8 @@ ef12 Patriot ff11 Liberty (firmware not loaded) ff12 Liberty +0f49 Evolis SA + 0a00 Zenius 0f4b St. John Technology Co., Ltd 0f4c WorldWide Cable Opto Corp. 0f4d Microtune, Inc. @@ -12634,6 +15120,7 @@ 1001 Targus Mini Trackball Optical Mouse 0f63 LeapFrog Enterprises 0010 Leapster Explorer + 0022 Leap Reader 0500 Fly Fusion 0600 Leap Port Turbo 0700 POGO @@ -12663,6 +15150,7 @@ 0403 NDS Capture 0404 NDS Emulator (Lite) 0f73 DFI +0f78 Guntermann & Drunck GmbH 0f7c DQ Technology, Inc. 0f7d NetBotz, Inc. 0f7e Fluke Corp. @@ -12708,24 +15196,36 @@ 0006 Blackberry Pearl 0008 Blackberry Pearl 8001 Blackberry Handheld - 8004 Blackberry Handheld + 8004 Blackberry 8007 Blackberry Handheld 8010 Blackberry Playbook (Connect to Windows mode) 8011 Blackberry Playbook (Connect to Mac mode) + 8014 Blackberry Handheld Z30 8020 Blackberry Playbook (CD-Rom mode) + 8037 Blackberry PRIV 0fce Sony Ericsson Mobile Communications AB 0076 W910i (Multimedia mode) 00af V640i Phone [PTP Camera] 00d4 C902 [MTP] 00d9 C702 Phone 0112 W995 Walkman Phone + 014e J108i Cedar (MTP mode) 015a Xperia Pro [Media Transfer Protocol] 0166 Xperia Mini Pro 0167 ST15i (Xperia mini) 0169 Xperia S 0172 Xperia P 0177 Xperia Ion [Mass Storage] - 0dde Xperia Mini Pro Bootloader + 0188 ST26i + 019c C6833 + 019e C6903 + 01a5 SO-04F + 01a7 D5503 + 01ba D6603 [Xperia Z3] + 01bb D5803 [Xperia Z3 Compact] (MTP mode) + 01e0 F5122 [Xperia X dual] (MTP mode) + 01e8 F5321 [Xperia X Compact] (MTP mode) + 01f9 H8314 [Xperia XZ2 Compact] 1010 WMC Modem 10af V640i Phone [PictBridge] 10d4 C902 Phone [PictBridge] @@ -12733,19 +15233,30 @@ 2137 Xperia X10 mini (USB debug) 2138 Xperia X10 mini pro (Debug) 2149 Xperia X8 (debug) + 214e J108i Cedar (Windows-driver mode) 3137 Xperia X10 mini 3138 Xperia X10 mini pro 3149 Xperia X8 + 514f Xperia arc S [Adb-Enable Mode] + 5169 Xperia S [Adb-Enable Mode] 5177 Xperia Ion [Debug Mode] 518c C1605 [Xperia E dual] MTD mode + 51a7 D5503 (Xperia Z1 Compact) + 51e0 F5122 [Xperia X dual] (developer mode) 614f Xperia X12 (debug mode) 6166 Xperia Mini Pro 618c C1605 [Xperia E dual] MSC mode 715a Xperia Pro [Tethering] 7166 Xperia Mini Pro (Tethering mode) 7177 Xperia Ion [Tethering] + 71f4 G8441 (Xperia XZ1 Compact) [Tethering] + 71f9 H8314 [Xperia XZ2 Compact] (Tethering) 8004 9000 Phone [Mass Storage] - adde Boot loader + 81f4 G8441 (Xperia XZ1 Compact) [Tethering] + adde C2005 (Xperia M dual) in service mode + c1e0 F5122 [Xperia X dual] (MIDI mode) + c1e8 F5321 [Xperia X Compact] (MIDI mode) + c1f9 H8314 [Xperia XZ2 Compact] (MIDI) d008 V800-Vodafone 802SE Phone d016 K750i Phone d017 K608i Phone @@ -12760,13 +15271,16 @@ d046 K610i Phone d065 W960i Phone (PC Suite) d076 W910i (Phone mode) + d079 K530 Phone d089 W580i Phone (mass storage) d0a1 K810 d0af V640i Phone d0cf MD300 Mobile Broadband Modem d0d4 C902 Phone [Modem] d0e1 MD400 Mobile Broadband Modem + d12a U100i Yari Phone d12e Xperia X10 + d14e J108i Cedar (modem mode) e000 K810 (PictBridge mode) e039 K800i (msc mode) e042 W810i Phone @@ -12785,16 +15299,32 @@ e112 W995 Phone (Mass Storage) e12e X10i Phone e133 Vivaz + e14e J108i Cedar (mass-storage mode) e14f Xperia Arc/X12 e15a Xperia Pro [Mass Storage Class] e161 Xperia Ray e166 Xperia Mini Pro e167 XPERIA mini + e19b C2005 [Xperia M dual] (Mass Storage) + e1a9 D5303 + e1aa D2303 + e1ad D5103 + e1b0 D6708 + e1b5 D2004 + e1ba D6683 + e1bb SO-02G + e1bc D2203 + e1c0 SGP621 + e1c2 D2533 + e1c9 E6553 + e1cf SGP771 + f0fa MN800 / Smartwatch 2 (DFU mode) 0fcf Dynastream Innovations, Inc. 1003 ANT Development Board - 1004 ANT2USB + 1004 ANTUSB Stick 1006 ANT Development Board - 1008 Mini stick Suunto + 1008 ANTUSB2 Stick + 1009 ANTUSB-m Stick 0fd0 Tulip Computers B.V. 0fd1 Giant Electronics Ltd. 0fd2 Seac Banche @@ -12810,21 +15340,31 @@ 002c EyeTV DTT Deluxe v2 0033 Video Capture 0037 Video Capture v2 + 0060 Stream Deck + 0063 Stream Deck Mini + 006c Stream Deck XL + 006d Stream Deck original V2 0fda Quantec Networks GmbH 0100 quanton flight control 0fdc Micro Plus +0fde Oregon Scientific + ca01 WMRS200 weather station + ca05 CM160 + ca08 WMR300 Professional Weather System 0fe0 Osterhout Design Group 0100 Bluetooth Mouse 0101 Bluetooth IMU 0200 Bluetooth Keypad +0fe2 Air Techniques 0fe4 IN-Tech Electronics, Ltd 0fe5 Greenconn (U.S.A.), Inc. -0fe6 Kontron (Industrial Computer Source / ICS Advent) +0fe6 ICS Advent 8101 DM9601 Fast Ethernet Adapter 811e Parallel Adapter 9700 DM9601 Fast Ethernet Adapter 0fe9 DVICO 4020 TViX M-6500 + 9010 FusionRemote IR receiver db00 FusionHDTV DVB-T (MT352+LgZ201) (uninitialized) db01 FusionHDTV DVB-T (MT352+LgZ201) (initialized) db10 FusionHDTV DVB-T (MT352+Thomson7579) (uninitialized) @@ -12840,14 +15380,17 @@ 0ff7 CHI SHING Computer Accessories Co., Ltd 0ffc Clavia DMI AB 0021 Nord Stage 2 + 002a Nord Piano 4 0ffd EarlySense ff00 OEM 0fff Aopen, Inc. 1000 Speed Tech Corp. + 153b TerraTec Electronic GmbH 1001 Ritronics Components (S) Pte., Ltd 1003 Sigma Corp. 0003 SD14 0100 SD9/SD10 + 8781 Dock UD-01 1004 LG Electronics, Inc. 1fae U8120 3G Cellphone 6000 Various Mobile Phones @@ -12855,24 +15398,35 @@ 6018 GM360/GD510/GW520/KP501 618e Ally/Optimus One/Vortex (debug mode) 618f Ally/Optimus One + 61c5 P880 / Charge only 61c6 Vortex (msc) 61cc Optimus S + 61da G2 Android Phone [tethering mode] 61f1 Optimus Android Phone [LG Software mode] - 61f9 V909 G-Slate + 61f9 Optimus (Various Models) MTP Mode 61fc Optimus 3 61fe Optimus Android Phone [USB tethering mode] - 6300 Optimus Android Phone - 631c Optimus Android Phone [MTP mode] - 631e Optimus Android Phone [Camera/PTP mode] + 627f G3 (VS985) Android Phone (MTP/Download mode) + 6300 G2/Optimus Android Phone [Charge mode] + 631c LM-X420xxx/G2/Optimus Android Phone (charge mode) + 631d Optimus Android Phone (Camera/PTP Mode) + 631e LM-X420xxx/G2/Optimus Android Phone (PTP/camera mode) + 631f Optimus Android Phone (Charge Mode) + 633a Ultimate 2 Android Phone L41C + 633e LM-X420xxx/G2/G3 Android Phone (MTP/download mode) + 6344 LM-X420xxx/G2 Android Phone (USB tethering mode) + 6348 LM-X420xxx Android Phone (MIDI mode) 6356 Optimus Android Phone [Virtual CD mode] 6800 CDMA Modem 7000 LG LDP-7024D(LD)USB + 91c8 P880 / USB tethering a400 Renoir (KC910) 1005 Apacer Technology, Inc. 1001 MP3 Player 1004 MP3 Player 1006 MP3 Player - b113 Handy Steno 2.0/HT203 + b113 Handy Steno/AH123 / Handy Steno 2.0/HT203 + b155 Disk Module b223 CD-RW + 6in1 Card Reader Digital Storage / Converter 1006 iRiver, Ltd. 3001 iHP-100 @@ -12907,13 +15461,14 @@ 1015 Softronics Pty., Ltd 1016 Xiamen Hung's Enterprise Co., Ltd 1017 Speedy Industrial Supplies, Pte., Ltd + 9015 M625 [Vendor: DELUX] 1019 Elitegroup Computer Systems (ECS) 0c55 Flash Reader, Desknote UCR-61S2B 0f38 Infrared Receiver 1020 Labtec 0006 Wireless Keyboard 000a Wireless Optical Mouse - 0106 Wireless Optical Mouse + 0106 Wireless Optical Mouse/Keyboard 1022 Shinko Shoji Co., Ltd 1025 Hyper-Paltek 005e USB DVB-T device @@ -12929,17 +15484,23 @@ 102c Etoms Electronics Corp. 6151 Q-Cam Sangha CIF 6251 Q-Cam VGA + ff0c Joytech Wireless Advanced Controller 102d Winic Corp. 1031 Comax Technology, Inc. 1032 C-One Technology Corp. 1033 Nucam Corp. 0068 3,5'' HDD case MD-231 -1038 Ideazon, Inc. - 0100 Zboard - 1361 Sensei +1038 SteelSeries ApS + 0100 Ideazon Zboard + 1260 Arctis 7 wireless adapter + 1361 Ideazon Sensei + 1410 SRW-S1 [Simraceway Steering Wheel] + 1720 Mouse 1039 devolo AG 0824 1866 802.11bg [Texas Instruments TNETW1450] 2140 dsl+ 1100 duo +103a PSA + f000 Actia Evo XS 103d Stanton 0100 ScratchAmp 0101 ScratchAmp @@ -12971,10 +15532,12 @@ 8901 Bluetooth Device 9967 W9967CF/W9968CF Webcam IC 1048 Targus Group International + 2010 4-Port hub 104b Mylex / Buslogic 104c AMCO TEC International, Inc. 104d Newport Corporation 1003 Model-52 LED Light Source Power Supply and Driver + 3001 ESP301 3 Axis Motion Controller 104f WB Electronics 0001 Infinity Phoenix 0002 Smartmouse @@ -12985,10 +15548,25 @@ 0008 Infinity CryptoKey 0009 RE-BL PlayStation 3 IR-to-Bluetooth converter 1050 Yubico.com - 0010 Yubikey - 0110 Yubikey NEO OTP - 0111 Yubikey NEO OTP+CCID + 0010 Yubikey (v1 or v2) + 0110 Yubikey NEO(-N) OTP + 0111 Yubikey NEO(-N) OTP+CCID + 0112 Yubikey NEO(-N) CCID + 0113 Yubikey NEO(-N) U2F + 0114 Yubikey NEO(-N) OTP+U2F + 0115 Yubikey NEO(-N) U2F+CCID + 0116 Yubikey NEO(-N) OTP+U2F+CCID + 0120 Yubikey Touch U2F Security Key + 0200 Gnubby U2F 0211 Gnubby + 0401 Yubikey 4/5 OTP + 0402 Yubikey 4/5 U2F + 0403 Yubikey 4/5 OTP+U2F + 0404 Yubikey 4/5 CCID + 0405 Yubikey 4/5 OTP+CCID + 0406 Yubikey 4/5 U2F+CCID + 0407 Yubikey 4/5 OTP+U2F+CCID + 0410 Yubikey plus OTP+U2F 1053 Immanuel Electronics Co., Ltd 1054 BMS International Beheer N.V. 5004 DSL 7420 Loader @@ -13000,30 +15578,84 @@ 0200 FireWire USB Combo 0400 External HDD 0500 hub - 0702 Passport External HDD - 0704 Passport External HDD - 070a My Passport Essential SE - 071a My Passport - 0730 My Passport - 0740 My Passport - 0742 My Passport Essential SE - 0748 My Passport 1TB USB 3.0 + 0701 WD Passport (WDXMS) + 0702 WD Passport (WDXMS) + 0704 My Passport Essential (WDME) + 0705 My Passport Elite (WDML) + 070a My Passport Essential (WDBAAA), My Passport for Mac (WDBAAB), My Passport Essential SE (WDBABM), My Passport SE for Mac (WDBABW) + 070b My Passport Elite (WDBAAC) + 070c My Passport Studio (WDBAAE) + 071a My Passport Essential (WDBAAA) + 071d My Passport Studio (WDBALG) + 0730 My Passport Essential (WDBACY) + 0732 My Passport Essential SE (WDBGYS) + 0740 My Passport Essential (WDBACY) + 0741 My Passport Ultra + 0742 My Passport Essential SE (WDBGYS) + 0748 My Passport (WDBKXH, WDBY8L) + 07a8 My Passport (WDBBEP), My Passport for Mac (WDBLUZ) + 07ae My Passport Edge for Mac (WDBJBH) + 07ba PiDrive (WDLB) + 0810 My Passport Ultra (WDBZFP) + 0816 My Passport Air (WDBBLW) + 0820 My Passport Ultra (WDBMWV, WDBZFP) + 0822 My Passport Ultra (WDBBUZ) + 0824 My Passport Slim (WDBPDZ) + 0830 My Passport Ultra (WDBZFP) + 0837 My Passport Ultra (WDBBKD) 0900 MyBook Essential External HDD - 0901 MyBook External HDD + 0901 My Book Essential Edition (Green Ring) (WDG1U) + 0902 My Book Pro Edition (WDG1T) 0903 My Book Premium Edition - 0910 MyBook Essential External HDD - 1001 External Hard Disk [Elements] - 1003 Elements 1000 GB - 1010 Elements External HDD - 1021 Elements 2TB - 1023 Elements SE + 0905 My Book Pro Edition II (WD10000C033-001) + 0910 My Book Essential Edition (Green Ring) (WDG1U) + 1001 Elements Desktop (WDE1U) + 1003 WD Elements Desktop (WDE1UBK) + 1010 Elements Portable (WDBAAR) + 1021 Elements Desktop (WDBAAU) + 1023 Elements SE Portable (WDBABV) + 1042 Elements SE Portable (WDBPCK) + 1048 Elements Portable (WDBU6Y) + 1078 Elements Portable (WDBUZG) + 107c Elements Desktop (WDBWLG) + 10a2 Elements SE Portable (WDBPCK) + 10a8 Elements Portable (WDBUZG) + 10b8 Elements Portable (WDBU6Y, WDBUZG) + 1100 My Book Essential Edition 2.0 (WDH1U) + 1102 My Book Home Edition (WDH1CS) 1103 My Book Studio - 1104 MyBook Mirror Edition External HDD + 1104 My Book Mirror Edition (WDH2U) 1105 My Book Studio II - 1123 My Book 3.0 - 1140 My Book Essential USB3.0 + 1110 My Book Essential (WDBAAF), My Book for Mac (WDBAAG) + 1111 My Book Elite (WDBAAH) + 1112 My Book Studio (WDBAAJ), My Book Studio LX (WDBACH) + 1123 My Book 3.0 (WDBABP) + 1130 My Book Essential (WDBACW) + 1140 My Book Essential (WDBACW) + 1170 My Book Essential 3TB (WDBACW0030HBK) + 1230 My Book (WDBFJK) + 1235 My Book (WDBFJK0040HBK) + 2599 My Passport Ultra (WD40NMZW) + 259d My Passport Ultra (WDBBKD) + 259f My Passport Ultra (WD10JMVW) + 25a1 Elements / My Passport + 25a2 Elements 25A2 + 25a3 Elements Desktop (WDBWLG) + 25da My Book (WDBFJK) + 25e1 My Passport (WD20NMVW) + 25e2 My Passport (WD40NMZW) + 25ee My Book 25EE + 25f3 My Passport SSD (WDBK3E) + 25fa easystore Portable 5TB (WDBKUZ0050) + 25fb easystore Desktop (WDBCKA) + 2603 My Passport Game Storage for PS4 4TB (WDBZGE0040) + 2624 easystore Portable 5TB (WDBKUZ0050) + 2626 My Passport (WDBPKJ) + 30a0 SATA adapter cable 1059 Giesecke & Devrient GmbH 000b StarSign Bio Token 3.0 +105b Foxconn International, Inc. + e065 BCM43142A0 Bluetooth module 105c Hong Ji Electric Wire & Cable (Dongguan) Co., Ltd 105d Delkin Devices, Inc. 105e Valence Semiconductor Design, Ltd @@ -13035,6 +15667,8 @@ 1065 CCYU Technology 0020 USB-DVR2 Dev Board 2136 EasyDisk ED1064 +1068 Micropi Elettronica + 0001 CPUSB - V 1.8 - software-rights management key 106a Loyal Legend, Ltd 106c Curitel Communications, Inc. 1101 CDMA 2000 1xRTT USB modem (HX-550C) @@ -13111,9 +15745,11 @@ 106f Money Controls 0009 CT10x Coin Transaction 000a CR10x Coin Recycler + 000c Xchange 1076 GCT Semiconductor, Inc. 0031 Bluetooth Device 0032 Bluetooth Device + 8002 LU150 LTE Modem [Yota LU150] 107b Gateway, Inc. 3009 eHome Infrared Transceiver 55b2 WBU-110 802.11b Wireless Adapter [Intersil PRISM 3] @@ -13123,15 +15759,53 @@ 107f KidzMouse, Inc. 1082 Shin-Etsukaken Co., Ltd 1083 Canon Electronics, Inc. + 160c CR-55 + 160f DR-1210C + 1614 DR-4010C + 1617 DR-2510C + 1618 DR-X10C + 161a CR-25 161b DR-2010C Scanner + 161d DR-3010C + 1620 DR-7090C + 1622 DR-9050C + 1623 DR-7550C + 1624 DR-6050C + 1626 DR-6010C 162c P-150 Scanner + 1638 DR-6030C + 1639 CR-135i + 163e DR-M160 + 163f DR-M140 + 1640 DR-C125 + 1641 DR-P215 + 1648 FSU-201 + 164a DR-C130 + 164b DR-P208 + 164f DR-G1130 + 1650 DR-G1100 + 1651 DR-C120 + 1654 DR-F120 + 1657 DR-M1060 + 1658 DR-C225 + 1659 DR-P215II + 165d DR-P208II 1084 Pantech Co., Ltd 108a Chloride Power Protection 108b Grand-tek Technology Co., Ltd + 0005 HID Keyboard/Mouse PS/2 Translator 108c Robert Bosch GmbH + 017e GTC 400 C 108e Lotes Co., Ltd. +1091 Numerik Jena + 8101 Absoflex 1099 Surface Optics Corp. 109a DATASOFT Systems GmbH +109b Hisense + 9109 CROSSCALL Trekker-M1 Core (MTP-Mode) + 9118 Medion P4013 Mobile + 9119 CROSSCALL Trekker-M1 Core (PTP-Mode) + f009 CROSSCALL Trekker-M1 Core (CD-ROM-Mode) 109f eSOL Co., Ltd 3163 Trigem Mobile SmartDisplay84 3164 Trigem Mobile SmartDisplay121 @@ -13140,7 +15814,38 @@ 10a9 SK Teletech Co., Ltd 1102 Sky Love Actually IM-U460K 1104 Sky Vega IM-A650S + 1105 VEGA Android composite + 1106 VEGA Android composite + 1107 VEGA Android composite + 1108 VEGA Android composite + 1109 VEGA Android composite 6021 SIRIUS alpha + 6031 Pantech Android composite + 6032 Pantech Android composite + 6033 Pantech Android composite + 6034 Pantech Android composite + 6035 Pantech Android composite + 6036 Pantech Android composite + 6037 Pantech Android composite + 6050 Pantech Android composite + 6051 Pantech Android composite + 6052 Pantech Android composite + 6053 Pantech Android composite + 6054 Pantech Android composite + 6055 Pantech Android composite + 6056 Pantech Android composite + 6057 Pantech Android composite + 6058 Pantech Android composite + 6059 Pantech Android composite + 6080 MHS291LVW LTE Modem [Verizon Jetpack 4G LTE Mobile Hotspot MHS291L] (Zero CD Mode) + 6085 MHS291LVW LTE Modem [Verizon Jetpack 4G LTE Mobile Hotspot MHS291L] (Modem Mode) + 7031 Pantech Android composite + 7032 Pantech Android composite + 7033 Pantech Android composite + 7034 Pantech Android composite + 7035 Pantech Android composite + 7036 Pantech Android composite + 7037 Pantech Android composite 10aa Cables To Go 10ab USI Co., Ltd 1002 Bluetooth Device @@ -13163,23 +15868,29 @@ 10b5 Comodo (PLX?) 9060 Test Board 10b8 DiBcom - 0bb8 DiBcom USB DVB-T reference design (MOD300) (cold) - 0bb9 DiBcom USB DVB-T reference design (MOD300) (warm) - 0bc6 DiBcom USB2.0 DVB-T reference design (MOD3000P) (cold) - 0bc7 DiBcom USB2.0 DVB-T reference design (MOD3000P) (warm) + 0bb8 DVB-T reference design (MOD300) (cold) + 0bb9 DVB-T reference design (MOD300) (warm) + 0bc6 DVB-T reference design (MOD3000P) (cold) + 0bc7 DVB-T reference design (MOD3000P) (warm) 10bb TM Technology, Inc. 10bc Dinging Technology Co., Ltd 10bd TMT Technology, Inc. 1427 Ethernet 10bf SmartHome 0001 SmartHome PowerLinc -10c4 Cygnal Integrated Products, Inc. +10c3 Universal Laser Systems, Inc. + 00a4 ULS PLS Series Laser Engraver Firmware Loader + 00a5 ULS Print Support +10c4 Silicon Labs 0002 F32x USBXpress Device 0003 CommandIR + 800a SPORTident + 800b AES 8030 K4JRG Ham Radio devices 8044 USB Debug Adapter 804e Software Bisque Paramount ME 80a9 CP210x to UART Bridge Controller + 80c4 Infrared Thermometer Adapter 80ca ATM2400 Sensor Device 813f tams EasyControl 8149 West Mountain Radio Computerized Battery Analyzer @@ -13187,19 +15898,51 @@ 814b West Mountain Radio RIGtalk 818a Silicon Labs FM Radio Reference Design 81e8 Zephyr BioHarness + 834b Infrared Online Sensor Adapter + 834e Infrared Sensor Adapter 8460 Sangoma Wanpipe VoiceTime 8461 Sangoma U100 + 8470 Juniper Networks BX Series System Console 8477 Balluff RFID Reader + 8496 SiLabs Cypress FW downloader + 8497 SiLabs Cypress EVB + 84fb Infrared Blackbody Adapter + 8508 RS485 Adapter 8605 dilitronics ESoLUX solar lighting controller + 8660 Netronics CANdoISO 86bc C8051F34x AudioDelay [AD-340] 8789 C8051F34x Extender & EDID MGR [EMX-DVI] 87be C8051F34x HDMI Audio Extractor [EMX-HD-AUD] 8863 C8051F34x Bootloader 8897 C8051F38x HDMI Splitter [UHBX] - ea60 CP210x UART Bridge / myAVR mySmartUSB light + 88c9 AES HID device + 8918 C8051F38x HDMI Audio Extractor [VSA-HA-DP] + 8973 C8051F38x HDMI Extender [UHBX-8X] + 89c6 SPORTident HID device + 89e1 C8051F38x HDMI Extender [UHBX-SW3-WP] + 89fb Qivicon ZigBee Stick + 8a3c C8051F38x HDBaseT Receiver [UHBX-R-XT] + 8a6c C8051F38x 4K HDMI Audio Extractor [EMX-AMP] + 8acb C8051F38x HDBaseT Wall Plate Receiver with IR, RS-232, and PoH [UHBX-R-WP] + 8af8 C8051F38x 4K HDMI Audio Extractor w/Audio Amplifier, HDBT Input, Line Audio Input RS-232 Ports and IP Control [VSA-X21] + 8b8c C8051F38x 4K HDMI Audio Extractor w/Audio Amplifier, HDBT Input, Line Audio Input RS-232 Ports and IP Control [SC-3H] + 8db5 C8051F38x CATx HDMI Receiver with USB [EX-HDU-R] + 8db6 C8051F38x CATx HDMI Receiver + ea60 CP210x UART Bridge ea61 CP210x UART Bridge - ea70 CP210x UART Bridge - ea80 CP210x UART Bridge + ea63 CP210x UART Bridge + ea70 CP2105 Dual UART Bridge + ea71 CP2108 Quad UART Bridge + ea80 CP2110 HID UART Bridge + ea90 CP2112 HID I2C Bridge + ea91 CP2112 HID SMBus/I2C Bridge for CP2614 Evaluation Kit + ea93 CP2112 HID SMBus/I2C Bridge for CP2615 Evaluation Kit + eab0 CP2114 I2S Audio Bridge + eac0 CP2614 MFi Accessory Digital Audio Bridge + eac1 CP2615 I2S Audio Bridge + eac9 EFM8UB1 Bootloader + eaca EFM8UB2 Bootloader + eacb EFM8UB3 Bootloader 10c5 Sanei Electric, Inc. 819a FM Radio 10c6 Intec, Inc. @@ -13208,7 +15951,13 @@ 1101 MP3 Player 10cd Kycon, Inc. 10ce Silicon Labs + 0007 Shinko/Sinfonia CHC-S1245 000e Shinko/Sinfonia CHC-S2145 + 0019 Shinko/Sinfonia CHC-S6145 + 001d Shinko/Sinfonia CHC-S6245 + 001e Ciaat Brava 21 + 0039 Sinfonia CHC-S2245 + 10ce Sinfonia CHC-S2245 ea6a MobiData EDGE USB Modem 10cf Velleman Components, Inc. 2011 R-Engine MPEG2 encoder/decoder @@ -13220,12 +15969,16 @@ 0101 USB-Module for Spider8, CP32 0202 CP22 - Communication Processor 0301 CP42 - Communication Processor +10d2 RayComposer - R. Adams + 5243 RayComposer 10d4 Man Boon Manufactory, Ltd 10d5 Uni Class Technology Co., Ltd 0004 PS/2 Converter 5552 KVM Human Interface Composite Device (Keyboard/Mouse ports) 55a2 2Port KVMSwitcher + 5a08 Dual Bay Docking Station 10d6 Actions Semiconductor Co., Ltd + 0c02 BioniQ 1001 Tablet 1000 MP3 Player 1100 MPMan MP-Ki 128 MP3 Player/Recorder 1101 D-Wave 2GB MP4 Player / AK1025 MP3/MP4 Player @@ -13247,8 +16000,37 @@ 1a08 Internal Webcam 1a1e Laptop Integrated Webcam 1.3M 1a2a Laptop Integrated Webcam + 1a2e HP Truevision HD Integrated Webcam 10f5 Turtle Beach 0200 Audio Advantage Roadie + 0231 Ear Force P11 Headset + 10f5 EarForce PX21 Gaming Headset +10f8 Cesys GmbH + 3201 CeboLC + 3202 CeboStick + 3203 CeboMSA64 + 3204 CeboDFN + 3205 PSAA2304W_CASC + c401 USBV4F unconfigured + c402 EFM01 unconfigured + c403 MISS2 unconfigured + c404 CID unconfigured + c405 USBS6 unconfigured + c406 OP_MISS2 unconfigured + c407 NanoUsb uncofigured + c481 USBV4F + c482 EFM01 + c483 MISS2 + c484 CID + c485 USBS6 + c486 OP_MISS2 + c487 NanoUsb + c501 EFM02 unconfigured + c502 EFM02/B unconfigured + c503 EFM03 unconfigured + c581 EFM02 + c582 EFM02/B + c583 EFM03 10fb Pictos Technologies, Inc. 10fd Anubis Electronics, Ltd 7e50 FlyCam Usb 100 @@ -13263,6 +16045,8 @@ 0001 FSK Electronics Super GSM Reader 1108 Brightcom Technologies, Ltd 110a Moxa Technologies Co., Ltd. + 1110 UPort 1110 + 1150 UPort 1150 1-Port RS-232/422/485 1250 UPort 1250 2-Port RS-232/422/485 1251 UPort 1250I 2-Port RS-232/422/485 with Isolation 1410 UPort 1410 4-Port RS-232 @@ -13297,10 +16081,14 @@ 112e Master Hill Electric Wire and Cable Co., Ltd 112f Cellon International, Inc. 1130 Tenx Technology, Inc. + 0001 BlyncLight 0002 iBuddy + 0004 iBuddy Twins 0202 Rocket Launcher 6604 MCE IR-Receiver + 6606 U+P Mouse 660c Foot Pedal/Thermometer + 6626 Key 6806 Keychain photo frame c301 Digital Photo viewer [Wallet Pix] f211 TP6911 Audio Headset @@ -13321,8 +16109,12 @@ 3131 CTS LS515 113c Arin Tech Co., Ltd 113d Mapower Electronics Co., Ltd +113f Integrated Biometrics, LLC + 1020 Watson Two-Finger Roll Scanner + 1100 Columbo Single-Finger Scanner 1141 V One Multimedia, Pte., Ltd 1142 CyberScan Technologies, Inc. + 0709 Cyberview High Speed Scanner 1145 Japan Radio Company 0001 AirH PHONE AH-J3001V/J3002V 1146 Shimane SANYO Electric Co., Ltd. @@ -13333,6 +16125,7 @@ 114c Tinius Olsen Testing Machine Co., Inc. 114d Alpha Imaging Technology Corp. 114f Wavecom + 1234 Fastrack Xtend FXT001 Modem 115b Salix Technology Co., Ltd. 1162 Secugen Corp. 1163 DeLorme Publishing, Inc. @@ -13396,7 +16189,7 @@ 6832 MC8780 Device 6833 MC8781 Device 683a MC8785 Device - 683c MC8790 Device + 683c Mobile Broadband 3G/UMTS (MC8790 Device) 6850 AirCard 880 Device 6851 AirCard 881 Device 6852 AirCard 880E Device @@ -13419,6 +16212,13 @@ 9008 Gobi 2000 Wireless Modem 9009 Gobi 2000 Wireless Modem 900a Gobi 2000 Wireless Modem + 9011 MC8305 Modem + 9013 Sierra Wireless Gobi 3000 Modem device (MC8355) + 9041 EM7305 Modem + 9055 Gobi 9x15 Multimode 3G/4G LTE Modem (NAT mode) + 9057 Gobi 9x15 Multimode 3G/4G LTE Modem (IP passthrough mode) + 9071 AirPrime MC7455 3G/4G LTE Modem + 9079 EM7455 119a ZHAN QI Technology Co., Ltd 119b ruwido austria GmbH 0400 Infrared Keyboard V2.01 @@ -13433,8 +16233,20 @@ 11ac Nike 6565 FuelBand 11b0 ATECH FLASH TECHNOLOGY + 6208 PRO-28U + 6298 Kingston SNA-DC/U +11be R&D International NV + f0a0 Martin Maxxyz DMX +11c0 Betop + 5506 Gamepad 11c5 Inmax 0521 IMT-0521 Smartcard Reader +11c9 Nacon + 55f0 GC-100XF +11ca VeriFone Inc + 0201 MX870/MX880 + 0207 PIN Pad VX 810 + 0220 PIN Pad VX 805 11db Topfield Co., Ltd. 1000 PVR 1100 PVR @@ -13445,32 +16257,317 @@ 0004 X75 0005 SXG75/EF81 0008 UMTS/HSDPA Data Card + 0101 RCU Connect 11f6 Prolific 2001 Willcom WSIM 11f7 Alcatel (?) - 02df TD10 Mobile phone USB cable + 02df Serial cable (v2) for TD-10 Mobile Phone 1203 TSC Auto ID Technology Co., Ltd 0140 TTP-245C -1209 InterBiometrics - 1001 USB Hub - 1002 USB Relais - 1003 IBSecureCam-P - 1004 IBSecureCam-O - 1005 IBSecureCam-N +1209 Generic + 0001 pid.codes Test PID + 0002 pid.codes Test PID + 0003 pid.codes Test PID + 0004 pid.codes Test PID + 0005 pid.codes Test PID + 0006 pid.codes Test PID + 0007 pid.codes Test PID + 0008 pid.codes Test PID + 0009 pid.codes Test PID + 000a pid.codes Test PID + 000b pid.codes Test PID + 000c pid.codes Test PID + 000d pid.codes Test PID + 000e pid.codes Test PID + 000f pid.codes Test PID + 0010 pid.codes Test PID + 01c0 Input Club Kiibohd Device + 01cb Input Club Kiibohd Device Bootloader + 0256 Schwalm & Tate LLC pISO Raspberry Pi Hat + 053a Hackerspace San Salvador HSSV SAMR21-Mote + 0cbd Andrzej Szombierski kuku.eu.org keyboard + 0d32 ODrive Robotics ODrive v3 + 1001 InterBiometrics Hub + 1002 InterBiometrics Relais + 1003 InterBiometrics IBSecureCam-P + 1004 InterBiometrics IBSecureCam-O + 1005 InterBiometrics IBSecureCam-N + 1006 InterBiometrics Mini IO-Board + 1007 e-radionica.com Croduino SAMD + 1986 dgrubb Jaguar Tap + 1ab5 Arachnid Labs Tsunami + 1ab6 Arachnid Labs Tsunami Bootloader + 2000 Zygmunt Krynicki Lantern Brightness Sensor + 2001 OSHEC Pi-pilot opensource and openhardware autopilot system + 2002 Peter Lawrence PIC16F1-USB-DFU-Bootloader + 2003 Peter Lawrence SAMDx1-USB-DFU-Bootloader + 2004 GCBASIC Serial CDC Stack + 2005 GCBASIC OakTree Stack + 2006 GCBASIC Simulation Stack + 2016 Cupkee + 2017 Benjamin Shockley Mini SAM + 2020 Captain Credible Gate Crystal + 2048 Housedillon.com MRF49XA Transceiver + 2100 TinyFPGA B1 and B2 Boards + 2101 TinyFPGA A-Series Programmer + 2200 Dygma Shortcut Bootloader + 2201 Dygma Shortcut Keyboard + 2222 LabConnect Signalgenerator + 2300 Keyboardio Model 01 Bootloader + 2301 Keyboardio Model 01 + 2323 bytewerk.org candleLight + 2327 K.T.E.C. Bootloader Device + 2328 K.T.E.C. Keyboard Device + 2333 Kai Ryu Kimera + 2334 Kai Ryu Staryu + 2335 Portwell Sense8 + 2336 Portwell Sense8 + 2337 /Dev /Net + 2342 Andreas Bogk Big Red Button + 2345 VV-Soft Simple Generic HID IO + 2357 KarolKucza TinyPassword + 2400 phooky Snap-Pad + 2488 Peter Lawrence CMSIS-DAP Dapper Miser + 2552 ProjectIota Electrolink + 2600 Majenko Technologies chipKIT Lenny + 2635 Sevinz GameBot + 2800 Entropic Engineering Triangulation + 2801 Entropic Engineering Object Manipulation + 2a00 mooware Wii adapter + 2a01 mooware SNES adapter + 3000 lloyd3000 + 3100 OpenSimHardware Pedals & Buttons Controller + 317e Codecrete Wirekite + 3210 OSH Lab, LLC Magic Keys + 3333 LabConnect Digitalnetzteil + 345b kinX Hub + 345c kinX Keyboard Controller + 3690 Kigakudoh TouchMIDI32 + 4096 CynaraKrewe Cynara + 414c Adi Linden + 414d Adi Linden + 4242 Komakallio Astrophotography Community KomaHub Remote Power Switch + 4256 CuVoodoo BusVoodoo multi-protocol debugging adapter + 4321 mooltipass Offline Password Keeper Bootloader + 4322 mooltipass Arduino Sketch + 4356 CuVoodoo firmware + 4443 j1rie IRMP_STM32 Bootloader + 4444 j1rie IRMP_STM32 + 4545 SlothCo Enterprises Teletype Adapter + 4646 SmartPID SPC1000 + 4748 Kate Gray GHETT-iO Bootloader + 4750 Chris Pavlina (c4757p) C4-x computer (development interface) + 4757 Chris Pavlina (c4757p) WCP52 Gain/Phase Analyzer + 4801 Wojciech Krutnik NVMemProg + 4c60 MightyPork GEX module + 4c61 MightyPork GEX wireless dongle + 4d53 mindsensors.com NXTCam5 + 5038 frotz.net mdebug rswd protocol + 5039 frotz.net lpcboot protocol + 5050 trebb ISO50 + 5070 SoloHacker security key [SoloKey] + 50b0 boot for security key [SoloKey] + 5222 telavivmakers attami + 53c0 SatoshiLabs TREZOR Bootloader + 53c1 SatoshiLabs TREZOR + 5432 Open Programmer + 5457 Openlab.Taipei Taiwanduino + 571c StreetoArcade PancadariaStick + 5a22 ikari_01 sd2snes + 6000 Pulsar Heavy Industries Cenx4 + 600d Makdaam N93 Interface + 6464 Electric Exploits Shinewave + 6502 jj1bdx avrhwrng v2rev1 + 6570 Iowa Scaled Engineering, LLC CKT-AVRPROGRAMMER + 6666 Talpa Chen VSFLogic + 6667 SensePost Universal Serial aBUSe - Generic HID + 6742 NPK Cubitel Atomic Force Microscope + 6809 Tach Radio Doppelganger + 6948 MySensors Sensebender Gateway BootLoader + 6949 MySensors Sensebender Gateway + 6bcf blaste Gameboy Cart Flasher + 7000 Secalot Dongle + 7001 Secalot Bootloader + 70b1 Sutajio Ko-Usagi (Kosagi) Tomu + 7331 Dangerous Prototypes Bus Pirate Next Gen CDC + 7332 Dangerous Prototypes Bus Pirate Next Gen Logic Analyzer + 7401 Beststream-jp Tool_CDC + 7530 PotentialLabs Refflion - IoT Development Board - Bootloader + 7531 PotentialLabs Refflion - IoT Development Board - Sketch + 7551 The Tessel Project Tessel 2 + 7777 circuitvalley IO Board V3 + 7778 circuitvalley IO Board V3 Bootloader + 7950 PIC18F87J94 Bootloader [GenII] + 7951 PIC18F87J94 Application [GenII] + 7952 PIC18F87J94 Bootloader [GenIII/IV] + 7953 PIC18F87J94 Application [GenIII/IV] + 7954 PIC18F87J94 Application [GenIII/IV] + 7bd0 pokey9000 Tiny Bit Dingus + 8000 Autonomii NODii 2 + 8086 MisfitTech Nano Zero Bootloader + 8087 MisfitTech Nano Zero + 8123 Danyboard M0 bootloader + 812a Danyboard M0 + 813a MickMad HACK Bootloader + 813b MickMad HACK Sketch + 8242 Tom Wimmenhove Electronics NBS-DAC 192/24 UAC1 + 8243 Tom Wimmenhove Electronics NBS-DAC 192/24 UAC2 + 8472 Shantea Controls OpenDeck + 8661 ProgHQ TL866 programmer + 8844 munia.io MUNIA + 8888 Blinkinlabs POV Pendant + 8889 Blinkinlabs POV Pendant (bootloader) + 8b00 ReSwitched Libtransistor Serial Console + 9021 Connected Community Hackerspace ESPlant + 9317 Sutajio Ko-Usagi (Kosagi) Palawan-Tx + 9999 Sandeepan Sengupta CodeBridge Infineo + 9db5 PD Buddy Sink + a033 area0x33 Memtype + a100 KB LES Narsil analog breakout + a10c KB LES Aminoacid Synthesizer + a1e5 Atreus Keyboards Atreus Keyboard + a3a4 MK::Box MK::Kbd + a3a5 MK::Box MK::Kbd Bootloader + a55a Forever Young Software ATTINY2313 + a602 Robotips RTBoard + a7ea area3001 Knixx SW04 + a800 sowbug.com WebLight + a8b0 Intelectron BootWare + a8b1 Intelectron FrameWare + aa00 Serg Oskin LinuxCNC HID Extender + aa0b Open Bionics + ab3d 3DArtists Alligator board + abba CoinWISE SafeWISE + abc0 Omzlo controller + abcd Sandeepan Sengupta CodeBridge + abd1 OpenMV Cam + acdc Gediminas Zukaitis midi-grid + ace5 SimAces Panel Ace + aced Open Lighting Project Ja Rule Device + acee Open Lighting Project Ja Rule Bootloader + adb0 tibounise ADB converter + adda MicroPython Boards + b007 Konsgn Global_Boot + b00b CrapLab Random Device + b010 IObitZ CodeBridge + b01d WyoLum VeloKey + b058 Model B, LLC Holoseat + b0b0 Monero Hardware Monero Bootloader + b100 ptrandem iBizi + b101 IObitZ Infineo + b195 flehrad Big Switch PCB + bab1 ElectronicCats Meow Meow + babe brunofreitas.com STM32 HID Bootloader + bad1 Gregory POTEAU CommLinkUSB + bad2 Gregory POTEAU XLinkUSB + bade Semarme SemarmeHID + bb00 keyplus split keyboard firmware + bb01 keyplus xusb bootloader + bb02 keyplus nRF24 wireless keyboard dongle + bb03 keyplus nrf24lu1p-512 bootloader + bb05 keyplus kp_boot_32u4 bootloader + beba serasidis.gr STM32 HID Bootloader + beef Modal MC-USB + c001 Cynteract Alpha + c0c0 Geppetto_Electronics Orthrus + c0c1 Michael Bemmerl cookie-mouse + c0ca Jean THOMAS DirtyJTAG + c0d3 Samy Kamkar USBdriveby + c0da Monero Hardware Monero Firmware + c0de KMRH Labs SBL Brain + c0f5 unethi PERswitch + c1aa Proyecto CIAA Computadora Industrial Abierta Argentina + c1b1 Chibitronics Love-to-Code + c311 bg nerilex GB-USB-Link + ca1c KnightOS Generic Hub + ca1d KnightOS MTP Device + caea Open Music Kontrollers Chimaera + cafe ii iigadget + cc14 trebb NaN-15 + cc86 Manfred's Technologies Anastasia Bootloader + ceb0 KG4LNE GE-FlashUSB + cf20 Smart Citizen SCK 2.0 + d00d Monero Hardware Monero Developer + d017 empiriKit empiriKit Controller + d11d Koi Science DI-Lambda AVR + d3d8 Duet3d Duet 0.8.5 + d706 SkyBean SkyDrop + da42 Devan Lai dap42 debug access probe + daa0 darknao btClubSportWheel + dada Rebel Technology OWL + db42 Devan Lai dapboot DFU bootloader + dc21 FPGA-Computer Dual Charger + dddd Stephan Electronics OpenCVMeter + dead chaosfield.at AVR-Ruler + deaf CrapLab 4chord MIDI + ded1 ManCave Made Quark One + deed Kroneum Time Tracker + df00 D.F.Mac. @TripArts Music mi:muz:tuch + df01 D.F.Mac. @TripArts Music mi:muz:can + df02 D.F.Mac. @TripArts Music mi:muz:can-lite + e116 Elijah Motornyy open-oscilloscope-stm32f3 + e1ec FreeSRP + e4ee trebb keytee + e500 GitleMikkelsen Helios Laser DAC + eaea Pinscape Controller + eb01 RobotMaker.club EB1 + eba7 VictorGrigoryev USBscope + ee00 Explore Embedded SODA(SWD OpenSource Debug Adapter) + ee02 Explore Embedded Explore M3 VCOM + ee03 Explore Embedded Explore M3 DFU + ee2c jaka USB2RS485 + effa EffigyLabs atmega32u4-USB-LUFA-Bootloader + effe EffigyLabs Control Pedal + f000 Uniti ARC + f00d RomanStepanov Shifter/Pedals Adapter + f12e Michael Bemmerl Feuermelder + f16a uri_ba Cougar TQS adapter + f16c uri_ba adapter for Vipercore's FCC3 Force Sensing Module + f380 Windsor Schmidt MD-380 Open Radio Firmware + f3fc dRonin Flight controller-Lumenier Lux + f49a TimVideos.us & HDMI2USB.tv Projects FPGA Programmer & UART Bridge (PIC based Firmware) + fa11 moonglow OpenXHC + fa57 3DRacers Pilot Board + fa58 3DRacers Pilot Board (Bootloader) + fab1 PAP Mechatronic Technology LamDiNao + face Protean Synth Craft + fade Open Collector dude + feed ProgramGyar AVR-IR Sender + ffff Life2Device Smart House 120e Hudson Soft Co., Ltd 120f Magellan 524e RoadMate 1475T 5260 Triton Handheld GPS Receiver (300/400/500/1500/2000) 1210 DigiTech + 000d RP250 Guitar Multi-Effects Processor 0016 RP500 Guitar Multi-Effects Processor 001b RP155 Guitar Multi-Effects Processor 001c RP255 Guitar Multi-Effects Processor 121e Jungsoft Co., Ltd 3403 Muzio JM250 Audio Player +121f Panini S.p.A. + 0001 VisionX without Firmware + 0002 VisionX with Firmware + 0010 I-Deal + 0020 wI-Deal + 0021 VisionX Page Scanner Extension + 0030 VisionNext + 0040 mI:Deal Check Scanner + 0041 EverNext Check Scanner +1220 TC Electronic + 000a Hall of Fame Reverb + 002a Polytune + 0032 Ditto X2 Looper + 0039 Alter Ego X4 Vintage Echo +1221 Unknown manufacturer + 3234 Disk (Thumb drive) +1222 TiPro + faca programmable keyboard 1223 SKYCABLE ENTERPRISE. CO., LTD. 1228 Datapaq Limited 0012 Q18 Data Logger 0015 TPaq21/MPaq21 Datalogger + 584c XL2 Logger 1230 Chipidea-Microelectronica, S.A. 1233 Denver Electronics 5677 FUSB200 mp3 player @@ -13478,22 +16575,65 @@ 0000 Neural Impulse Actuator Prototype 1.0 [NIA] 4321 Human Interface Device ed02 Emotiv EPOC Developer Headset Wireless Dongle -1235 Novation EMS - 0001 ReMOTE Audio/XStation +1235 Focusrite-Novation + 0001 ReMOTE Audio/XStation First Edition 0002 Speedio - 0003 ReMOTE ZeRO SL + 0003 RemoteSL + ZeroSL + 0004 ReMOTE LE + 0005 XIOSynth [First Edition] + 0006 XStation + 0007 XIOSynth + 0008 ReMOTE SL Compact + 0009 nIO + 000a Nocturn + 000b ReMOTE SL MkII + 000c ZeRO MkII + 000e Launchpad + 0010 Saffire 6 + 0011 Ultranova + 0012 Nocturn Keyboard + 0013 VRM Box + 0014 VRM Box Audio Class (2-out) + 0015 Dicer + 0016 Ultranova + 0018 Twitch + 0019 Impulse 25 + 001a Impulse 49 + 001b Impulse 61 + 0032 Launchkey 61 + 0069 Launchpad MK2 + 0102 LaunchKey Mini MK3 4661 ReMOTE25 + 8000 Scarlett 18i6 + 8002 Scarlett 8i6 8006 Focusrite Scarlett 2i2 + 8008 Saffire 6 + 800a Scarlett 2i4 + 800c Scarlett 18i20 + 800e iTrack Solo + 8010 Forte + 8012 Scarlett 6i6 + 8014 Scarlett 18i8 + 8016 Focusrite Scarlett 2i2 + 8202 Focusrite Scarlett 2i2 2nd Gen + 8203 Focusrite Scarlett 6i6 + 8204 Scarlett 18i8 2nd Gen + 8210 Scarlett 2i2 Camera + 8211 Scarlett Solo (3rd Gen.) + 8214 Scarlett 18i8 3rd Gen + 8215 Scarlett 18i20 3rd Gen 1241 Belkin 0504 Wireless Trackball Keyboard 1111 Mouse 1122 Typhoon Stream Optical Mouse USB+PS/2 - 1155 PS2/USB Browser Combo Mouse + 1155 Memorex Optical ScrollPro Mouse SE MX4600 1166 MI-2150 Trust Mouse - 1177 F8E842-DL Mouse + 1177 Mouse [HT82M21A] 1503 Keyboard 1603 Keyboard f767 Keyboard +1243 Holtek Semiconductor, Inc. + e000 Unique NFC/RFID reader (keyboard emulation) 124a AirVast 168b PRISM3 WLAN Adapter 4017 PC-Chips 802.11b Adapter @@ -13505,14 +16645,21 @@ 3200 Stealth MXP 1GB 125c Apogee Inc. 0010 Alta series CCD +125d JMicron + 0580 JM580 125f A-DATA Technology Co., Ltd. 312a Superior S102 312b Superior S102 Pro + a15a DashDrive Durable HD710 portable HDD various size + a22a DashDrive Elite HE720 500GB + a31a HV620 Portable HDD a91a Portable HDD CH91 c08a C008 Flash Drive c81a Flash drive c93a 4GB Pen Drive c96a C906 Flash Drive + cb10 Dash Drive UV100 + cb20 DashDrive UV110 1260 Standard Microsystems Corp. ee22 SMC2862W-G v3 EZ Connect 802.11g Adapter [Intersil ISL3887] 1264 Covidien Energy-based Devices @@ -13520,7 +16667,7 @@ 6302 Fastweb DRG A226M ADSL Router 1267 Logic3 / SpectraVideo plc 0103 G-720 Keyboard - 0201 A4Tech SWOP-3 Mouse + 0201 Mouse 0210 LG Optical Mouse 3D-310 a001 JP260 PC Game Pad c002 Wireless Optical Mouse @@ -13536,6 +16683,7 @@ 1275 Xaxero Marine Software Engineering, Ltd. 0002 WeatherFax 2000 Demodulator 0080 SkyEye Weather Satellite Receiver + 0090 WeatherFax 2000 Demodulator 1278 Starlight Xpress 0105 SXV-M5 0107 SXV-M7 @@ -13566,19 +16714,26 @@ 0130 PDM 0150 CMS10GI (Golf) 1286 Marvell Semiconductor, Inc. + 00bc Marvell JTAG Probe 1fab 88W8338 [Libertas] 802.11g 2001 88W8388 802.11a/b/g WLAN 2006 88W8362 802.11n WLAN + 203c K30326 802.11bgn Wireless Module [Marvell 88W8786U] + 204c Bluetooth and Wireless LAN Composite 8001 BLOB boot loader firmware 1291 Qualcomm Flarion Technologies, Inc. / Leadtek Research, Inc. 0010 FDM 2xxx Flash-OFDM modem 0011 LR7F06/LR7F14 Flash-OFDM modem 1292 Innomedia 0258 Creative Labs VoIP Blaster + 4154 Retro Link Atari cable 1293 Belkin Components [hex] 0002 F5U002 Parallel Port [uss720] 2101 104-key keyboard 1294 RISO KAGAKU CORP. + 1320 Webmail Notifier +1297 DekTec + 020f DTU-215 Multi-Standard Modulator 129b CyberTAN Technology 160b Siemens S30853-S1031-R351 802.11g Wireless Adapter [Atheros AR5523] 160c Siemens S30853-S1038-R351 802.11g Wireless Adapter [Atheros AR5523] @@ -13587,19 +16742,31 @@ 1828 Gigaset USB Adapter 300 12a7 Trendchip Technologies Corp. 12ab Honey Bee Electronic International Ltd. + 0004 Dance Pad for Xbox 360 + 0301 Afterglow Wired Controller for Xbox 360 + 0303 Mortal Kombat Klassic FightStick for Xbox 360 + 8809 Dance Dance Revolution Dance Pad 12b8 Zhejiang Xinya Electronic Technology Co., Ltd. 12b9 E28 12ba Licensed by Sony Computer Entertainment America + 0032 Wireless Stereo Headset + 0042 Wireless Stereo Headset 00ff Rocksmith Guitar Adapter 0100 RedOctane Guitar for PlayStation(R)3 0120 RedOctane Drum Kit for PlayStation(R)3 0200 Harmonix Guitar for PlayStation(R)3 0210 Harmonix Drum Kit for PlayStation(R)3 +12bd Gembird + d012 JPD Shockforce gamepad + d015 Generic 4-button NES USB Controller 12c4 Autocue Group Ltd 0006 Teleprompter Two-button Hand Control (v1) 0008 Teleprompter Foot Control (v1) +12cf DEXIN + 0170 Tt eSPORTS BLACK Gaming mouse + 600b Cougar 600M Gaming Mouse 12d1 Huawei Technologies Co., Ltd. - 1001 E169/E620/E800 HSDPA Modem + 1001 E161/E169/E620/E800 HSDPA Modem 1003 E220 HSDPA Modem / E230/E270/E870 HSDPA/HSUPA Modem 1004 E220 (bis) 1009 U120 @@ -13609,19 +16776,29 @@ 1037 Ideos 1038 Ideos (debug mode) 1039 Ideos (tethering mode) + 1052 MT7-L09 / P7-L10 / Y330-U01 + 1053 P7-L10 (PTP) + 1054 P7-L10 (PTP + debug) + 1079 GEM-703LT [Honor/MediaPad X2] + 107e P10 smartphone + 1404 EM770W miniPCI WCDMA Modem 1406 E1750 140b EC1260 Wireless Data Modem HSD USB Card 140c E180v 1412 EC168c - 1436 E173 3G Modem (modem-mode) - 1446 E1552/E1800/E173 (HSPA modem) + 1436 Broadband stick + 1446 HSPA modem 1465 K3765 HSPA + 14ac E815 14c3 K5005 Vodafone LTE/UMTS/GSM Modem/Networkcard 14c8 K5005 Vodafone LTE/UMTS/GSM MOdem/Networkcard 14c9 K3770 3G Modem 14cf K3772 14d1 K3770 3G Modem (Mass Storage Mode) + 14db E353/E3131 + 14dc E3372 LTE/UMTS/GSM HiLink Modem/Networkcard 14f1 Gobi 3000 HSPA+ Modem + 14fe Modem (Mass Storage Mode) 1501 Pulse 1505 E398 LTE/UMTS/GSM Modem/Networkcard 1506 Modem/Networkcard @@ -13629,21 +16806,35 @@ 1520 K3765 HSPA 1521 K4505 HSPA+ 155a R205 Mobile WiFi (CD-ROM mode) + 1573 ME909u-521 mPCIe LTE/GPS card + 1575 K5150 LTE modem + 15bb ME936 LTE/HSDPA+ 4G modem + 15c1 ME906s LTE M.2 Module + 15ca E3131 3G/UMTS/HSPA+ Modem (Mass Storage Mode) 1805 AT&T Go Phone U2800A phone - 1c05 E173s 3G broadband stick (modem on) + 1c05 Broadband stick (modem on) 1c0b E173s 3G broadband stick (modem off) 1c20 R205 Mobile WiFi (Charging) 1d50 ET302s TD-SCDMA/TD-HSDPA Mobile Broadband + 1f01 E353/E3131 (Mass storage mode) + 1f16 K5150 LTE modem (Mass Storage Mode) + 360e Y330-U01 (MTP Mode) 380b WiMAX USB modem(s) 12d2 LINE TECH INDUSTRIAL CO., LTD. +12d3 LINAK + 0002 DeskLine CBD Control Box 12d6 EMS Dr. Thomas Wuensche 0444 CPC-USB/ARM7 0888 CPC-USB/M16C 12d7 BETTER WIRE FACTORY CO., LTD. +12d8 Araneus Information Systems Oy + 0001 Alea I True Random Number Generator 12e6 Waldorf Music GmbH 0013 Blofeld 12ef Tapwave, Inc. 0100 Tapwave Handheld [Tapwave Zodiac] +12f2 ViewPlus Technologies, Inc. + 000a Braille embosser [SpotDot Emprint] 12f5 Dynamic System Electronics Corp. 12f7 Memorex Products, Inc. 1a00 TD Classic 003B @@ -13652,11 +16843,12 @@ 1001 AWU2000b 802.11b Stick 12ff Fascinating Electronics, Inc. 0101 Advanced RC Servo Controller +1306 FM20 Barcode Scanner 1307 Transcend Information, Inc. 0163 256MB/512MB/1GB Flash Drive - 0165 2GB/4GB Flash Drive + 0165 2GB/4GB/8GB Flash Drive 0190 Ut190 8 GB Flash Drive with MicroSD reader - 0310 SD/MicroSD CardReader [hama] + 0310 SD/MicroSD CardReader [hama]/IT1327E [Basic Line flash drive] 0330 63-in-1 Multi-Card Reader/Writer 0361 CR-75: 51-in-1 Card Reader/Writer [Sakar] 1169 TS2GJF210 JetFlash 210 2GB @@ -13668,10 +16860,65 @@ 0001 Class 1 Bluetooth Dongle 1312 ICS Electronics 1313 ThorLabs + 0010 LC1 Linear Camera (Jungo) + 0011 SP1 Spectrometer (Jungo) + 0012 SP2 Spectrometer (Jungo) + 0110 LC1 Linear Camera (VISA) + 0111 SP1 Spectrometer (VISA) + 0112 SP2 Spectrometer (VISA) + 8001 TXP-Series Slot (TXP5001, TXP5004) + 8011 BP1 Slit Beam Profiler + 8012 BC106 Camera Beam Profiler + 8013 WFS10 Wavefront Sensor + 8016 DMP40 Deformable Mirror + 8017 BC206 Camera Beam Profiler + 8019 BP2 Multi Slit Beam Profiler + 8020 PM300 Optical Power Meter + 8021 PM300E Optical Power and Energy Meter + 8022 PM320E Optical Power and Energy Meter + 8025 WFS20 Wavefront Sensor + 8030 ER100 Extinction Ratio Meter + 8039 PAX1000 Rotating Waveplate Polarimeter + 8047 CLD1000 + 8048 TED4000 + 8049 LDC4000 + 804a ITC4000 + 8058 LC-100 + 8060 DC3100 + 8061 DC4100 + 8062 DC2100 + 8065 CS2010 + 8066 DC4104 8070 PM100D + 8072 PM100USB Power and Energy Meter Interface + 8073 PM106 Wireless Powermeter Photodiode Sensor + 8074 PM160T Wireless Powermeter Thermal Sensor + 8075 PM400 Handheld Optical Power/Energy Meter + 8076 PM101 Serial PD Power Meter + 8078 PM100D Compact Power and Energy Meter Console + 8080 CCS100 - Compact Spectrometer + 8081 CCS100 Compact Spectrometer + 8083 CCS125 Spectrometer + 8085 CCS150 UV Spectrometer + 8087 CCS175 NIR Spectrometer + 8089 CCS200 Wide Range Spectrometer + 8090 SPCM Single Photon Counter + 80a0 LC100 series smart line camera + 80b0 PM200 Handheld Power and Energy Meter + 80c0 DC2200 + 80c9 MTD Series + 80f0 TSP01 + 80f1 M2SET Dongle + 8180 OCT Probe Controller (OCTH-1300) + 8181 OCT Device 131d Natural Point 0155 TrackIR 3 Pro Head Tracker 0156 TrackIR 4 Pro Head Tracker + 0158 TrackIR 5 Pro Head Tracker +1325 ams AG + 00d6 I2C/SPI InterfaceBoard + 0c08 Embedded Linux Sensor Bridge + 4002 I2C Dongle 132a Envara Inc. 1502 WiND 802.11abg / 802.11bg WLAN 132b Konica Minolta @@ -13704,6 +16951,8 @@ 2043 Magicolor 2530DL 2045 Magicolor 2500W 2049 Magicolor 2490MF +133e Kemper Digital GmbH + 0815 Virus TI Desktop 1342 Mobility 0200 EasiDock 200 Hub 0201 EasiDock 200 Keyboard and Mouse Port @@ -13711,6 +16960,16 @@ 0203 EasiDock 200 Printer Port 0204 Ethernet 0304 EasiDock Ethernet +1343 Citizen Systems + 0002 CW-01 + 0003 CX / DNP DS40 + 0004 CX-W / DNP DS80 / Mitsubishi CP3800 + 0005 CY / DNP DSRX1 + 0006 CW-02 / OP900ii + 0007 DNP DS80DX + 0008 DNP DS620 (old) + 000a CX-02 + 000b CX-02W 1345 Sino Lite Technology Corp. 001c Xbox Controller Hub 6006 Defender Wireless Controller @@ -13720,11 +16979,16 @@ 0402 G2CCD2 0403 G2/G3CCD-I KAI CCD 0404 G2/G3/G4 CCD-F KAF CCD + 0405 Gx CCD-I CCD + 0406 Gx CCD-F CCD 0410 G1-0400 CCD 0411 G1-0800 CCD 0412 G1-0300 CCD 0413 G1-2000 CCD 0414 G1-1400 CCD + 0415 G1-1200 CCD + 04b0 Gx CCD-B CCD + 04b1 Gx CCD-BI CCD 1348 Katsuragawa Electric Co., Ltd. 134c PanJit International Inc. 0001 Touch Panel Controller @@ -13733,11 +16997,30 @@ 0004 Touch Panel Controller 134e Digby's Bitpile, Inc. DBA D Bit 1357 P&E Microcomputer Systems + 0089 OpenSDA - CDC Serial Port 0503 USB-ML-12 HCS08/HCS12 Multilink 0504 DEMOJM + 1000 Smart Control Touchpad +135e Insta GmbH + 0021 Berker KNX Data Interface + 0022 Gira KNX Data Interface + 0023 JUNG KNX Data Interface + 0024 Merten/Schneider Electric KNX Data Interface + 0025 Hager KNX Data Interface + 0026 Feller KNX Data Interface +135f Control Development Inc. + 0110 Linear Spectrograph + 0111 Spectrograph - Renumerated + 0200 Linear Spectrograph + 0201 Spectrograph - Renumerated + 0240 MPP Spectrograph 1366 SEGGER - 0101 J-Link ARM + 0101 J-Link PLUS + 1015 J-Link 136b STEC +136e Andor Technology Ltd. + 0012 iXon Ultra CCD + 0014 Zyla 5.5 sCMOS camera 1370 Swissbit 0323 Swissmemory cirrusWHITE 6828 Victorinox Flash Drive @@ -13751,8 +17034,14 @@ 9032 CWD-854 rev F 9401 CWD-854 Wireless 802.11g 54Mbps Network Adapter [RTL8187] 1376 Vimtron Electronics Co., Ltd. +1377 Sennheiser electronic GmbH & Co. KG + 4000 HDVD800 137b SCAPS GmbH 0002 SCAPS USC-2 Scanner Controller +137c YASKAWA ELECTRIC CORP. + 0220 MP Series + 0250 SIGMA Series + 0401 AC Drive 1385 Netgear, Inc 4250 WG111T 4251 WG111T (no firmware) @@ -13765,19 +17054,73 @@ 0005 VFS301 Fingerprint Reader 0007 VFS451 Fingerprint Reader 0008 VFS300 Fingerprint Reader + 0010 VFS Fingerprint sensor 0011 VFS5011 Fingerprint Reader + 0015 VFS 5011 fingerprint sensor + 0017 VFS 5011 fingerprint sensor 0018 Fingerprint scanner 003c VFS471 Fingerprint Reader 003d VFS491 + 003f VFS495 Fingerprint Reader + 0050 Swipe Fingerprint Sensor + 0090 VFS7500 Touch Fingerprint Sensor + 0091 VFS7552 Touch Fingerprint Sensor 138e Jungo LTD - 9000 Raisonance S.A. STM32 ARM evaluation board + 9000 Raisonance S.A. STM32 ARM evaluation board / RLink dongle 1390 TOMTOM B.V. - 0001 GO 520 T/GO 630/ONE XL (v9) + 0001 GO 520 T / GO 630 / ONE / ONE XL + 5454 Blue & Me 2 + 7474 GPS Sport Watch [Runner, Multi-Sport] + a001 Bandit Action Camera Batt-Stick 1391 IdealTEK, Inc. 1000 URTC-1000 1395 Sennheiser Communications + 0025 Headset [PC 8] + 0026 SC230 + 0027 SC260 + 0028 SC230 CTRL + 0029 SC260 CTRL + 002a SC230 for Lync + 002b SC260 for Lync + 002d BTD-800 + 002e Presence + 0030 CEHS-CI 02 + 0031 U320 Gaming + 0032 SC30 for Lync + 0033 SC60 for Lync + 0034 SC30 Control + 0035 SC60 Control + 0036 SC630 for Lync + 0037 SC660 for Lync + 0038 SC630 CTRL + 0039 SC660 CTRL + 003f SP 20 + 0040 MB Pro 1/2 + 0041 SP 20 for Lync + 0042 SP 10 + 0043 SP 10 for Lync + 0046 PXC 550 + 004a MOMENTUM M2 OEBT + 004b MOMENTUM M2 AEBT + 004f SC230 for MS II + 0050 SC260 for MS II + 0051 USB-ED CC 01 + 0058 USB-ED CC 01 for MS + 0059 SC40 for MS + 005a SC70 for MS + 005b SC40 CTRL + 005c SC70 CTRL + 0060 SCx5 MS + 0061 SCx5 CTRL + 0064 MB 660 MS + 0065 MB 660 + 0066 SP 20 D UC + 0067 SP 20 D MS + 006b SC5x5 MS + 0072 Headset 3556 USB Headset 1397 BEHRINGER International GmbH + 0004 FCA1616 00bc BCF2000 1398 Q-tec 2103 USB 2.0 Storage Device @@ -13807,12 +17150,17 @@ 0031 AM10 v1 802.11n [Ralink RT3072] 0039 AE1200 802.11bgn Wireless Adapter [Broadcom BCM43235] 003a AE2500 802.11abgn Wireless Adapter [Broadcom BCM43236] + 003b AE3000 802.11abgn (3x3) Wireless Adapter [Ralink RT3573] + 003e AE6000 802.11a/b/g/n/ac Wireless Adapter [MediaTek MT7610U] + 003f WUSB6300 802.11a/b/g/n/ac Wireless Adapter [Realtek RTL8812AU] + 0041 Gigabit Ethernet Adapter + 0042 WUSB6100M 802.11a/b/g/n/ac Wireless Adapter 13b1 WUSB200: Wireless-G Business Network Adapter with Rangebooster 13b2 Alesis 0030 Multimix 8 13b3 Nippon Dics Co., Ltd. 13ba PCPlay - 0001 K旦nig Electronic CMP-KEYPAD12 Numeric Keypad + 0001 Konig Electronic CMP-KEYPAD12 Numeric Keypad 0017 PS/2 Keyboard+Mouse Adapter 0018 Barcode PCP-BCG4209 13be Ricoh Printing Systems, Ltd. @@ -13857,8 +17205,9 @@ 3242 DTV-DVB UDAT7240LP - ATSC/NTSC/PAL Driver(Without HID) 3243 DTV-DVB UDXTTM6010 - A/D Driver(Without HID) 3244 DTV-DVB UDTT 7047Z-USB 2.0 DVB-T Driver - 3247 802.11 n/g/b Wireless LAN Adapter + 3247 AW-NU222 802.11bgn Wireless Module [Ralink RT2770+RT2720] 3249 Internal Bluetooth + 3250 Broadcom Bluetooth 2.1 3262 802.11 n/g/b Wireless LAN USB Adapter 3273 802.11 n/g/b Wireless LAN USB Mini-Card 3274 DVB-T Dongle [RTL2832U] @@ -13867,17 +17216,34 @@ 3304 Asus Integrated Bluetooth module [AR3011] 3306 Mediao 802.11n WLAN [Realtek RTL8191SU] 3315 Bluetooth module + 3327 AW-NU137 802.11bgn Wireless Module [Atheros AR9271] + 3362 Atheros AR3012 Bluetooth 4.0 Adapter 3375 Atheros AR3012 Bluetooth 4.0 Adapter + 3392 Azurewave 43228+20702 + 3394 Bluetooth + 3474 Atheros AR3012 Bluetooth + 3526 Bluetooth Radio 5070 Webcam 5111 Integrated Webcam 5115 Integrated Webcam 5116 Integrated Webcam + 5122 2M Integrated Webcam 5126 PC Cam + 5130 Integrated Webcam + 5134 Integrated Webcam + 5615 Lenovo EasyCamera + 5670 HP TrueVision HD + 5682 SunplusIT Integrated Camera 5702 UVC VGA Webcam 5710 UVC VGA Webcam 5716 UVC VGA Webcam + 5a07 VGA UVC WebCam 7020 DTV-DVB UDST7020BDA DVB-S Box(DVBS for MCE2005) 7022 DTV-DVB UDST7022BDA DVB-S Box(Without HID) + 784b XHC Camera +13d7 Guidance Software, Inc. + 0001 T5 PATA forensic bridge + 000c T8-R2 forensic bridge 13dc ALEREON, INC. 13dd i.Tech Dynamic Limited 13e1 Kaibo Wire & Cable (Shenzhen) Co., Ltd. @@ -13890,35 +17256,59 @@ 13ec Zydacron 0006 HID Remote Control 13ee MosArt + 0001 Optical Mouse 0003 Optical Mouse 13fd Initio Corporation + 0550 INIC-1530 PATA Bridge 0840 INIC-1618L SATA 0841 Samsung SE-T084M DVD-RW + 0940 ASUS SBW-06D2X-U + 1040 INIC-1511L PATA Bridge 1340 Hi-Speed USB to SATA Bridge 160f RocketFish SATA Bridge [INIC-1611] 1640 INIC-1610L SATA Bridge + 1669 INIC-1609PN 1840 INIC-1608 SATA bridge + 1e40 INIC-1610P SATA bridge + 2040 Samsung Writemaster external DVD writer + 3920 INIC-3619PN SATA Bridge + 3940 external DVD burner ECD819-SU3 + 3960 INIC-3639 + 3e40 ZALMAN ZM-VE350 13fe Kingston Technology Company Inc. 1a00 512MB/1GB Flash Drive 1a23 512MB Flash Drive 1d00 DataTraveler 2.0 1GB/4GB Flash Drive / Patriot Xporter 4GB Flash Drive 1e00 Flash Drive 2 GB [ICIDU 2 GB] 1e50 U3 Smart Drive - 1f00 DataTraveler 2.0 4GB Flash Drive / Patriot Xporter 32GB (PEF32GUSB) Flash Drive - 1f23 2Gb + 1f00 Kingston DataTraveler / Patriot Xporter + 1f23 PS2232 flash drive controller 2240 microSD card reader 3100 2/4 GB stick 3123 Verbatim STORE N GO 4GB + 3200 flash drive (2GB, EMTEC) + 3600 flash drive (4GB, EMTEC) 3800 Rage XT Flash Drive + 3d00 Flash Drive 3e00 Flash Drive + 4100 Flash drive + 4200 Platinum USB drive mini + 5000 USB flash drive (32 GB SHARKOON Accelerate) 5100 Flash Drive + 5200 DataTraveler R3.0 + 5500 Flash drive + 6300 SP Mobile C31 (64GB) 1400 Axxion Group Corp. 1402 Bowe Bell & Howell 1403 Sitronix 0001 Digital Photo Frame + 0003 Digital Photo Frame (DPF-1104) +1404 Fundamental Software, Inc. + cddc Dongle 1409 IDS Imaging Development Systems GmbH 1000 generic (firmware not loaded yet) 1485 uEye UI1485 + 3240 uEye UI3240 140e Telechips, Inc. b011 TCC780X-based player (USB Boot mode) b021 TCC77X-based players (USB Boot mode) @@ -13944,6 +17334,32 @@ 0020 Sony Wireless SingStar 2000 Sony Playstation Eye 1419 ABILITY ENTERPRISE CO., LTD. +1421 Sensor Technology + 0605 Sentech Camera +1424 Posnet Polska S.A. + 1001 Temo + 1002 Thermal + 1003 Neo + 1004 Combo DF + 1005 Thermal-A + 1006 Thermal FV + 1007 Bingo HS + 1008 Thermal HS FV + 1009 Thermal FV EJ + 100a Thermal HD + 100b Thermal + 100c Neo + 100d Ergo + 100e Trio + 1010 Thermal HS FV EJ + 1011 Neo EJ + 1012 Thermal-A + 1013 Thermal-A EJ + 1014 Mobile + 1015 Temo HS + 1016 Mobile HS + 1017 TH230+ FV EJ + 1018 4610-1NR FV EJ 1429 Vega Technologies Industrial (Austria) Co. 142a Thales E-Transactions 0003 Artema Hybrid @@ -13954,7 +17370,10 @@ 1430 RedOctane 0150 wireless receiver for skylanders wii 4734 Guitar Hero4 hub + 4748 Guitar Hero X-plorer 474b Guitar Hero MIDI interface + 8888 TX6500+ Dance Pad + f801 Controller 1431 Pertech Resources, Inc. 1435 Wistron NeWeb 0427 UR054g 802.11g Wireless Adapter [Intersil ISL3887] @@ -13971,6 +17390,21 @@ 1446 X.J.GROUP 6a73 Stamps.com Model 510 5LB Scale 6a78 DYMO Endicia 75lb Digital Scale +1451 Force Dimension + 0301 haptic device + 0302 haptic device + 0400 haptic device + 0401 delta.x haptic device + 0402 omega.x haptic device + 0403 sigma.x haptic device + 0404 haptic controller + 0405 dedicated haptic device + 0406 dedicated haptic device + 0407 dedicated haptic device + 0408 dedicated haptic device +1452 Dai Nippon Printing, Inc + 8b01 DS620 + 9001 DS820 1453 Radio Shack 4026 26-183 Serial Cable 1456 Extending Wire & Cable Co., Ltd. @@ -13978,13 +17412,17 @@ 5117 OpenMoko Neo1973 kernel usbnet (g_ether, CDC Ethernet) mode 5118 OpenMoko Neo1973 Debug board (V2+) 5119 OpenMoko Neo1973 u-boot cdc_acm serial port + 511a HXD8 u-boot usbtty CDC ACM Mode + 511b SMDK2440 u-boot usbtty CDC ACM mode + 511c SMDK2443 u-boot usbtty CDC ACM mode + 511d QT2410 u-boot usbtty CDC ACM mode 5120 OpenMoko Neo1973 u-boot usbtty generic serial 5121 OpenMoko Neo1973 kernel mass storage (g_storage) mode 5122 OpenMoko Neo1973 / Neo Freerunner kernel cdc_ether USB network 5123 OpenMoko Neo1973 internal USB CSR4 module 5124 OpenMoko Neo1973 Bluetooth Device ID service 145f Trust - 0106 Trust K56 V92 USB Modem + 0106 K56 V92 Modem 013d PC Camera (SN9C201 + OV7660) 013f Megapixel Auto Focus Webcam 0142 WB-6250X Webcam @@ -13992,12 +17430,19 @@ 0161 15901 802.11bg Wireless Adapter [Realtek RTL8187L] 0167 Widescreen 3MP Webcam 0176 Isla Keyboard + 019f 17676 Webcam + 01e5 Keyboard [GXT 830] + 0212 Panora Widescreen Graphic Tablet + 023f Mouse [GXT 168] 1460 Tatung Co. 9150 eHome Infrared Transceiver 1461 Staccato Communications 1462 Micro Star International 5512 MegaStick-1 Flash Stick 8807 DIGIVOX mini III [af9015] +146b BigBen Interactive + 0601 Controller for Xbox 360 + 0902 Wired Mini PS3 Game Controller 1472 Huawei-3Com 0007 Aolynk WUB300g [ZyDAS ZD1211] 0009 Aolynk WUB320g @@ -14031,6 +17476,7 @@ 1487 DSP Group, Ltd. 148e EVATRONIX SA 148f Ralink Technology, Corp. + 1000 Motorola BC4 Bluetooth 3.0+HS Adapter 1706 RT2500USB Wireless Adapter 2070 RT2070 Wireless Adapter 2570 RT2570 Wireless Adapter @@ -14047,15 +17493,27 @@ 5370 RT5370 Wireless Adapter 5372 RT5372 Wireless Adapter 5572 RT5572 Wireless Adapter + 7601 MT7601U Wireless Adapter + 760b MT7601U Wireless Adapter + 761a MT7610U ("Archer T2U" 2.4G+5G WLAN Adapter 9020 RT2500USB Wireless Adapter 9021 RT2501USB Wireless Adapter 1491 Futronic Technology Co. Ltd. 0020 FS81 Fingerprint Scanner Module + 0088 Fingerprint Scanner Model FS88 1493 Suunto + 0010 Bluebird [Ambit] + 0019 Duck [Ambit2] + 001a Colibri [Ambit2 S] + 001b Emu [Ambit3 Peak] + 001c Finch [Ambit3 Sport] + 001d Greentit [Ambit2 R] + 001e Ibisbill [Ambit3 Run] 1497 Panstrong Company Ltd. 1498 Microtek International Inc. a090 DVB-T Tuner 149a Imagination Technologies + 069b PURE Digital Evoke-1XT Tri-band 2107 DBX1 DSP core 14aa WideView Technology Inc. 0001 Avermedia AverTV DVBT USB1.1 (cold) @@ -14068,6 +17526,7 @@ 14ae Printronix Inc. 14af ATP Electronics Inc. 14b0 StarTech.com Ltd. + 3410 Serial Adapter ICUSB2321X [TUSB3410I] 14b2 Ralink Technology, Corp. 3a93 Topcom 802.11bg Wireless Adapter [Atheros AR5523] 3a95 Toshiba WUS-G06G-JT 802.11bg Wireless Adapter [Atheros AR5523] @@ -14090,17 +17549,23 @@ 0250 Storage Adapter V2 0350 Storage Adapter V2 14c8 Zytronic + 0005 Touchscreen Controller 14cd Super Top + 1212 microSD card reader (SY-T18) 121c microSD card reader + 121f microSD CardReader SY-T18 123a SD/MMC/RS-MMC Card Reader 125c SD card reader 127b SDXC Reader + 168a Elecom Co., Ltd MR-K013 Multicard Reader 6116 M6116 SATA Bridge - 6600 USB 2.0 IDE DEVICE + 6600 M110E PATA bridge 6700 Card Reader 6900 Card Reader 8123 SD MMC Reader 8125 SD MMC Reader + 8601 4-Port hub + 8608 Hub [Super Top] 14d8 JAMER INDUSTRIES CO., LTD. 14dd Raritan Computer, Inc. 1007 D2CIM-VUSB KVM connector @@ -14114,7 +17579,16 @@ ab11 GU-1000T ab13 GW-US54Mini 802.11bg 14ed Shure Inc. + 1000 MV5 + 1002 MV51 + 1003 MVi + 1004 SHA900 + 1005 KSE1500 + 1011 MV88+ + 1100 ANIUSB-MATRIX + 1101 P300 29b6 X2u Adapter + 3000 RMCE-USB 14f7 TechniSat Digital GmbH 0001 SkyStar 2 HD CI 0002 SkyStar 2 HD CI @@ -14123,7 +17597,12 @@ 0500 DVB-PC TV Star HD 1500 Ellisys 1501 Pine-Tum Enterprise Co., Ltd. +1504 Bixolon CO LTD + 001f SRP-350II Thermal Receipt Printer 1509 First International Computer, Inc. + 0a01 LI-3100 Area Meter + 0a02 LI-7000 CO2/H2O Gas Analyzer + 0a03 C-DiGit Blot Scanner 9242 eHome Infrared Transceiver 1513 medMobile 0444 medMobile @@ -14137,6 +17616,37 @@ 1518 Cheshire Engineering Corp. 0001 HDReye High Dynamic Range Camera 0002 HDReye (before firmware loads) +1519 Comneon + 0020 HSIC Device +151f Opal Kelly Incorporated + 0020 XEM3001v1 + 0021 XEM3001v2 + 0022 XEM3010 + 0023 XEM3005 + 0028 XEM3050 + 002b XEM5010 + 002c XEM6001 + 002d XEM6010-LX45 + 002e XEM6010-LX150 + 0030 XEM6006-LX16 + 0033 XEM6002-LX9 + 0034 XEM7001-A15 + 0036 XEM7010-A50 + 0037 XEM7010-A200 + 0120 ZEM4310 + 0121 XEM6310-LX45 + 0122 XEM6310-LX150 + 0123 XEM6310MT-LX45T + 0125 XEM7350-K70T + 0126 XEM7350-K160T + 0127 XEM7350-K410T + 0128 XEM6310MT-LX150T + 0129 ZEM5305-A2 + 012b XEM7360-K160T + 012c XEM7360-K410T + 012d ZEM5310-A4 + 0130 XEM7310-A75 + 0131 XEM7310-A200 1520 Bitwire Corp. 1524 ENE Technology Inc 6680 UTS 6680 @@ -14146,9 +17656,44 @@ 1529 UBIQUAM Co., Ltd. 3100 CDMA 1xRTT USB Modem (U-100/105/200/300/520) 152a Thesycon Systemsoftware & Consulting GmbH + 8350 NET Gmbh iCube Camera + 8400 INI DVS128 + 840d INI DAViS + 841a INI DAViS FX3 +152b MIR Srl + 0001 spirobank II + 0002 spirolab III + 0003 MiniSpir + 0004 Oxi + 0005 spiros II + 0006 smiths spirobank II + 0007 smiths spirobank G-USB + 0008 smiths MiniSpir + 0009 spirobank G-USB + 000a smiths Oxi + 000b smiths spirolab III + 000c chorus III + 000d spirolab III Bw + 000e spirolab III + 000f easySpiro + 0010 Spirotel converter + 0011 spirobank + 0012 spiro3 Zimmer + 0013 spirotel serial + 0014 spirotel II + 0015 spirodoc 152d JMicron Technology Corp. / JMicron USA Technology Corp. - 0539 JMS539 SuperSpeed SATA II 3.0G Bridge + 0539 JMS539/567 SuperSpeed SATA II/III 3.0G/6.0G Bridge + 0551 JMS551 SuperSpeed two ports SATA 3Gb/s bridge + 0561 JMS551 - Sharkoon SATA QuickPort Duo + 0562 JMS567 SATA 6Gb/s bridge + 0567 JMS567 SATA 6Gb/s bridge + 0576 Gen1 SATA 6Gb/s Bridge + 0578 JMS578 SATA 6Gb/s + 0583 JMS583Gen 2 to PCIe Gen3x2 Bridge 0770 Alienware Integrated Webcam + 1561 JMS561U two ports SATA 6Gb/s bridge + 1576 External Disk 3.0 2329 JM20329 SATA Bridge 2335 ATA/ATAPI Bridge 2336 Hard Disk Drive @@ -14156,35 +17701,256 @@ 2338 JM20337 Hi-Speed USB to SATA & PATA Combo Bridge 2339 JM20339 SATA Bridge 2352 ATA/ATAPI Bridge - 2509 JMS539 SuperSpeed SATA II 3.0G Bridge + 2509 JMS539, JMS551 SATA 3Gb/s bridge + 2551 JMS551 SATA 3Gb/s bridge + 2561 CEB-2235S-U3 external RAID box + 2566 JMS566 SATA 3Gb/s bridge + 2590 JMS567 SATA 6Gb/s bridge + 3562 JMS567 SATA 6Gb/s bridge + 3569 JMS566 SATA 3Gb/s bridge + 578e JMS578 SATA 6Gb/s bridge + 8561 salcar docking station two disks 152e LG (HLDS) + 1640 INIC-1605 SATA Bridge 2507 PL-2507 IDE Controller + 2571 GP08NU6W DVD-RW e001 GSA-5120D DVD-RW 1532 Razer USA, Ltd 0001 RZ01-020300 Optical Mouse [Diamondback] + 0002 Diamondback Optical Mouse 0003 Krait Mouse + 0005 Boomslang CE 0007 DeathAdder Mouse - 0013 Orochi mouse - 0016 DeathAdder Mouse + 0009 Gaming Mouse [Tempest Habu] + 000a Mamba (Wired) + 000c Lachesis + 000d DiamondBack 3G + 000e Megalodon + 000f Mamba (Wireless) + 0012 Gaming Mouse [Salmosa] + 0013 Orochi 2011 + 0015 Naga Mouse + 0016 DeathAdder 3.5G 0017 RZ01-0035 Laser Gaming Mouse [Imperator] + 0019 Marauder + 001a Spectre + 001b Gaming Headset 001c RZ01-0036 Optical Gaming Mouse [Abyssus] - 0024 Razer Mamba - 002e RZ01-0058 Gaming Mouse [Naga] - 0036 RZ01-0075, Gaming Mouse [Naga Hex] + 001e Lachesis (5600 DPI) + 001f Naga Epic (Wired) + 0020 Abyssus 1800 + 0021 Naga Epic Dock (Wireless, Bluetooth) + 0022 Gaming Mouse [TRON] + 0023 Gaming Keyboard [TRON] + 0024 Mamba 2012 (Wired) + 0025 Mamba 2012 (Wireless) + 0029 DeathAdder Black Edition + 002a Gaming Mouse [Star Wars: The Old Republic] + 002b Gaming Keyboard [Star Wars: The Old Republic] + 002c Gaming Headset [Star Wars: The Old Republic] + 002e RZ01-0058 Gaming Mouse [Naga 2012] + 002f Imperator 2012 + 0031 Gaming Mouse Dock [Star Wars: The Old Republic] + 0032 Ouroboros 2012 (Wired) + 0033 Ouroboros 2012 (Wireless) + 0034 Taipan + 0035 Krait 2013 Essential + 0036 RZ01-0075, Gaming Mouse [Naga Hex (Red)] + 0037 DeathAdder 2013 + 0038 DeathAdder 1800 + 0039 Orochi 2013 + 003e Naga Epic Chroma (Wired) + 003f Naga Epic Chroma (Wireless) + 0040 Naga 2014 + 0041 Naga Hex + 0042 Abyssus 2014 + 0043 DeathAdder Chroma + 0044 Mamba Chroma (Wired) + 0045 Mamba Chroma (Wireless) + 0046 Mamba 2015 Tournament Edition [RZ01-01370100-R3] + 0048 Orochi 2015 (Wired) + 004a RZ03-0133 Gaming Lapboard, Keyboard Mouse Combo, Dongle [Turret Dongle] + 004c Diamondback Chroma + 004d DeathAdder 2000 (Cynosa Pro Bundle) + 0050 Naga Hex V2 + 0053 Naga Chroma + 0054 DeathAdder 3500 + 0056 Orochi 2015 (Wireless) + 0059 RZ01-0212 Gaming Mouse [Lancehead (Wired)] + 005a RZ01-0212 Gaming Mouse [Lancehead (Wireless)] + 005b Abyssus V2 + 005c DeathAdder Elite + 005e Abyssus 2000 + 005f DeathAdder 2000 + 0060 RZ01-0213 Gaming Mouse [Lancehead Tournament Edition] + 0062 Atheris + 0064 Basilisk + 0065 RZ01-0265, Gaming Mouse [Basilisk Essential] + 0067 Naga Trinity + 0068 Gaming Mouse Mat [Firefly Hyperflux] + 0069 Gaming Mouse [Mamba Hyperflux] + 006a Abyssus Elite (D.Va Edition) + 006b Abyssus Essential + 006c Mamba Elite (Wired) + 006e DeathAdder Essential + 006f RZ01-0257 Gaming Mouse [Lancehead Wireless (2019, Wireless, Receiver)] + 0070 RZ01-0257 Gaming Mouse [Lancehead Wireless (2019, Wired)] + 0071 RZ01-0254 Gaming Mouse [DeathAdder Essential White Edition] + 0072 Mamba 2018 (Wireless) + 0073 Mamba 2018 (Wired) + 0078 Viper (wired) + 007a RC30-0305 Gaming Mouse [Viper Ultimate (Wired)] + 007b RC30-0305 Gaming Mouse Dongle [Viper Ultimate (Wireless)] + 007e RC30-030502 Mouse Dock + 0084 RZ01-0321 Gaming Mouse [DeathAdder V2] + 0085 RZ01-0316 Gaming Mouse [Basilisk V2] + 0088 Razer Basilisk Ultimate Dongle 0101 Copperhead Mouse 0102 Tarantula Keyboard + 0103 Gaming Keyboard [Reclusa] + 0105 Gaming Keyboard [ProType] + 0106 Gaming Keyboard [ProType] 0109 Lycosa Keyboard + 010b Gaming Keyboard [Arctosa] + 010d BlackWidow Ultimate 2012 + 010e BlackWidow Classic (Alternate) + 010f Anansi + 0110 Cyclosa + 0111 Nostromo + 0113 RZ07-0074 Gaming Keypad [Orbweaver] + 0114 DeathStalker Ultimate + 0116 Blade Pro (2015) + 0118 RZ03-0080, Gaming Keyboard [Deathstalker Essential] + 0119 Gaming Keyboard [Lycosa] + 011a BlackWidow Ultimate 2013 + 011b BlackWidow Classic + 011c BlackWidow Tournament Edition Stealth + 011d Blade 2013 + 011e Gaming Keyboard Dock [Edge Keyboard Dock] + 011f Deathstalker Essential 2014 + 0200 Gaming Keyboard [Reclusa] + 0201 Tartarus + 0202 DeathStalker Expert + 0203 BlackWidow Chroma + 0204 DeathStalker Chroma + 0205 Blade Stealth + 0207 Orbweaver Chroma keypad + 0208 Tartarus Chroma + 0209 BlackWidow Tournament Edition Chroma + 020d Cynosa Pro keyboard (Cynosa Pro Bundle) + 020f Blade QHD + 0210 Blade Pro (Late 2016) + 0211 BlackWidow Chroma (Overwatch) + 0214 BlackWidow Ultimate 2016 + 0215 Core + 0216 BlackWidow X Chroma + 0217 BlackWidow X Ultimate + 021a BlackWidow X Tournament Edition Chroma + 021b Gaming Keyboard [BlackWidow X Tournament Edition] + 021e Ornata Chroma + 021f Ornata + 0220 Blade Stealth (2016) + 0221 RZ03-0203 Gaming Keyboard [BlackWidow Chroma V2] + 0224 Blade (Late 2016) + 0225 Blade Pro (2017) + 0226 Huntsman Elite + 0227 Huntsman + 0228 BlackWidow Elite + 022a Cynosa Chroma + 022b Tartarus V2 + 022c Cynosa Chroma Pro + 022d Blade Stealth (Mid 2017) + 022f Blade Pro FullHD (2017) + 0232 Blade Stealth (Late 2017) + 0233 Blade 15 (2018) + 0234 Blade Pro 17 (2019) + 0235 BlackWidow Lite (2018) + 0237 BlackWidow Essential + 0239 Blade Stealth (2019) + 023a Blade 15 (2019) Advanced + 023b Blade 15 (2018) Base Model + 023f RZ03-0274 Gaming Keyboard [Cynosa Lite] + 0240 Blade 15 (2018) Mercury + 0241 BlackWidow (2019) + 0243 Huntsman Tournament Edition + 0244 RZ07-0311 Gaming Keypad [Tartarus Pro] + 0245 Blade 15 (Mid 2019) Mercury + 0246 Blade 15 (Mid 2019) Base Model + 024a Blade Stealth (Late 2019) + 024b Gaming Laptop [Blade 15 Advanced (Late 2019)] + 024c Gaming Laptop [Blade Pro (Late 2019)] + 024d Blade 15 Studio Edition (2019) + 0253 RZ09-0330, Gaming Laptop [Blade 15 Advanced (Early 2020)] + 0255 RZ09-0328, Gaming Laptop [Blade 15 Base Model (2020)] 0300 RZ06-0063 Motion Sensing Controllers [Hydra] + 0401 Gaming Arcade Stick [Panthera] + 0501 Kraken 7.1 + 0502 Gaming Headset [Kraken USB] + 0504 Kraken 7.1 Chroma + 0506 Kraken 7.1 (Alternate Version) + 0510 Kraken 7.1 V2 + 0511 RZ19-0229 Gaming Microphone + 0514 Electra V2 USB + 0517 Nommo Chroma + 0518 Nommo Pro + 051a Nari Ultimate + 051c Nari (Wireless) + 051d Nari (Wired) + 0520 Kraken Tournament Edition + 0521 Kraken Kitty Edition + 0527 RZ04-0318 Gaming Headset [Kraken Ultimate] + 0904 R201-0282 Gaming Keyboard, Mouse Combination [Turret For Xbox One] + 0a00 Atrox Arcade Stick for Xbox One + 0a02 ManO'War + 0a03 Wildcat + 0c00 RZ02-0135 Hard Gaming Mouse Mat [Firefly] + 0c01 Goliathus + 0c02 Goliathus Extended + 0c04 Firefly V2 + 0e03 Gaming Webcam [Kiyo] + 0f03 Tiamat 7.1 V2 + 0f07 Chroma Mug Holder + 0f08 Base Station Chroma + 0f09 Chroma HDK + 0f0d Laptop Stand Chroma + 0f13 Lian Li O11 Dynamic Razer Edition + 0f1a Core X Chroma + 1000 Gaming Controller [Raiju] + 1004 Gaming Controller [Raiju Ultimate Wired] + 1007 Gaming Controller [Raiju 2 Tournament Edition (USB)] + 1008 Gaming Flightstick [Panthera Evo] + 1009 Gaming Controller [Raiju 2 Ultimate Edition (BT)] + 100a Gaming Controller [Raiju 2 Tournament Edition (BT)] + 110d Bootloader (Alternate) + 800e Bootloader +153b TerraTec Electronic GmbH + 1181 Cinergy S2 PCIe Dual Port 1 + 1182 Cinergy S2 PCIe Dual Port 2 1546 U-Blox AG + 01a4 Antaris 4 + 01a5 [u-blox 5] + 01a6 [u-blox 6] + 01a7 [u-blox 7] + 01a8 [u-blox 8] + 1102 LISA-U2 1547 SG Intec Ltd & Co KG 1000 SG-Lock[U2] 154a Celectronic GmbH 8180 CARD STAR/medic2 154b PNY + 000f Flash Drive 0010 USB 2.0 Flash Drive + 0048 Flash Drive 004d 8 GB Flash Drive + 0053 Flash Drive 0057 32GB Micro Slide Attache Flash Drive + 005b Flash Drive + 0062 Flash Drive + 007a Classic Attache Flash Drive + 5408 2.5in drive enclosure + 6000 Flash Drive 6545 FD Device + fa05 Flash Drive 154d ConnectCounty Holdings Berhad 154e D&M Holdings, Inc. (Denon/Marantz) 3000 Marantz RC9001 Remote Control @@ -14226,10 +17992,16 @@ 15a2 Freescale Semiconductor, Inc. 0038 9S08JS Bootloader 003b USB2CAN Application for ColdFire DEMOJM board + 0041 i.MX51 SystemOnChip in RecoveryMode 0042 OSBDM - Debug Port + 004e i.MX53 SystemOnChip in RecoveryMode 004f i.MX28 SystemOnChip in RecoveryMode 0052 i.MX50 SystemOnChip in RecoveryMode - 0054 i.MX6Q SystemOnChip in RecoveryMode + 0054 i.MX 6Dual/6Quad SystemOnChip in RecoveryMode + 0061 i.MX 6Solo/6DualLite SystemOnChip in RecoveryMode + 006a Vybrid series SystemOnChip in RecoveryMode + 0076 i.MX 7Solo/7Dual SystemOnChip in RecoveryMode + 0080 i.MX 6ULL SystemOnChip in RecoveryMode 15a4 Afatech Technologies, Inc. 1000 AF9015/AF9035 DVB-T stick 1001 AF9015/AF9035 DVB-T stick @@ -14243,6 +18015,7 @@ 0006 Wireless 11n USB Adapter 0010 802.11n USB Wireless Card 0012 WUBR-208N 802.11abgn Wireless Adapter [Ralink RT2870] + 002d WLTUBA-107 [Yota 4G LTE] 15aa Gearway Electronics (Dong Guan) Co., Ltd. 15ad VMware Inc. 15ba Olimex Ltd. @@ -14250,6 +18023,7 @@ 0004 OpenOCD JTAG TINY 002a ARM-USB-TINY-H JTAG interface 002b ARM-USB-OCD-H JTAG+RS232 + 003c TERES Keyboard+Touchpad 15c0 XL Imaging 0001 2M pixel Microscope Camera 0002 3M pixel Microscope Camera @@ -14266,6 +18040,7 @@ 15c2 SoundGraph Inc. 0036 LC16M VFD Display/IR Receiver 0038 GD01 MX LCD Display/IR Receiver + 0042 Antec Veris Multimedia Station E-Z IR Receiver ffda iMON PAD Remote Controller ffdc iMON PAD Remote Controller 15c5 Advance Multimedia Internet Technology Inc. (AMIT) @@ -14294,13 +18069,19 @@ 0a41 MI-2540D [Optical mouse] 0a4c USB+PS/2 Optical Mouse 0a4d Optical Mouse + 0a4e AM-5400 [Optical Mouse] + 0a4f Optical Mouse 15dc Hynix Semiconductor Inc. 15e0 Seong Ji Industrial Co., Ltd. 15e1 RSA 2007 RSA SecurID (R) Authenticator 15e4 Numark 0024 Mixtrack + 003c DJ2GO2 Touch 0140 ION VCR 2 PC / Video 2 PC + 3f00 Power A Mini Pro Elite + 3f0a Airflo Wired Controller for Xbox 360 + 3f10 Batarang controller for Xbox 360 15e8 SohoWare 9100 NUB100 Ethernet [pegasus] 9110 10/100 USB Ethernet @@ -14312,13 +18093,18 @@ 15f4 HanfTek 0001 HanfTek UMT-010 USB2.0 DVB-T (cold) 0025 HanfTek UMT-010 USB2.0 DVB-T (warm) + 0131 Astrometa DVB-T/T2/C FM & DAB receiver [RTL2832P] + 0135 Astrometa T2hybrid 1604 Tascam + 10c0 Dell Integrated Hub 8000 US-428 Audio/Midi Controller (without fw) 8001 US-428 Audio/Midi Controller 8004 US-224 Audio/Midi Controller (without fw) 8005 US-224 Audio/Midi Controller 8006 US-122 Audio/Midi Interface (without fw) 8007 US-122 Audio/Midi Interface +1605 ACCES I/O Products, Inc. + 0001 DIO-32 (No Firmware Yet) 1606 Umax 0002 Astra 1236U Scanner 0010 Astra 1220U @@ -14421,7 +18207,11 @@ 0404 WMA9109 UMTS Phone 0600 Vodafone VDA GPS / Toschiba Protege G710 0804 WP-S1 Phone +1617 Sony Corp. + 2002 NVX-P1 Personal Navigation System 1619 L & K Precision Technology Co., Ltd. +161c Digitech Systems + 0002 DTC-02U [Digi Touch Controller] 1621 Wionics Research 1628 Stonestreet One, Inc. 162a Airgo Networks Inc. @@ -14433,7 +18223,11 @@ 1631 Good Way Technology 6200 GWUSB2E c019 RT2573 -1645 Cross Match Technologies GmbH +1633 AIM GmbH + 4510 ASC1553 + 4520 ASC429 + 4560 ASC-FDX +1645 Entrega [hex] 0001 1S Serial Port 0002 2S Serial Port 0003 1S25 Serial Port @@ -14471,7 +18265,11 @@ fad1 Alphatrack Control Surface 165c Kondo Kagaku 0002 Serial Adapter + 0006 FT232 [ICS adapter HS] + 0008 FT232 [Dual adapter HS] 1660 Creatix Polymedia GmbH +1667 GIGA-TMS INC. + 0005 PCR330A RFID Reader (125 kHz, keyboard emulation) 1668 Actiontec Electronics, Inc. [hex] 0009 Gateway 0333 Modem @@ -14506,23 +18304,34 @@ 1679 Total Phase 2001 Beagle Protocol Analyzer 2002 Cheetah SPI Host Adapter +167b Pure Digital Technologies, Inc. + 2009 Flip Ultra U1120 1680 Golden Bridge Electech Inc. a332 DVB-T Dongle [RTL2832U] 1681 Prevo Technologies, Inc. 0001 Tuner's Dashboard - 0002 Tubachron + 0002 DocuBrain(R) Tubachron + 0003 DocuBrain(R) I2C + 0004 DocuBrain(R) WWVB Receiver + 0005 DocuBrain(R) WWVB Transmitter 1682 Maxwise Production Enterprise Ltd. 1684 Godspeed Computer Corp. 1685 Delock 0200 Infrared adapter 1686 ZOOM Corporation - 0045 H4 Digital Recorder + 0045 Handy Recorder stereo mix + 01c0 Zoom Handy Recorder card reader + 01c5 Zoom Handy Recorder multi track + 03d5 LiveTrak L-12 1687 Kingmax Digital Inc. 5289 FlashDisk 6211 FlashDisk + 6213 FlashDisk 1688 Saab AB 1689 Razer USA, Ltd fd00 Onza Tournament Edition controller + fd01 Onza Classic Edition + fe00 Sabertooth Elite 168c Atheros Communications 0001 AR5523 0002 AR5523 (no firmware) @@ -14555,6 +18364,9 @@ 0726 Wi-Fi Wireless LAN Adapter 0740 802.11n Wireless LAN Card 0901 Voyager 205 ADSL Router + 2000 naturaSign Pad Standard + 2001 naturaSign Pad Standard + fe12 Bootloader 1696 Hitachi Video and Information System, Inc. 1697 VTec Test, Inc. 16a5 Shenzhen Zhengerya Cable Co., Ltd. @@ -14602,13 +18414,18 @@ 0486 Teensyduino RawHID 0487 Teensyduino Serial+Keyboard+Mouse+Joystick 0488 Teensyduino Flight Sim Controls + 05b5 BU0836 05dc shared ID for use with libusb 05dd BlackcatUSB2 + 05de Flashcat 05df HID device except mice, keyboards, and joysticks 05e1 Free shared USB VID/PID pair for CDC devices 05e4 Free shared USB VID/PID pair for MIDI devices 06b4 USB2LPT with 2 interfaces 06b5 USB2LPT with 3 interfaces (native, HID, printer) + 074e DSP-Weuffen USB-HPI-Programmer + 074f DSP-Weuffen USB2-HPI-Programmer + 0762 Osmocom SIMtrace 076b OpenPCD 13.56MHz RFID Reader 076c OpenPICC 13.56MHz RFID Simulator (native) 08ac OpenBeacon USB stick @@ -14616,6 +18433,7 @@ 08cb Alpermann+Velte Studio Clock 08cc Alpermann+Velte SAM7S MT Boot Loader 08cd Alpermann+Velte SAM7X MT Boot Loader + 09ce LINKUSB 0a32 jbmedia Light-Manager Pro 27d8 libusb-bound devices 27d9 HID device except mice, keyboards, and joysticks @@ -14630,20 +18448,47 @@ 1502 Bluetooth Dongle 16cc silex technology, Inc. 16d0 MCS + 0436 Xylanta Ltd, XSP Device 0498 Braintechnology USB-LPS 0504 RETRO Innovations ZoomFloppy 054b GrauTec ReelBox OLED Display (external) 05be EasyLogic Board + 05f0 Superior Freedom Programmable IR Remote + 06cc Trinamic TMCM-3110 + 06f0 Axium AX-R4C Controller + 06f1 Axium AX-R1D Controller 06f9 Gabotronics Xminilab + 0726 Autonomic M400 Amplifier + 0727 Autonomic M800 Amplifier 0753 Digistump DigiSpark 075c AB-1.x UAC1 [Audio Widget] 075d AB-1.x UAC2 [Audio Widget] + 07cc Xylanta Ltd, Saint3 Device + 07f8 Axium AX-R4D Controller 080a S2E1 Interface + 0830 DMXControl Projects e.V., Nodle U1 + 0831 DMXControl Projects e.V., Desklamp + 0832 DMXControl Projects e.V., Nodle U2 + 0833 DMXControl Projects e.V., Nodle R4S + 0870 Kaufmann Automotive GmbH, RKS+CAN Interface + 09f2 Axium AX-1250 Amplifier + 09f4 Axium AX-Mini4 Amplifier + 0b03 AIS Receiver [dAISy] + 0b7d Autonomic M801 Amplifier + 0b7e Autonomic M401 Amplifier + 0b7f Autonomic M120e Amplifier + 0bd4 codesrc SCSI2SD + 0c9b Fermium LABS srl/LabTrek srl Hall Effect Apparatus + 0d3c InputStick BT4.0 + 0e1e AtomMiner +16d1 Suprema Inc. + 0401 SUP-SFR400(A) BioMini Fingerprint Reader 16d3 Frontline Test Equipment, Inc. 16d5 AnyDATA Corporation 6202 CDMA/UMTS/GPRS modem 6501 CDMA 2000 1xRTT/EV-DO Modem 6502 CDMA/UMTS/GPRS modem + 6603 ADU-890WH modem 16d6 JABLOCOM s.r.o. 8000 GDP-04 desktop phone 8001 EYE-02 @@ -14666,16 +18511,25 @@ 0011 MARATON Power Supply System 0012 MPOD Multi Channel Power Supply System 0015 CML Control, Measurement and Data Logging System +16de Telemecanique 16df King Billion Electronics Co., Ltd. -16f0 GN ReSound A/S +16f0 GN Hearing A/S 0001 Speedlink Programming Interface 0003 Airlink Wireless Programming Interface + 0004 Accessory Programming Interface 16f5 Futurelogic Inc. +1702 FDI-MATELEC + 0002 Encodeur 1706 BlueView Technologies, Inc. 1707 ARTIMI 170b Swissonic 0011 MIDI-USB 1x1 170d Avnera +1711 Leica Microsystems + 0101 DFC-365FX camera + 3020 IC80 HD Camera +1724 Meyer Instruments (MIS) + 0115 PAXcam5 1725 Vitesse Semiconductor 1726 Axesstel, Inc. 1000 wireless modem @@ -14696,7 +18550,7 @@ 1733 Cellink Technology Co., Ltd 0101 RF Wireless Optical Mouse OP-701 1736 CANON IMAGING SYSTEM TECHNOLOGIES INC. -1737 Linksys +1737 802.11g Adapter [Linksys WUSB54GC v3] 0039 USB1000 Gigabit Notebook Adapter 0070 WUSB100 v1 RangePlus Wireless Network Adapter [Ralink RT2870] 0071 WUSB600N v1 Dual-Band Wireless-N Network Adapter [Ralink RT2870] @@ -14705,7 +18559,14 @@ 0077 WUSB54GC v3 802.11g Adapter [Ralink RT2070L] 0078 WUSB100 v2 RangePlus Wireless Network Adapter [Ralink RT3070] 0079 WUSB600N v2 Dual-Band Wireless-N Network Adapter [Ralink RT3572] +173a Roche + 2198 Accu-Chek Mobile + 21ca ACCU-CHEK Mobile Model U1 +173d QSENN + 0002 GP-K7000 keyboard 1740 Senao + 0100 EUB1200AC AC1200 DB Wireless Adapter [Realtek RTL8812AU] + 0600 EUB600v1 802.11abgn Wireless Adapter [Ralink RT3572] 0605 LevelOne WUA-0605 N_Max Wireless USB Adapter 0615 LevelOne WUA-0615 N_Max Wireless USB Adapter 1000 NUB-350 802.11g Wireless Adapter [Intersil ISL3887] @@ -14719,14 +18580,27 @@ 9706 EUB9706 802.11n Wireless Adapter [Ralink RT3072] 9801 EUB9801 802.11abgn Wireless Adapter [Ralink RT3572] 1743 General Atomics +1748 MQP Electronics + 0101 Packet-Master USB12 174c ASMedia Technology Inc. - 5106 Transcend StoreJet 25M3 - 55aa ASMedia 2105 SATA bridge + 07d1 Transcend ESD400 Portable SSD (USB 3.0) + 1151 ASM1151W + 1153 ASM1153 SATA 3Gb/s bridge + 2074 ASM1074 High-Speed hub + 3074 ASM1074 SuperSpeed hub + 5106 ASM1051 SATA 3Gb/s bridge + 5136 ASM1053 SATA 3Gb/s bridge + 51d6 ASM1051W SATA 3Gb/s bridge + 55aa ASM1051E SATA 6Gb/s bridge, ASM1053E SATA 6Gb/s bridge, ASM1153 SATA 3Gb/s bridge, ASM1153E SATA 6Gb/s bridge 174f Syntek 1105 SM-MS/Pro-MMC-XD Card Reader 110b HP Webcam + 1122 HP Webcam + 1169 Lenovo EasyCamera 1403 Integrated Webcam 1404 USB Camera device, 1.3 MPixel Web Cam + 1758 XYZ printing cameraR2 + 1759 XYZ printing cameraL2 5212 USB 2.0 UVC PC Camera 5a11 PC Camera 5a31 Sonix USB 2.0 Camera @@ -14749,22 +18623,47 @@ 1759 LucidPort Technology, Inc. 1761 ASUSTek Computer, Inc. (wrong ID) 0b05 802.11n Network Adapter (wrong ID - swapped vendor and device) +1770 MSI + ff00 steel series rgb keyboard 1772 System Level Solutions, Inc. 1776 Arowana 501c 300K CMOS Camera +1777 Microscan Systems, Inc. + 0003 MicroHAWK ID-20 177f Sweex 0004 MM004V5 Photo Key Chain (Digital Photo Frame) 1.5" 0153 LW153 802.11n Adapter [ralink rt3070] 0154 LW154 802.11bgn (1x1:1) Wireless Adapter [Realtek RTL8188SU] 0313 LW313 802.11n Adapter [ralink rt2770 + rt2720] 1781 Multiple Vendors + 07df Axium AX-800DAV Amplifier + 07e1 Axium AX-KPC Keypad + 07e2 Axium AX-KPD Keypad + 07e3 Axium AX-400DA Amplifier 083e MetaGeek Wi-Spy 083f MetaGeek Wi-Spy 2.4x 0938 Iguanaworks USB IR Transceiver + 0941 qNimble Quark + 0a96 raphnet.net usb_game12 + 0a97 raphnet.net SNES mouse adapter + 0a98 raphnet.net USBTenki + 0a99 raphnet.net NES + 0a9a raphnet.net Gamecube/N64 controller + 0a9b raphnet.net DB9Joy + 0a9c raphnet.net Intellivision + 0a9d raphnet.net 4nes4snes + 0a9e raphnet.net Megadrive multitap + 0a9f raphnet.net MultiDB9joy + 0bad Mantracourt Load Cell 0c30 Telldus TellStick 0c31 Telldus TellStick Duo 0c9f USBtiny + 1eef OpenAPC SecuKey + 1ef0 E1701 Modular Controller Card + 1ef1 E1701 Modular Controller Card + 1ef2 E1803 Compact Controller Card 1782 Spreadtrum Communications Inc. + 3d00 F200n mobile phone 1784 TopSeed Technology Corp. 0001 eHome Infrared Transceiver 0004 RF Combo Device @@ -14775,6 +18674,8 @@ 0011 eHome Infrared Transceiver 1787 ATI AIB 1788 ShenZhen Litkconn Technology Co., Ltd. +178e ASUSTek Computer, Inc. (wrong ID) + 0b05 CrossLink cable 2GB (wrong ID - swapped vendor and device) 1796 Printrex, Inc. 1797 JALCO CO., LTD. 1799 Thales Norway A/S @@ -14787,14 +18688,25 @@ 0002 Q1U dynamic microphone 0100 C03U multi-pattern microphone 0101 UB1 boundary microphone + 0120 Meteorite condenser microphone + 0130 Go Mic Direct + 0132 Go Mic Mobile wireless receiver 0200 StudioDock monitors (internal hub) 0201 StudioDock monitors (audio) 0210 StudioGT monitors + 0211 StudioGT monitors [CM6400] + 0240 Go Mic Connect + 0241 G-Track Pro microphone 0301 Q2U handheld microphone with XLR 0302 GoMic compact condenser microphone + 0303 C01U Pro condenser microphone 0304 Q2U handheld mic with XLR 0305 GoMic compact condenser mic 0310 Meteor condenser microphone + 0311 Satellite condenser microphone + 1616 RXD1 wireless receiver + b241 G-Track Pro firmware update + b311 Satellite firmware update 17a4 Concept2 0001 Performance Monitor 3 0002 Performance Monitor 4 @@ -14803,6 +18715,10 @@ 17a8 Kamstrup A/S 0001 Optical Eye/3-wire 0005 M-Bus Master MultiPort 250D + 0010 444MHz Radio Mesh Frontend + 0011 444MHz RF sniffer + 0012 870MHz Radio Mesh Frontend + 0013 870MHz RF sniffer 17b3 Grey Innovation 0004 Linux-USB Midi Gadget 17b5 Lunatone @@ -14816,10 +18732,13 @@ 17c3 Singim International Corp. 17cc Native Instruments 041c Audio 2 DJ + 041d Traktor Audio 2 0808 Maschine Controller 0815 Audio Kontrol 1 0839 Audio 4 DJ 0d8d Guitarrig Mobile + 1001 Komplete Audio 6 + 1110 Maschine Mikro 1915 Session I/O 1940 RigKontrol3 1969 RigKontrol2 @@ -14834,6 +18753,9 @@ 17d3 Korea Techtron Co., Ltd. 17e9 DisplayLink 0051 USB VGA Adaptor + 0198 DisplayLink + 019e Overfly FY-1016A + 028f HIS Multi-View II 030b HP T100 0377 Plugable UD-160-A (M) 0378 Plugable UGA-2K-A @@ -14842,16 +18764,35 @@ 037b Plugable USB-VGA-165 037c Plugable DC-125 037d Plugable USB2-HDMI-165 + 410a HDMI Adapter 430a HP Port Replicator (Composite Device) + 430f Kensington Dock (Composite Device) 4312 S2340T + 436e Dell D3100 Docking Station + ff10 I1659FWUX {AOC Powered Monitor] 17eb Cornice, Inc. 17ef Lenovo + 1000 ThinkPad X6 UltraBase 1003 Integrated Smart Card Reader 1004 Integrated Webcam + 1005 ThinkPad X200 Ultrabase (42X4963 ) 1008 Hub 100a ThinkPad Mini Dock Plus Series 3 + 100f ThinkPad Ultra Dock Hub + 1010 ThinkPad Ultra Dock Hub + 1020 ThinkPad Dock Hub + 1021 ThinkPad Dock Hub [Cypress HX2VL] + 3049 ThinkPad OneLink integrated audio + 304b AX88179 Gigabit Ethernet [ThinkPad OneLink GigaLAN] + 304f RTL8153 Gigabit Ethernet [ThinkPad OneLink Pro Dock] + 3060 ThinkPad Dock + 3062 ThinkPad Dock Ethernet [Realtek RTL8153B] + 3063 ThinkPad Dock Audio + 3066 ThinkPad Thunderbolt 3 Dock MCU + 3069 ThinkPad TBT3 LAN + 306a ThinkPad Thunderbolt 3 Dock Audio 3815 ChipsBnk 2GB USB Stick - 4802 Lenovo Vc0323+MI1310_SOC Camera + 4802 Vc0323+MI1310_SOC Camera 4807 UVC Camera 480c Integrated Webcam 480d Integrated Webcam [R5U877] @@ -14869,7 +18810,22 @@ 6004 ISD-V4 Tablet Pen 6007 Smartcard Keyboard 6009 ThinkPad Keyboard with TrackPoint + 600e Optical Mouse 6014 Mini Wireless Keyboard N5901 + 6019 M-U0025-O Mouse + 6022 Ultraslim Plus Wireless Keyboard and Mouse + 6025 ThinkPad Travel Mouse + 602d Black Silk Keyboard + 6032 Wireless Dongle for Keyboard and Mouse + 6044 ThinkPad Laser Mouse + 6047 ThinkPad Compact Keyboard with TrackPoint + 604b Precision Wireless Mouse + 608d Optical Mouse + 609b Professional Wireless Keyboard and Mouse Combo + 609c Professional Wireless Keyboard + 7203 Ethernet adapter [U2L 100P-Y1] + 7205 Thinkpad LAN + 7217 VGA adapter 7423 IdeaPad A1 Tablet 7435 A789 (Mass Storage mode, with debug) 743a A789 (Mass Storage mode) @@ -14877,11 +18833,33 @@ 7498 A789 (MTP mode, with debug) 749a A789 (PTP mode) 749b A789 (PTP mode, with debug) + 7604 A760 (Mass Storage mode) + 7605 A760 (Mass Storage mode, with debug) + 760a A760 (MTP mode) + 760b A760 (MTP mode, with debug) + 760c A760 (PTP mode) + 760d A760 (PTP mode, with debug) + 76fc B8000-H (Yoga Tablet 10) (mass storage) + 76fd B8000-H (Yoga Tablet 10) (debug , mass storage) + 76fe B8000-H (Yoga Tablet 10) (MTP) + 76ff B8000-H (Yoga Tablet 10) (debug , MTP) + 7702 B8000-H (Yoga Tablet 10) (PTP) + 7703 B8000-H (Yoga Tablet 10) (debug , PTP) + 7704 B8000-H (Yoga Tablet 10) (USB tether) + 7705 B8000-H (Yoga Tablet 10) (debug , USB tether) + 7706 B8000-H (Yoga Tablet 10) (zerocd) + 7707 B8000-H (Yoga Tablet 10) (debug , zerocd) + 785f TAB 2 A7-10 Tablet + b000 Virtual Keyboard and Mouse + b001 Ethernet + b003 Virtual Keyboard and Mouse / Mass Storage + f003 MEDION LIFETAB X10605 MTP mode 17f4 WaveSense aaaa Jazz Blood Glucose Meter 17f5 K.K. Rocky -17f6 Unicomp, Inc +17f6 Unicomp, Inc. 0709 Model M Keyboard + 0822 Ruffian 6 Keyboard v3 [Model M] 1809 Advantech 4604 USB-4604 4761 USB-4761 Portable Data Acquisition Module @@ -14894,7 +18872,11 @@ 0010 VoiceKey 1843 Vaisala 1849 ASRock Incorporation +184f K2L GmbH + 0012 MOCCA compact 1852 GYROCOM C&C Co., LTD + 7022 Fiio E10 + 7921 Audiotrak ProDigy CUBE 7922 Audiotrak DR.DAC2 DX [GYROCOM C&C] 1854 Memory Devices Ltd. 185b Compro @@ -14908,11 +18890,14 @@ 0001 iNexio Touchscreen controller 1871 Aveo Technology Corp. 0101 UVC camera (Bresser microscope) + 0141 Camera 0d01 USB2.0 Camera 1873 Navilock ee93 EasyLogger 187c Alienware Corporation 0511 AlienFX Mobile lighting + 0513 Gaming Desktop [Aurora R4] + 0550 LED controller 0600 Dual Compatible Game Pad 187f Siano Mobile Silicon 0010 Stallar Board @@ -14935,10 +18920,16 @@ 0214 Portable Hard Drive 0216 External Hard Drive 0218 External Hard Drive + 0224 Store 'n' Go Micro Plus 0227 Pocket Hard Drive 022b Portable Hard Drive (Store'n'Go) - 0237 Portable Harddrive (500 GB) + 0237 Portable Harddrive + 0243 Flash Drive (Store'n'Go) + 0245 Store'n'Stay 0302 Flash Drive + 0304 Store 'n' Go + 0408 Store 'n' Go + 4123 Store N Go 18b1 Petalynx 0037 Maxter Remote Control 18b4 e3C Technologies @@ -14956,9 +18947,17 @@ 18cd Ecamm cafe Pico iMage 18d1 Google Inc. + 0001 Onda V972 (storage access) + 0003 Android-powered device using AllWinner Technology SoC + 0006 Onda V972 MTP + 0008 Onda V972 PTP (camera) 0d02 Celkon A88 - 2d00 Android-powered device in accessory mode - 2d01 Android-powered device in accessory mode with ADB support + 2d00 Android Open Accessory device (accessory) + 2d01 Android Open Accessory device (accessory + ADB) + 2d02 Android Open Accessory device (audio) + 2d03 Android Open Accessory device (audio + ADB) + 2d04 Android Open Accessory device (accessory + audio) + 2d05 Android Open Accessory device (accessory + audio + ADB) 4e11 Nexus One 4e12 Nexus One (debug) 4e13 Nexus One (tether) @@ -14966,16 +18965,28 @@ 4e21 Nexus S 4e22 Nexus S (debug) 4e24 Nexus S (tether) + 4e30 Galaxy Nexus (fastboot) 4e40 Nexus 7 (fastboot) 4e41 Nexus 7 (MTP) 4e42 Nexus 7 (debug) 4e43 Nexus 7 (PTP) - 4ee1 Nexus 4 / 10 - 4ee2 Nexus 4 (debug) - 4ee3 Nexus 4 (tether) - 4ee4 Nexus 4 (debug + tether) + 4e44 Nexus 7 2012 (PTP) + 4ee0 Nexus/Pixel Device (fastboot) + 4ee1 Nexus/Pixel Device (MTP) + 4ee2 Nexus/Pixel Device (MTP + debug) + 4ee3 Nexus/Pixel Device (tether) + 4ee4 Nexus/Pixel Device (tether+ debug) + 4ee5 Nexus/Pixel Device (PTP) + 4ee6 Nexus/Pixel Device (PTP + debug) + 4ee7 Nexus/Pixel Device (charging + debug) + 4ee8 Nexus/Pixel Device (MIDI) + 4ee9 Nexus/Pixel Device (MIDI + debug) + 5033 Pixel earbuds 7102 Toshiba Thrive tablet b004 Pandigital / B&N Novel 9" tablet + d001 Nexus 4 (fastboot) + d002 Nexus 4 (debug) + d00d Xiaomi Mi/Redmi 2 (fastboot) d109 LG G2x MTP d10a LG G2x MTP (debug) 18d5 Starline International Group Limited @@ -15002,17 +19013,56 @@ 3188 ARK3188 UVC Webcam 3299 Webcam Carrefour 3366 Bresser Biolux NV + 5850 CVBS / S-Video Capture Device [UVC] +18ef ELV Elektronik AG + e014 FS20PCE + e015 FS20PCS + e01a Bedien-Anzeige-Terminal +18f8 [Maxxter] + 0f97 Optical Gaming Mouse [Xtrem] + 0f99 Optical gaming mouse + 1142 Optical gaming mouse + 1486 X5s ZEUS Macro Pro Gaming Mouse +18fb Scriptel Corporation + 01c0 ST1501-STN + 01c1 ST1526-STN + 01c2 ST1501-PYJ + 01c3 ST1501B-PYJ + 01c4 ST1501-PUN + 01c5 ST1401-STN + 01c7 ST1526-PYJ + 01c8 ST1501-ECA + 01c9 ST1476-STN + 01cb ST1571-STN + 0200 ST1500 + 0201 ST1550 + 0202 ST1525 + 0204 ST1400 + 0206 ST1475 + 0207 ST1570 18fd FineArch Inc. +1901 GE Healthcare + 0015 Nemo Tracker 1908 GEMBIRD - 1320 PhotoFrame PF-15-1 + 0102 Digital Photo Frame + 0226 MicroSD Card Reader/Writer + 1315 Digital Photo Frame + 1320 DM8261 Flashdisc + 2070 Honk HK-5002 USB Speaker + 2220 Buildwin Media-Player + 2311 Generic UVC 1.00 camera [AppoTech AX2311] 190d Motorola GSG 1914 Alco Digital Devices Limited 1915 Nordic Semiconductor ASA 000c Wireless Desktop nRF24L01 CX-1766 + 0101 HP Prime Wireless Kit [FOK65AA] (Flash mode) 2233 Linksys WUSB11 v2.8 802.11b Adapter [Atmel AT76C505] 2234 Linksys WUSB54G v1 OEM 802.11g Adapter [Intersil ISL3886] 2235 Linksys WUSB54GP v1 OEM 802.11g Adapter [Intersil ISL3886] 2236 Linksys WUSB11 v3.0 802.11b Adapter [Intersil PRISM 3] + 7777 Bitcraze Crazyradio (PA) dongle +191c Innovative Technology LTD + 4104 Banknote validator NV-150 1923 FitLinxx 0002 Personal SyncPoint 1926 NextWindow @@ -15044,17 +19094,26 @@ 0085 1950 HID Touchscreen 0086 1950 HID Touchscreen 0087 1950 HID Touchscreen + 0dbf HID Touchscreen 0dc2 HID Touchscreen +1928 Proceq SA + 0400 Equotip Piccolo 192f Avago Technologies, Pte. 0000 Mouse 0416 ADNS-5700 Optical Mouse Controller (3-button) 0616 ADNS-5700 Optical Mouse Controller (5-button) + 0916 ADNS-2710 Optical Mouse Controller 1930 Shenzhen Xianhe Technology Co., Ltd. 1931 Ningbo Broad Telecommunication Co., Ltd. 1934 Feature Integration Technology Inc. (Fintek) 0602 F71610 or F71612 Consumer Infrared Receiver/Transceiver 0702 Integrated Consumer Infrared Receiver/Transceiver 5168 F71610A or F71612A Consumer Infrared Receiver/Transceiver +1935 Elektron Music Machines + 000d Elektron Digitakt +1938 Meinberg Funkuhren GmbH & Co. KG + 0501 TCR51USB IRIG Time Code Reader + 0502 TCR600USB IRIG Time Code Reader 1941 Dream Link 8021 WH1080 Weather Station / USB Missile Launcher 1943 Sensoray Co., Inc. @@ -15062,40 +19121,59 @@ 2253 Model 2253 Audio/Video Codec Card 2255 Model 2255 4 Channel Capture Card 2257 Model 2257 4 Channel Capture Card + 2263 Model 2263 UVC HD Audio/Video Codec Card a250 Model 2250 MPEG and JPEG Capture Card (cold) a253 Model 2253 Audio/Video Codec Card (cold) 1949 Lab126, Inc. 0002 Amazon Kindle 0004 Amazon Kindle 3/4/Paperwhite - 0006 Kindle Fire + 0006 Amazon Kindle Fire 0008 Amazon Kindle Fire HD 8.9" + 000a Amazon Kindle Fire 2nd generation (2012) + 0331 Kindle Fire HD 8 (2018) + 0417 Amazon Zukey; clone of Yubikey 4 OTP+U2F + 0800 Fire Phone 194f PreSonus Audio Electronics, Inc. 0101 AudioBox 22 VSL 0102 AudioBox 44 VSL 0103 AudioBox 1818 VSL + 0201 FaderPort 0301 AudioBox 1951 Hyperstone AG 1953 Ironkey Inc. 0202 S200 2GB Rev. 1 1954 Radiient Technologies 195d Itron Technology iONE + 2030 Func KB-460 Gaming Keyboard 7002 Libra-Q11 IR remote 7006 Libra-Q26 / 1.0 Remote 7777 Scorpius wireless keyboard 7779 Scorpius-P20MT +1963 IK Multimedia + 0005 iRig KEYS + 0046 UNO Synth 1965 Uniden Corporation 0016 HomePatrol-1 + 0018 UBC125XLT + 001a BCD436HP Scanner 1967 CASIO HITACHI Mobile Communications Co., Ltd. 196b Wispro Technology Inc. 1970 Dane-Elec Corp. USA 0000 Z Mate 16GB +1973 Spectralink Corporation + 0002 Pivot recovery + 0003 Pivot Media Transfer Protocol + 0004 Pivot Media Transfer Protocol 1975 Dongguan Guneetal Wire & Cable Co., Ltd. 1976 Chipsbrand Microelectronics (HK) Co., Ltd. - 6025 Flash Drive 512 MB + 1307 microSD Card Reader + 6025 CBM2090 Flash Drive 1977 T-Logic 0111 TL203 MP3 Player and Voice Recorder 197d Leuze electronic 0222 BCL 508i +1980 Storage Appliance Corporation + 0808 Clickfree C2 Slimline (527SE) 1989 Nuconn Technology Corp. 198f Beceem Communications Inc. 0210 BCS200 WiMAX Adapter @@ -15104,11 +19182,24 @@ 1995 Trillium Technology Pty. Ltd. 3202 REC-ADPT-USB (recorder) 3203 REC-A-ADPT-USB (recorder) +1996 PixeLINK + 3010 Camera Release 4 + 3011 OEM Camera + 3012 e-ImageData Corp. ScanPro +1997 Shenzhen Riitek Technology Co., Ltd + 0409 wireless mini keyboard with touchpad + 2433 wireless mini keyboard with touchpad 199b MicroStrain, Inc. 3065 3DM-GX3-25 Orientation Sensor 199e The Imaging Source Europe GmbH 8101 DFx 21BU04 Camera + 8457 DFK AFU130-L53 camera 199f Benica Corporation +19a5 HARRIS Corp. + 0004 Remote NDIS Network Device + 0012 RF-7800S Secure Personal Radio + 0401 Mass Storage Device + 0402 Falcon III RF-7800V family RNDIS 19a8 Biforst Technology Inc. 19ab Bodelin 1000 ProScope HR @@ -15125,27 +19216,37 @@ 19b5 B & W Group 19b6 Infotech Logistic, LLC 19b9 Data Robotics + 4b10 Drobo 8d20 Drobo Elite 19c2 Futuba 6a11 MDM166A Fluorescent Display 19ca Mindtribe 0001 Sandio 3D HID Mouse 19cf Parrot SA + 0001 MiniKit Slim handsfree car kit in firmware update mode +19d1 BYD 19d2 ZTE WCDMA Technologies MSM 0001 CDMA Wireless Modem 0002 MF632/ONDA ET502HS/MT505UP 0007 TU25 WiMAX Adapter [Beceem BCS200] + 0017 MF669 0031 MF110/MF627/MF636 + 0037 ONDA MC503HSA + 0039 MF100 0063 K3565-Z HSDPA 0064 MF627 AU 0083 MF190 0103 MF112 0104 K4505-Z + 0117 MF667 0146 MF 195E (HSPA+ Modem) 0167 MF820 4G LTE 0172 AX226 WIMAX MODEM (After Modeswitch) 0325 LTE4G O2 ZTE MF821D LTE/UMTS/GSM Modem/Networkcard 0326 LTE4G O2 ZTE MF821D LTE/UMTS/GSM Modem/Networkcard + 0501 Lever Cell Phone Model Z936L + 1001 K3805-Z vodafone WCDMA/GSM Modem - storage mode (made by ZTE) + 1002 K3805-Z vodafone WCDMA/GSM Modem/Networkcard (made by ZTE) 1008 K3570-Z 1010 K3571-Z 1017 K5006-Z vodafone LTE/UMTS/GSM Modem/Networkcard @@ -15153,6 +19254,7 @@ 1203 MF691 [ T-Mobile webConnect Rocket 2.0] 1217 MF652 1218 MF652 + 1270 MF667 2000 MF627/MF628/MF628+/MF636+ HSDPA/HSUPA fff2 Gobi Wireless Modem (QDL mode) fff3 Gobi Wireless Modem @@ -15164,11 +19266,15 @@ 19f7 RODE Microphones 0001 Podcaster 19fa Gampaq Co.Ltd + 0607 GAME CONTROLLER 0703 Steering Wheel +19fd MTI Instruments Inc. 19ff Dynex 0102 1.3MP Webcam 0201 Rocketfish Wireless 2.4G Laser Mouse + 0220 RF-HDWEBLT RocketFish HD WebCam 0238 DX-WRM1401 Mouse + 0239 Bluetooth 4.0 Adapter [Broadcom, 1.12, BCM20702A0] 1a08 Bellwood International, Inc. 1a0a USB-IF non-workshop badd USB OTG Compliance test device @@ -15180,6 +19286,9 @@ 1a2c China Resource Semico Co., Ltd 0021 Keyboard 0024 Multimedia Keyboard + 2124 Keyboard + 2d23 Keyboard + 427c Backlit Keyboard [Cougar Vantar] 1a32 Quanta Microsystems, Inc. 0304 802.11n Wireless LAN Card 1a34 ACRUX @@ -15196,6 +19305,11 @@ 1a5a Tandberg Data 1a61 Abbott Diabetes Care 3410 CoPilot System Cable + 3650 FreeStyle Libre + 3850 FreeStyle Optium/Precision Neo + 3950 FreeStyle Libre 2 +1a64 Mastervolt + 0000 MasterBus Link 1a6a Spansion Inc. 1a6d SamYoung Electronics Co., Ltd 1a6e Global Unichip Corp. @@ -15204,21 +19318,29 @@ 1008 E-861 PiezoWalk NEXACT Controller 1a79 Bayer Health Care LLC 6002 Contour + 6210 Contour Next Link 2.4 glucometer + 6300 Contour next link 7410 Contour Next + 7800 Contour Plus One 1a7b Lumberg Connect GmbH & Co. KG 1a7c Evoluent 0068 VerticalMouse 3 0168 VerticalMouse 3 Wireless 0191 VerticalMouse 4 + 0195 VerticalMouse C Wireless 1a81 Holtek Semiconductor, Inc. + 1004 Wireless Dongle 2.4 GHZ HT82D40REW + 1701 Wireless dongle + 2004 Keyboard 2203 Laser Gaming mouse 2204 Optical Mouse 2205 Laser Mouse + 4001 Keyboard 1a86 QinHeng Electronics 5512 CH341 in EPP/MEM/I2C mode, EPP/I2C adapter 5523 CH341 in serial mode, usb to serial port converter 5584 CH341 in parallel mode, usb to printer port converter - 7523 HL-340 USB-Serial adapter + 7523 CH340 serial converter 752d CH345 MIDI adapter 7584 CH340S e008 HID-based serial adapater @@ -15232,26 +19354,41 @@ 1aa4 Data Drive Thru, Inc. 1aa5 UBeacon Technologies, Inc. 1aa6 eFortune Technology Corp. +1aab Silvercreations Software AG + 7736 sceye (Gen 2) + 7737 sceye (Gen 3) + 7738 sceye (Gen 4, 3 Mpix) + 7750 sceyeS (Gen 5, 5 MPix) 1aad KeeTouch 0001 Touchscreen 1ab1 Rigol Technologies + 04b0 DS6000 SERIES + 04be DS4000 SERIES + 04ce DS1xx4Z/MSO1xxZ series 0588 DS1000 SERIES +1ab2 Allied Vision + 0001 Vision device 1acb Salcomp Plc 1acc Midiplus Co, Ltd. 0103 AudioLink plus 4x4 2.9.28 1ad1 Desay Wire Co., Ltd. 1ad4 APS 0002 KM290-HRS -1adb SEL C662 Serial Cable +1adb Schweitzer Engineering Laboratories, Inc + 0001 C662 Serial Cable + 0003 CDC Ethernet Gadget 1ae4 ic-design Reinhard Gottinger GmbH 1ae7 X-TENSIONS 0381 VS-DVB-T 380U (af9015 based) + 0525 X-Tensions ISDN TA XC-525 [HFC-S USB] 2001 SpeedLink Snappy Mic webcam (SL-6825-SBK) 9003 SpeedLink Vicious And Devine Laplace webcam, white (VD-1504-SWT) 9004 SpeedLink Vicious And Devine Laplace webcam, black (VD-1504-SBK) 1aed High Top Precision Electronic Co., Ltd. 1aef Conntech Electronic (Suzhou) Corporation 1af1 Connect One Ltd. +1af3 Kingsis Technology Corporation + 0001 ZOWIE Gaming mouse 1afe A. Eberle GmbH & Co. KG 0001 PQ Box 100 1b04 Meilhaus Electronic GmbH @@ -15335,15 +19472,58 @@ 1078 BLUDRIVE II CCID 1079 BLUDRIVE II CCID 1080 WRITECHIP II CCID +1b12 Eventide + 0011 ModFactor 1b1c Corsair 0890 Flash Padlock 0a00 SP2500 Speakers 0a60 Vengeance K60 Keyboard + 0c04 Link Cooling Node + 0c06 RM-Series C-Link Adapter + 0c0a Hydro Series H115i Liquid CPU Cooler + 0c0b Lighting Node Pro + 0c0c Lighting Node Loader + 0c22 iCUE H150i RGB PRO XT Liquid CPU Cooler 1a01 Flash Voyager GT + 1a03 Voyager 3.0 + 1a09 Voyager GT 3.0 1a0a Survivor Stealth Flash Drive + 1a0b Flash Voyager LS + 1a0e Voyager GTX + 1a14 Voyager Vega + 1a15 Voyager Slider Flash Drive 1a90 Flash Voyager GT + 1ab1 Voyager + 1b04 Raptor K50 Keyboard + 1b07 Vengeance K65 Gaming Keyboard + 1b08 Vengeance K95 Keyboard + 1b09 Vengeance K70R keyboard + 1b11 K95 RGB Mechanical Gaming Keyboard + 1b13 Vengeance K70RGB keyboard + 1b20 STRAFE RGB Gaming Keyboard + 1b2d K95 RGB Platinum Keyboard [RGP0056] + 1b2e Corsair Corsair Gaming M65 Pro RGB Mouse + 1b2f Sabre RGB [CH-9303011-XX] + 1b3d Corsair Corsair Gaming K55 RGB Keyboard + 1b5e Harpoon Wireless Mouse + 1b65 Harpoon Wireless Dongle + 1c00 Controller for Corsair Link + 1c02 AX1500i Power Supply + 1c05 HX750i Power Supply + 1c07 HX1000i Power Supply + 1c08 HX1200i Power Supply + 1c0b RM750i Power Supply + 1c0c RM850i Power Supply + 1c1a Corsair CORSAIR Lighting Node CORE +1b1e General Imaging / General Electric + 1003 A1250 +1b1f eQ-3 Entwicklung GmbH + c00f HM-CFG-USB/HM-CFG-USB-2 [HomeMatic Configuration adapter] + c020 HmIP-RFUSB 1b20 MStar Semiconductor, Inc. 1b22 WiLinx Corp. +1b24 Telegent Systems, Inc. + 4001 TLG2300 Hybrid TV Device 1b26 Cellex Power Products, Inc. 1b27 Current Electronics Inc. 1b28 NAVIsis Inc. @@ -15378,6 +19558,7 @@ 1b3f Generalplus Technology Inc. 0c52 808 Camera #9 (mass storage mode) 2002 808 Camera #9 (web-cam mode) + 2003 GPD6000 [Digital MP3 Player] 1b47 Energizer Holdings, Inc. 0001 CHUSB Duo Charger (NiMH AA/AAA USB smart charger) 1b48 Plastron Precision Co., Ltd. @@ -15408,6 +19589,7 @@ 1b5a Chao Zhou Kai Yuan Electric Co., Ltd. 1b65 The Hong Kong Standards and Testing Centre Ltd. 1b71 Fushicai + 0050 Encore ENUTV-4 Analog TV Tuner 3002 USBTV007 Video Grabber [EasyCAP] 1b72 ATERGI TECHNOLOGY CO., LTD. 1b73 Fresco Logic @@ -15427,6 +19609,8 @@ d398 DVB-T receiver [RTL2832U] d700 FM Radio SnapMusic Mobile 700 (FM700) e297 Conceptronic DVB-T CTVDIGRCU V3.0 + e302 CVBS / S-Video Capture Device [Pinnacle Dazzle / UB315-E] + e34c UB435-Q ATSC TV Stick e383 DVB-T UB383-T [af9015] e385 DVB-T UB385-T [af9015] e386 DVB-T UB385-T [af9015] @@ -15449,41 +19633,121 @@ 1ba2 Lite Metals & Plastic (Shenzhen) Co., Ltd. 1ba4 Ember Corporation 0001 InSight USB Link + 0002 EM358 Virtual COM Port 1ba6 Abilis Systems 1ba8 China Telecommunication Technology Labs 1bad Harmonix Music - 0002 Guitar for Xbox 360 - 0003 Drum Kit for Xbox 360 + 0002 Rock Band Guitar for Xbox 360 + 0003 Rock Band Drum Kit for Xbox 360 + 0130 Ion Drum Rocker for Xbox 360 + 028e Controller + 3330 Rock Band 3 Keyboard wii interface + f016 Controller + f018 Street Fighter IV SE FightStick for Xbox 360 + f019 BrawlStick for Xbox 360 + f021 Ghost Recon Future Soldier Gamepad for Xbox 360 + f023 MLG Pro Circuit Controller for Xbox 360 + f025 Call of Duty Controller for Xbox 360 + f027 FPS Pro Controller for Xbox 360 + f028 Street Fighter IV FightPad for Xbox 360 + f02e FightPad + f030 MC2 MicroCON Racing Wheel for Xbox 360 + f036 MicroCON Gamepad Pro for Xbox 360 + f038 Street Fighter IV FightStick TE for Xbox 360 + f039 Marvel VS Capcom 2 Tournament Stick for Xbox 360 + f03a Street Fighter X Tekken FightStick Pro for Xbox 360 + f03d Street Fighter IV Arcade Stick TE for Xbox 360 + f03e MLG Arcade FightStick TE for Xbox 360 + f03f Soulcalibur FightStick for Xbox 360 + f042 Arcade FightStick TE S+ for Xbox 360 + f080 FightStick TE2 for Xbox 360 + f501 Horipad EX2 Turbo for Xbox 360 + f502 Real Arcade Pro.VX SA for Xbox 360 + f503 Fighting Stick VX for Xbox 360 + f504 Real Arcade Pro.EX + f505 Fighting Stick EX2B for Xbox 360 + f506 Real Arcade Pro.EX Premium VLX for Xbox 360 + f900 Controller + f901 GameStop Controller + f903 Tron Controller for Xbox 360 + f904 PDP Versus Fighting Pad for Xbox 360 + f906 Mortal Kombat FightStick for Xbox 360 + f907 Afterglow Gamepad + fa01 Gamepad + fd00 Razer Onza Tournament Edition + fd01 Razer Onza Classic Edition 1bae Vuzix Corporation 0002 VR920 Immersive Eyewear 1bbb T & A Mobile Phones + 0003 Alcatel one touch 4030D modem connection + 0017 HSPA Data Card + 007a Alcatel OneTouch (firmware upgrade mode) 011e Alcatel One Touch L100V / Telekom Speedstick LTE II + 0169 Alcatel ONE TOUCH Fierce + 0195 Alcatel OneTouch L850V / Telekom Speedstick LTE + a00e Vodafone Smart Tab 4G + f000 Alcatel OneTouch (mass storage mode) f017 Alcatel One Touch L100V / Telekom Speedstick LTE II +1bbd Videology Imaging Solutions, Inc. + 0060 1.3MP Mono Camera + 0066 1.3MP Mono Camera + 0067 1.3MP Mono Camera +1bc0 Beijing Senseshield Technology Co.,Ltd. + 0013 Elitee-e + 0014 Elite4 + 0020 iToken + 0021 Mikey + 0051 Elite5 + 0055 Elite5 v3.x + 485d EliteIV 1bc4 Ford Motor Co. 1bc5 AVIXE Technology (China) Ltd. 1bc7 Telit Wireless Solutions 0020 HE863 0021 HE910 + 0022 GE910-QUAD 0023 HE910-D ECM + 0032 LE910-EU V2 1003 UC864-E 1004 UC864-G 1005 CC864-DUAL 1006 CC864-SINGLE 1010 DE910-DUAL 1011 CE910-DUAL - 1200 LE920 + 1012 UE910 V2 + 1101 ME910C1 + 110a ME310 + 1200 LE920 (old firmware) + 1201 LE910 / LE920 1bce Contac Cable Industrial Limited 1bcf Sunplus Innovation Technology Inc. + 0005 Optical Mouse 0007 Optical Mouse 053a Targa Silvercrest OMC807-C optische Funkmaus 05c5 SPRF2413A [2.4GHz Wireless Keyboard/Mouse Receiver] 05cf Micro keyboard & mouse receiver + 08a0 Gaming mouse [Philips SPK9304] 0c31 SPIF30x Serial-ATA bridge + 2281 SPCA2281 Web Camera + 2880 Dell HD Webcam + 2883 Asus Webcam 2885 ASUS Webcam 2888 HP Universal Camera + 2895 Dell Integrated Webcam + 28a2 Dell Integrated Webcam + 28a6 DELL XPS Integrated Webcam + 28ae Laptop Integrated Webcam HD + 28bd Dell Integrated HD Webcam + 2985 Laptop Integrated Webcam HD 2b83 Laptop Integrated Webcam FHD + 2b91 Dell E5570 integrated webcam + 2b97 Laptop Integrated Webcam FHD + 2c6e Laptop Integrated WebCam HD 1bd0 Hangzhou Riyue Electronic Co., Ltd. 1bd5 BG Systems, Inc. +1bda University Of Southampton + 0010 Power Board v4 Rev B + 0011 Student Robotics SBv4B 1bde P-TWO INDUSTRIES, INC. 1bef Shenzhen Tongyuan Network-Communication Cables Co., Ltd 1bf0 RealVision Inc. @@ -15500,12 +19764,19 @@ 6968 Touch Screen 1c02 Kreton Corporation 1c04 QNAP System Inc. + 2074 ASM1074 High-Speed hub + 3074 ASM1074 SuperSpeed hub +1c05 Shenxhen Stager Electric + ea75 G540 Programmer 1c0c Ionics EMS, Inc. 0102 Plug Computer 1c0d Relm Wireless 1c10 Lanterra Industrial Co., Ltd. +1c11 Input Club Inc. + b04d ErgoDox Infinity 1c13 ALECTRONIC LIMITED 1c1a Datel Electronics Ltd. + 0100 Action Replay DS "3DS/DSi/DS/Lite Compatible" 1c1b Volkswagen of America, Inc. 1c1f Goldvish S.A. 1c20 Fuji Electric Device Technology Co., Ltd. @@ -15513,10 +19784,25 @@ 1c22 ZHONGSHAN CHIANG YU ELECTRIC CO., LTD. 1c26 Shanghai Haiying Electronics Co., Ltd. 1c27 HuiYang D & S Cable Co., Ltd. +1c28 PMD Technologies + c003 CamCube + c004 CamBoard + c005 ConceptCam + c006 CamBoard 22 + c007 CamBoard nano + c008 CamBoard mod + c009 CamBoard plus + c00a DigiCam + c00d CamBoard pico LDD + c00f CamBoard pico +1c29 Elster GmbH + 0001 ExMFE5 Simulator + 10fc enCore device 1c31 LS Cable Ltd. 1c34 SpringCard 7241 Prox'N'Roll RFID Scanner 1c37 Authorizer Technologies, Inc. + 6190 U2F Fido-compliant cryptotoken 1c3d NONIN MEDICAL INC. 1c3e Wep Peripherals 1c40 EZPrototypes @@ -15524,27 +19810,49 @@ 0534 i2c-tiny-usb interface 0535 glcd2usb interface 0536 Swiss ColorPAL + 0537 MIST Board 1c49 Cherng Weei Technology Corp. +1c4b Geratherm Medical AG + 026f Spirostik 1c4f SiGma Micro 0002 Keyboard TRACER Gamma Ivory 0003 HID controller 000e Genius KB-120 Keyboard 0026 Keyboard + 0032 Optical Mouse with Scroll Wheel + 0034 XM102K Optical Wheel Mouse + 0063 Touchpad (integrated in detachable keyboard of Chuwi SurBook) + 0065 Optical Wheel Mouse [Rapoo N1130] 3000 Micro USB Web Camera 3002 WebCam SiGma Micro +1c57 Zalman Tech Co., Ltd. + 1e45 FPSGUN FG1000 Mouse 1c6b Philips & Lite-ON Digital Solutions Corporation + a220 DVD Writer Slimtype eSAU108 a222 DVD Writer Slimtype eTAU108 + a223 DVD Writer Slimtype eUAU108 1c6c Skydigital Inc. +1c71 Humanware Inc + c004 Braille Note Apex (braille terminal mode) 1c73 AMT 861f Anysee E30 USB 2.0 DVB-T Receiver +1c75 Arturia + 0288 KeyStep 1c77 Kaetat Industrial Co., Ltd. 1c78 Datascope Corp. 1c79 Unigen Corporation 1c7a LighTuning Technology Inc. + 0577 Fingerprint Sensor + 0603 ES603 Swipe Fingerprint Sensor 0801 Fingerprint Reader 1c7b LUXSHARE PRECISION INDUSTRY (SHENZHEN) CO., LTD. -1c83 Schom辰cker GmbH +1c82 Atracsys + 0200 spryTrac +1c83 Schomaecker GmbH 0001 RS150 V2 + 0002 RFID card reader + 0003 Communicator + 0005 Mobile RFID Reader 1c87 2N TELEKOMUNIKACE a.s. 1c88 Somagic, Inc. 0007 SMI Grabber (EasyCAP DC60+ clone) (no firmware) [SMI-2021CBE] @@ -15565,9 +19873,11 @@ 1cb6 IdeaCom Technology Inc. 6681 IDC6681 1cbe Luminary Micro Inc. + 0002 CDC serial port [TivaWare] 00fd In-Circuit Debug Interface 00ff Stellaris ROM DFU Bootloader 0166 CANAL USB2CAN + 0240 McGill Robotics TM4C Microcontroller 1cbf FORTAT SKYMARK INDUSTRIAL COMPANY 1cc0 PlantSense 1cca NextWave Broadband Inc. @@ -15593,6 +19903,7 @@ 0023 deRFusbSniffer Sub-GHz 0025 deRFusb23E06 0027 deRFusb13E06 + 0030 ZigBee gateway [ConBee II] 1cfc ANDES TECHNOLOGY CORPORATION 1cfd Flextronics Digital Design Japan, LTD. 1d03 iCON @@ -15603,6 +19914,8 @@ 1026 HSUPA Modem FLYING-LARK46-VER0.07 [Flying Angel] 1d0a Johnson Controls, Inc. The Automotive Business Unit 1d0b HAN HUA CABLE & WIRE TECHNOLOGY (J.X.) CO., LTD. +1d0d TDKMedia + 0214 Trans-It Drive 1d0f Sonix Technology Co., Ltd. 1d14 ALPHA-SAT TECHNOLOGY LIMITED 1d17 C-Thru Music Ltd. @@ -15611,39 +19924,365 @@ 1101 DK DVB-T Dongle 1102 DK mini DVB-T Dongle 1103 DK 5217 DVB-T Dongle + 1104 MSI DigiVox Micro HD 6105 Video grabber + 610a Video grabber 8202 DK DVBC/T DONGLE 1d1f Diostech Co., Ltd. 1d20 SAMTACK INC. 1d27 ASUS + 0601 Xtion 1d34 Dream Cheeky - 0001 Dream Cheeky Fidget - 0004 Dream Cheeky Webmail Notifier - 0008 Dream Cheeky button - 000a Dream Cheeky Mailbox Friends Alert - 000d Dream Cheeky Big Red Button - 0013 Dream Cheeky LED Message Board + 0001 Fidget + 0002 Fidget (Basketball) + 0003 Fidget (Golf Ball) + 0004 Webmail Notifier + 0008 button + 000a Mailbox Friends Alert + 000d Big Red Button + 0013 LED Message Board + 0020 Stress Ball 1d45 Touch 1d45 Foxlink Optical touch sensor + 459d BenQ F5 + 465c Harrier Mini by EE 1d4d PEGATRON CORPORATION 0002 Ralink RT2770/2720 802.11b/g/n Wireless LAN Mini-USB Device 000c Ralink RT3070 802.11b/g/n Wireless Lan USB Device 000e Ralink RT3070 802.11b/g/n Wireless Lan USB Device 1d50 OpenMoko, Inc. - 5119 GTA01/GTA02 U-Boot Bootloader + 1db5 IDBG (DFU) + 1db6 IDBG + 5117 Neo1973/FreeRunner kernel usbnet (g_ether, CDC Ethernet) mode + 5118 Neo1973/FreeRunner Debug board (V2+) + 5119 Neo1973/FreeRunner u-boot cdc_acm serial port + 511a HXD8 u-boot usbtty CDC ACM Mode + 511b SMDK2440 u-boot usbtty CDC ACM mode + 511c SMDK2443 u-boot usbtty CDC ACM mode + 511d QT2410 u-boot usbtty CDC ACM mode + 5120 Neo1973/FreeRunner u-boot usbtty generic serial + 5121 Neo1973/FreeRunner kernel mass storage (g_storage) mode + 5122 Neo1973/FreeRunner kernel cdc_ether USB network + 5123 Neo1973/FreeRunner internal USB CSR4 module + 5124 Neo1973/FreeRunner Bluetooth Device ID service + 5300 Rockbox + 530e iriver H10 20GB (Rockbox) + 530f iriver H10 5/6GB (Rockbox) + 5314 Apple iPod Color/Photo (Rockbox) + 5315 Apple iPod Nano 1g (Rockbox) + 5316 Apple iPod Video (Rockbox) + 5318 Apple iPod 4g Grayscale (Rockbox) + 5319 Apple iPod Mini 1g (Rockbox) + 531a Apple iPod Mini 2g (Rockbox) + 531c Apple iPod Nano 2g (Rockbox) + 531d Apple iPod Classic/6G (Rockbox) + 5321 Cowon D2 (Rockbox) + 5329 Toshiba Gigabeat S (Rockbox) + 5332 Sandisk Sansa e200 series (Rockbox) + 5334 Sandisk Sansa c200 series (Rockbox) + 5337 Sandisk Sansa Clip (Rockbox) + 5338 Sandisk Sansa e200v2 series (Rockbox) + 5339 Sandisk Sansa m200 v4 series (Rockbox) + 533a Sandisk Sansa Fuze (Rockbox) + 533b Sandisk Sansa c200v2 series (Rockbox) + 533c Sandisk Sansa Clipv2 (Rockbox) + 533e Sandisk Sansa Clip+ (Rockbox) + 533f Sandisk Sansa Fuze v2 (Rockbox) + 5340 Sandisk Sansa Fuze+ (Rockbox) + 5341 Sandisk Sansa Zip (Rockbox) + 5342 Sandisk Sansa Connect (Rockbox) + 5346 Olympus M:Robe 500i (Rockbox) + 5347 Olympus m:robe MR-100 (Rockbox) + 5359 Creative Zen X-Fi Style (Rockbox) + 535d Creative Zen X-Fi2 (Rockbox) + 535e Creative Zen X-Fi3 (Rockbox) + 5360 Creative Zen X-Fi (Rockbox) + 5361 Creative ZEN Mozaic (Rockbox) + 5362 Creative Zen (Rockbox) + 5364 Philips GoGear SA9200 (Rockbox) + 5365 Philips GoGear HDD16x0 (Rockbox) + 5366 Philips GoGear HDD63x0 (Rockbox) + 5378 Onda VX747 (Rockbox) + 5379 Onda VX767 (Rockbox) + 537b Onda VX777 (Rockbox) + 538c Samsung YH-820 (Rockbox) + 538d Samsung YH-920 (Rockbox) + 538e Samsung YH-925 (Rockbox) + 53a0 Packard Bell Vibe 500 (Rockbox) + 53b4 Rockchip 27xx generic (Rockbox) + 53be HiFiMAN HM-60x (Rockbox) + 53bf HiFiMAN HM-801 (Rockbox) + 53d2 HiFi E.T. MA9 (Rockbox) + 53d3 HiFi E.T. MA9C (Rockbox) + 53d4 HiFi E.T. MA8 (Rockbox) + 53d5 HiFi E.T. MA8C (Rockbox) + 53dc Sony NWZ-E370/E380 series (Rockbox) + 53dd Sony NWZ-E360 series (Rockbox) + 53e6 IHIFI 760 (Rockbox) + 53e7 IHIFI 960 (Rockbox) + 53ff Generic Rockbox device + 6000 Ubertooth Zero + 6001 Ubertooth Zero (DFU) + 6002 Ubertooth One + 6003 Ubertooth One (DFU) + 6004 LeoLipo + 6005 LED Flower S + 6006 LED Cube + 6007 LED Flower + 6008 Kisbee 802.15.4 transceiver + 6009 Adjacent Reality Tracker + 600a AVR Programmer + 600b Hypna Go Go + 600c CatNip LPC1343 development board + 600d Enhanced RoboBrrd Brain board + 600e OpenRISC Ordb2a-ep4ce22 development board + 600f Paparazzi Lisa/M (DFU) + 6010 OpenPipe: OSHW Bagpipes MIDI controller + 6011 LeoLipo (DFU) + 6012 Universal C64 Cartridge + 6013 DiscFerret magnetic disc analyser (bootloader) + 6014 DiscFerret magnetic disc analyser + 6015 Smoothieboard + 6016 phInterface + 6017 Black Magic Debug Probe (DFU) + 6018 Black Magic Debug Probe (Application) + 6019 4pi 5 axis motion controller + 601a Paparazzi Lisa/M + 601b IST-2 chronograph for bullet speeds + 601c EPOSMote II + 601d UDS18B20 temperature sensor + 601e 5x5 STM32 prototyping board + 601f uNSF + 6020 Toad3 + 6021 AlphaSphere + 6022 LightPack + 6023 Pixelkit + 6024 Illucia + 6025 Keyglove (HID) + 6026 Keyglove (Serial) + 6027 Key64 Keyboard + 6028 Teensy 2.0 Development Board [ErgoDox Keyboard] + 6029 Marlin 2.0 (Serial) + 602a Marlin 2.0 (Mass Storage) 602b FPGALink + 602c 5nes5snes (5x8) + 602d 5nes5snes (4x12) + 602e Flexibity + 602f K-copter + 6030 USB-oscope + 6031 Handmade GSM GPS tracker + 6032 ncrmnt.org uISP + 6033 frobiac / adnw keyboard + 6034 Tiflomag Ergo 2 + 6035 FreeLaserTag Gun + 6036 FreeLaserTag Big Brother + 6037 FreeLaserTag Node + 6038 Monaka + 6039 eXtreme Feedback Device + 603a TiLDA + 603b Raspiface + 603c Paparazzi (bootloader) + 603d Paparazzi (Serial) + 603e Paparazzi (Mass Storage) + 603f airGuitar + 6040 moco + 6041 AlphaSphere (bootloader) + 6042 Dspace robot controller + 6043 pc-power + 6044 open-usb-can (DFU) + 6045 open-usb-can + 6046 mimus-weigand + 6047 RfCat Chronos Dongle + 6048 RfCat Dons Dongle + 6049 RfCat Chronos bootloader + 604a RfCat Dons bootloader + 604b HackRF Jawbreaker Software-Defined Radio + 604c Makibox A6 + 604d Paella Pulse height analyzer + 604e Miniscope v2b + 604f Miniscope v2c + 6050 GoodFET + 6051 pinocc.io + 6052 APB Team Robotic Development Board 6053 Darkgame Controller + 6054 Satlab/AAUSAT3 BlueBox + 6055 RADiuS ER900TRS-02 transciever with SMA Connector + 6056 The Glitch + 6057 OpenPipe MIDI Shield + 6058 Novena OTG port + 6059 xser serial + 605a Daisho test + 605b RfCat YARD Stick One + 605c YARD Stick One bootloader + 605d Funky Sensor v2 + 605e Blinkiverse Analog LED Fader + 605f Small DIP package Cypress FX2 + 6060 Data logger using the Cypress FX2 + 6061 Power Manager + 6062 WhiteRabbit console and Wishbone bridge + 6063 CPC FPGA + 6064 CPC FPGA (DFU) + 6065 CPC FPGA (Serial) + 6066 Nuand BladeRF + 6067 Orbotron 9000 (Serial) + 6068 Orbotron 9000 (HID) + 6069 xser (DFU) + 606a xser (legacy) + 606b S08-245, urJtag compatible firmware for S08JS + 606c Blinkytape full-color light tape + 606d TinyG open source motion controller + 606e Reefangel Evolution 1.0 + 606f Geschwister Schneider CAN adapter + 6070 Open Pinball Project + 6071 The Glitch HID + 6072 The Glitch Disk + 6073 The Glitch Serial + 6074 The Glitch MIDI + 6075 The Glitch RawHID + 6076 Vultureprog BIOS chip programmer + 6077 PaintDuino + 6078 DTplug + 6079 Mood Light + 607a Fadecandy + 607b RCDongle for IR remote control + 607c OpenVizsla USB sniffer/analyzer + 607d Spark Core Arduino-compatible board with WiFi + 607e OSHUG Wuthering multi-tool + 607f Spark Core Arduino-compatible board with WiFi (bootloader) + 6080 arcin arcade controller + 6081 BladeRF (bootloader) + 6082 Facecandy (DFU) + 6083 LightUp (bootloader) + 6084 arcin arcade controller (DFU) + 6085 IRKit for controlloing home electronics from iOS devices + 6086 OneRNG entropy device + 6087 Blinkytape (alternate endpoint config) + 6088 picp PIC16F145x based PIC16F145x programmer + 6089 Great Scott Gadgets HackRF One SDR + 608a BLEduino + 608b Loctronix ASR-2300 SDR/motion sensing module + 608c Fx2lafw + 608d Fx2lafw + 608e Fx2lafw + 608f Fx2lafw + 6090 Fx2lafw + 6091 Fx2lafw + 6092 Fx2lafw + 6093 Fx2lafw + 6094 Fx2lafw + 6095 Fx2lafw + 6096 LightUp (sketch) + 6097 Tessel JavaScript enabled Microcontroller with built-in WiFi + 6098 RFIDler + 6099 RASDR Radio Astronomy SDR Rx Interface + 609a RASDR Radio Astronomy SDR Tx Interface + 609b RASDR Radio Astronomy SDR (bootloader) + 609c antiAFK keyboard + 609d PIC16F145x bootloader + 609e Clyde Lamp by Fabule (bootloader) + 609f Clyde Lamp by Fabule (sketch) + 60a0 Smoothiepanel robotic control interface + 60a1 Airspy + 60a2 barebox (DFU) + 60a3 keyboard (bootloader) + 60a4 Papilio Duo (AVR) + 60a5 Papilio Duo (FPGA) + 60a6 HydraBus/HydraNFC (bootloader) + 60a7 HydraBus/HydraNFC + 60a8 reserved + 60a9 Blinky Light Controller (DFU) + 60aa Blinky Light Controller + 60ab AllPixel + 60ac OpenBLT generic microcontroller (bootloader) + 60ad Clasic Gamepad Adapter (NES) + 60ae Clasic Gamepad Adapter (N64) + 60af Clasic Gamepad Adapter (DB9) + 60b0 Waterott Arduino based Clock (caterina bootloader) + 60b1 Drinkbot (processing) + 60b2 Drinkbot (OTG-tablet support) + 60b3 calc.pw password generator device (standard) + 60b4 calc.pw password generator device (enhanced) + 60b5 TimVideos' HDMI2USB (FX2) - Unconfigured device + 60b6 TimVideos' HDMI2USB (FX2) - Firmware load/upgrade + 60b7 TimVideos' HDMI2USB (FX2) - HDMI/DVI Capture Device + 60b8 TimVideos' HDMI2USB (Soft+UTMI) - Unconfigured device + 60b9 TimVideos' HDMI2USB (Soft+UTMI) - Firmware upgrade + 60ba TimVideos' HDMI2USB (Soft+UTMI) - HDMI/DVI Capture Device + 60bc Simple CC25xx programmer / serial board + 60bd Open Source control interface for multimedia applications + 60be Pixelmatix Aurora (bootloader) + 60bf Pixelmatix Aurora + 60c0 Nucular Keyboard adapter + 60c1 BrewBit Model-T pOSHW temperature controller for homebrewers (bootloader) + 60c2 BrewBit Model-T pOSHW temperature controller for homebrewers + 60c3 X Antenna Tracker arduino board + 60c4 CAN bus communication device + 60c5 PIC16F1 bootloader + 60c6 USBtrng hardware random number generator + 60c7 Zubax GNSS positioning module for light UAV systems + 60c8 Xlink data transfer and control system for Commodore C64 + 60c9 random number generator + 60ca FinalKey password manager + 60cb PteroDAQ Data Acquisition on FRDM-KL25Z and future boards + 60cc LamDiNao + 60cd Open Lighting DMX512 / RDM widget + 60de Cryptech.is random number generator + 60df Numato Opsis HDMI2USB board (unconfigured) + 60e0 Numato Opsis HDMI2USB board (JTAG Programming Mode) + 60e1 Numato Opsis HDMI2USB board (User Mode) + 60e2 Osmocom SIMtrace 2 (DFU) + 60e3 Osmocom SIMtrace 2 + 60e4 3D printed racing game - (Catalina CDC bootloader) + 60e5 3D printed racing game + 60e6 replacement for GoodFET/FaceDancer - GreatFet + 60e7 replacement for GoodFET/FaceDancer - GreatFet target + 60e8 Alpen Clack keyboard + 60e9 keyman64 keyboard itercepter + 60ea Wiggleport FPGA-based I/O board + 60eb candleLight CAN adapter + 60ec Duet 2 WiFi or Duet 2 Ethernet 3D printer control electronics + 60ed Duet 2 Maestro 3D printer control electronics + 60ee Duet 3 motion control electronics + 60f0 UDAD-T1 data aquisition device (boot) + 60f1 UDAD-T1 data aquisition device + 60f2 UDAD-T2 data aquisition device (boot) + 60f3 UDAD-T2 data aquisition device + 60f4 Uniti ARC motor controller + 60f5 EightByEight Blinky Badge (DFU) + 60f6 EightByEight Blinky Badge + 60f7 cardio NFC/RFID card reader (bootloader) + 60f8 cardio NFC/RFID card reader + 60fc OnlyKey Two-factor Authentication and Password Solution + 6100 overlay64 video overlay module + 6104 ScopeFun open source instrumentation + 6108 Myriad-RF LimeSDR + 610c Magic Keys (boot) + 610d Magic Keys + 6114 MIDI key + 6118 Thomson MO5 keyboard + 6122 Ultimate Hacking Keyboard + 614c dwtk In-Circuit Emulator + 8085 Box0 (box0-v5) + cc15 rad1o badge for CCC summer camp 2015 1d57 Xenta 0005 Wireless Receiver (Keyboard and Mouse) 0006 Wireless Receiver (RC Laser Pointer) 000c Optical Mouse + 130f 2.4Ghz wireless optical mouse receiver 2400 Wireless Mouse Receiver 32da 2.4GHz Receiver (Keyboard and Mouse) 83d0 Click-mouse! ac01 Wireless Receiver (Keyboard and Mouse) + ac02 ViFit Activity Tracker + ac08 RFID Receiver (Keyboard) ad02 SE340D PC Remote Control + ad03 [T3] 2.4GHz and IR Air Mouse Remote Control af01 AUVIO Universal Remote Receiver for PlayStation 3 + af03 Wireless Receiver + fa20 2.4GHz Wireless Reciever (Mini Keyboard & Mouse) 1d5b Smartronix, Inc. +1d5c Fresco Logic + 2000 FL2000/FL2000DX VGA/DVI/HDMI Adapter 1d6b Linux Foundation 0001 1.1 root hub 0002 2.0 root hub @@ -15655,19 +20294,34 @@ 0104 Multifunction Composite Gadget 0105 FunctionFS Gadget 0200 Qemu Audio Device +1d88 Mahr GmbH + 0001 Measurement Device [MarECon] + 0002 Probe + 0003 Surface Measurement [PS10] 1d90 Citizen 201e PPU-700 + 2037 CL-S631 Barcode Printer + 20f0 Thermal Receipt Printer [CT-E351] +1d9d Sigma Sport + 1010 Docking Station Topline 2009 + 1011 Docking Station Topline 2012 + 1012 Docking Station Topline 2016 +1dd2 Leo Bodnar Electronics Ltd +1dd3 Dajc Inc. + 0001 Expert I/O 1000 1de1 Actions Microelectronics Co. 1101 Generic Display Device (Mass storage mode) c101 Generic Display Device +1de6 MICRORISC s.r.o. 1e0e Qualcomm / Option f000 iCON 210 UMTS Surfstick 1e10 Point Grey Research, Inc. 2004 Sony 1.3MP 1/3" ICX445 IIDC video camera [Chameleon] 1e17 Mirion Technologies Dosimetry Services Division 0001 instadose dosimeter -1e1d Lumension Security +1e1d Kanguru Solutions 0165 Secure Pen drive + 1101 FlashBlu Flash Drive 1e1f INVIA 1e29 Festo AG & Co. KG 0101 CPX Adapter @@ -15686,23 +20340,47 @@ 040c LPC2378 [Robotino XT Bootloader] 040d LPC2378 [Robotino 3] 040e LPC2378 [Robotino 3 Bootloader] + 040f LPC2148 [Robotino gripper] + 0410 LPC2148 [Robotino IR panel] 0501 CP2102 [CMSP] 0601 CMMP-AS + 0602 FTDI232 [CMMS] +1e2d Gemalto M2M GmbH + 004f EGS3 GSM/GPRS modem + 0054 PH8 wireless module + 0058 Wireless Module [Cinterion EHS6] + 0059 Wireless Module [Cinterion BGx] + 005b Zoom 4625 Modem + 0061 ALSx PLSx LTE modem + 00a0 Cinterion ELS31-V 1e3d Chipsbank Microelectronics Co., Ltd + 198a Flash Disk 2093 CBM209x Flash Drive (OEM) 4082 CBM4082 SD Card Reader 1e41 Cleverscope 0001 CS328A PC Oscilloscope + 0004 CS448 +1e44 SHIMANO INC. + 7220 SM-BCR2 1e4e Cubeternet 0100 WebCam 0102 GL-UPC822 UVC WebCam + 0109 EtronTech CMOS based eSP570 WebCam [Onyx Titanium TC101] 1e54 TypeMatrix 2030 2030 USB Keyboard 1e68 TrekStor GmbH & Co. KG 001b DataStation maxi g.u + 004c DataStation Pocket Click 0050 DataStation maxi light + 1045 ST70408-3 [SurfTab breeze 7.0 quad 3G] (MTP Mode) + 1046 ST70408-3 [SurfTab breeze 7.0 quad 3G] (PTP Mode) 1e71 NZXT 0001 Avatar Optical Mouse + 170e Kraken X + 1711 Grid+ V3 + 1714 Smart Device + 1715 Kraken M22 + 2006 Smart Device V2 1e74 Coby Electronics Corporation 2211 MP300 2647 2 GB 2 Go Video MP3 Player [MP601-2G] @@ -15711,14 +20389,124 @@ 6511 MP705-8G MP3 player 6512 MP705-4G 7111 MP957 Music and Video Player +1e7b Zurich Instruments + 0002 HF2 + 0003 UHF + 0004 MFLI 1e7d ROCCAT 2c24 Pyra Mouse (wired) + 2c2e Lua Mouse + 2c38 Kiro Mouse 2ced Kone Mouse + 2cee Kova 2016 Gray Mouse + 2cef Kova 2016 White Mouse + 2cf0 Kova 2016 Black Mouse 2cf6 Pyra Mouse (wireless) - 2d50 Kova+ Mouse - 2d51 Kone+ Mouse + 2d50 Kova[+] Mouse + 2d51 Kone[+] Mouse + 2d5a Savu Mouse + 2db4 Kone Pure Optical Mouse + 2dbe Kone Pure Mouse + 2dbf Kone Pure Military Mouse + 2dc2 Kone Pure Optical Black Mouse + 2dcb Kone Pure SE(L) Mouse + 2e22 Kone XTD Mouse + 2e23 Kone XTD Optical Mouse + 2e27 Kone AIMO Mouse + 2e4a Tyon Black Mouse + 2e4b Tyon White Mouse + 2e7c Nyth Black Mouse + 2e7d Nyth White Mouse + 2f76 Sova Keyboard + 2f94 Sova MK Keyboard + 2fa8 Suora Keyboard + 2fc6 Skeltr Keyboard + 2fda Ryos MK FX Keyboard 30d4 Arvo Keyboard + 3138 Ryos MK Keyboard + 316a Ryos TKL Keyboard + 319c Isku Keyboard + 31ce Ryos MK Glow Keyboard + 3232 Ryos MK Pro Keyboard + 3246 Suora FX Keyboard + 3264 Isku FX Keyboard +1e8e Airbus Defence and Space + 6001 P8GR +1e91 Other World Computing + b0b1 miniStack +1ea7 SHARKOON Technologies GmbH + 0030 Trust GXT 158 Orna Laser Gaming Mouse + 0064 2.4GHz Wireless rechargeable vertical mouse [More&Better] + 0066 [Mediatrack Edge Mini Keyboard] + 0907 Keyboard + 1002 Vintorez Gaming Mouse + 2007 SHARK ZONE K30 Illuminated Gaming Keyboard +1eab Fujian Newland Computer Co., Ltd + 0103 HR200 Barcode scanner engine (HID keyboard) + 0106 HR200 Barcode scanner engine (Serial CDC) + 0110 HR200 Barcode scanner engine (HID Pos) + 0c03 HR100/HR3260 cordless/HR3290 cordless/BS80 Barcode scanner engine (HID keyboard) + 0c06 HR100/HR3260 cordless/HR3290 cordless/BS80 Barcode scanner engine (USB Serial CDC) + 0c10 HR100/HR3260 cordless/HR3290 cordless/BS80 Barcode scanner engine (HID Pos) + 0d03 EM2028 Barcode scanner engine (HID keyboard) + 0d06 EM2028 Barcode scanner engine (Serial CDC) + 0d10 EM2028 Barcode scanner engine (HID Pos) + 1303 EM30xx/EM20xx/HR3260 corded/HR200C Barcode scanner engine (HID keyboard) + 1306 EM30xx/EM20xx/HR3260 corded/HR200C Barcode scanner engine (USB serial CDC) + 1310 EM30xx/EM20xx/HR3260 corded/HR200C Barcode scanner engine (HID Pos) + 1403 HR15-xx Barcode scanner engine (HID keyboard) + 1406 HR15-xx Barcode scanner engine (Serial CDC) + 1410 HR15-xx Barcode scanner engine (HID Pos) + 1603 FM100-M/3250 Barcode scanner engine (HID keyboard) + 1606 FM100-M/3250 Barcode scanner engine (Serial CDC) + 1610 FM100-M/3250 Barcode scanner engine (HID Pos) + 1903 EM1300 Barcode scanner engine (HID keyboard) + 1906 EM1300 Barcode scanner engine (Serial CDC) + 1910 EM1300 Barcode scanner engine (HID Pos) + 1a03 HR3290 corded/HR22 Barcode scanner engine (HID keyboard) + 1a06 HR3290 corded/HR22 Barcode scanner engine (Serial CDC) + 1a10 HR3290 corded/HR22 Barcode scanner engine (HID Pos) + 1c03 HR2150 Barcode scanner engine (HID keyboard) + 1c06 HR2150 Barcode scanner engine (Serial CDC) + 1c10 HR2150 Barcode scanner engine (HID Pos) + 1d03 FM430 Barcode scanner engine (HID keyboard) + 1d06 FM430 Barcode scanner engine (Serial CDC) + 1d10 FM430 Barcode scanner engine (HID Pos) + 1e03 HR42 Barcode scanner engine (HID keyboard) + 1e06 HR42 Barcode scanner engine (Serial CDC) + 1e10 HR42 Barcode scanner engine (HID Pos) + 1f03 HR11+ Barcode scanner engine (HID keyboard) + 1f06 HR11+ Barcode scanner engine (Serial CDC) + 1f10 HR11+ Barcode scanner engine (HID Pos) + 2003 EM2037v2 Barcode scanner engine (HID keyboard) + 2006 EM2037v2 Barcode scanner engine (Serial CDC) + 2010 EM2037v2 Barcode scanner engine (HID Pos) + 8003 EM13x5-LD/HR15-70/HR100-70/HR12/HR1150-70 Barcode scanner engine (HID keyboard) + 8006 EM13x5-LD/HR15-70/HR100-70/HR12/HR1150-70 Barcode scanner engine (USB Serial CDC) + 8010 EM13x5-LD/HR15-70/HR100-70/HR12/HR1150-70 Barcode scanner engine (HID Pos) + 8203 EM3080-01/EM3095/FR20/FM30 Barcode scanner engine (HID keyboard) + 8206 EM3080-01/EM3095/FR20/FM30 Barcode scanner engine (USB Serial CDC) + 8210 EM3080-01/EM3095/FR20/FM30 Barcode scanner engine (HID Pos) + 8303 HR2160 Barcode scanner engine (HID keyboard) + 8306 HR2160 Barcode scanner engine (Serial CDC) + 8310 HR2160 Barcode scanner engine (HID Pos) +1eaf Leaflabs + 0003 Maple DFU interface + 0004 Maple serial interface +1eb8 Modacom Co., Ltd. + 7f00 MW-U3500 WiMAX adapter 1ebb NuCORE Technology, Inc. +1ecb AMTelecom + 02e2 JMR1140 [Jiofi] +1ed8 FENDER MUSICAL INSTRUMENTS CORPORATION + 0004 Mustang I/II + 0005 Mustang III/IV/V + 0006 Mustang I/II [Firmware Update] + 0007 Mustang III/IV/V [Firmware Update] + 0010 Mustang Mini + 0011 Mustang Mini [Firmware Update] + 0014 Mustang I (V.2) + 0016 Mustang IV v.2 1eda AirTies Wireless Networks 2012 Air2210 54 Mbps Wireless Adapter 2210 Air2210 54 Mbps Wireless Adapter @@ -15726,6 +20514,8 @@ 2410 Air2410 300 Mbps Wireless Adapter 1edb Blackmagic design bd3b Intensity Shuttle + bd46 Mini Converter Analog to SDI + bd75 2.5K Cinema Camera (BMCC) 1ee8 ONDA COMMUNICATION S.p.a. 0014 MT833UP 1ef6 EADS Deutschland GmbH @@ -15735,38 +20525,73 @@ 5545 Cassidian SSDC Adapter III 5648 RIU CSMU/BSD 564a Cassidian RIU CSMU/BSD Simulator +1f0c CMX Systems + 2000 HP StreamSmart 410 [NW278AA] 1f28 Cal-Comp 0020 CDMA USB Modem A600 0021 CD INSTALLER USB Device -1f3a Onda (unverified) - efe8 V972 tablet in flashing mode +1f3a Allwinner Technology + 1000 Prestigio PER3464B ebook reader (Mass storage mode) + 1002 mediacom XPRO 415 + 1010 Android device in fastboot mode + efe8 sunxi SoC OTG connector in FEL/flashing mode 1f44 The Neat Company 0001 NM-1000 scanner 1f48 H-TRONIC GmbH 0627 Data capturing system 0628 Data capturing and control module 1f4d G-Tek Electronics Group + a115 EVOLVEO XtraTV stick [DVB-T] b803 Lifeview LV5TDLX DVB-T [RTL2832U] + c803 NotOnlyTV (Lifeview) LV5TDLX DVB-T [RTL2832U] + d220 Geniatech T220 DVB-T2 TV Stick +1f52 Systems & Electronic Development FZCO (SEDCO) + 0001 Ultima 49 Printer + 0002 Ultima 90 Printer + 0003 FormsPro 50 Printer + 0004 Ultima 90+ Printer 1f6f Aliph 0023 Jawbone Jambox 8000 Jawbone Jambox - Updating 1f75 Innostor Technology Corporation + 0611 IS611 SATA/PATA Bridge Controller + 0621 IS621 SATA Storage Controller 0888 IS888 SATA Storage Controller 0902 IS902 UFD controller + 0916 IS916 Flash Drive + 0917 IS917 Mass storage + 0918 IS918 Flash Drive 1f82 TANDBERG 0001 PrecisionHD Camera 1f84 Alere, Inc. + 1f7e Lateral Flow Engine 1f87 Stantum 0002 Multi-touch HID Controller 1f9b Ubiquiti Networks, Inc. 0241 AirView2-EXT + b0b1 UniFi VoIP Phone 1fab Samsung Opto-Electroncs Co., Ltd. 104d ES65 +1fac Franklin Wireless + 0232 U770 3G/4G Wimax/4G LTE Modem +1fae Lumidigm + 0040 M311 Fingerprint Scanner + 212c M30x (Mercury) fingerprint sensor +1fb2 Withings + 0001 Wi-Fi Body Scale (WBS01) +1fba DERMALOG Identification Systems GmbH 1fbd Delphin Technology AG 0001 Expert Key - Data aquisition system 1fc9 NXP Semiconductors 0003 LPC1343 + 000c LPC4330FET180 [ARM Cortex M4 + M0] (device firmware upgrade mode) + 0082 LPC4330FET180 [ARM Cortex M4 + M0] (mass storage controller mode) 010b PR533 + 0126 i.MX 7ULP SystemOnChip in RecoveryMode + 012b i.MX 8M Dual/8M QuadLite/8M Quad Serial Downloader + 5002 PTN5002 [Startech VGA/DVI-D adapter] + 8124 SharkRF Bootloader + 824c LumiNode1 1fde ILX Lightwave Corporation 0001 UART Bridge 1fe7 Vertex Wireless Co., Ltd. @@ -15774,19 +20599,37 @@ 1ff7 CVT Electronics.Co.,Ltd 0013 CVTouch Screen (HID) 001a Human Interface Device +1ffb Pololu Corporation + 0081 AVR Programmer + 0083 Jrk 21v3 Motor Controller + 0089 Micro Maestro 6-Servo Controller + 008a Mini Maestro 12-Channel Servo Controller + 008b Mini Maestro 18-Channel Servo Controller + 008c Mini Maestro 24-Channel Servo Controller + 00b0 AVR Programmer v2 1fff Ideofy Inc. +2000 CMX Systems + 1f0c HP StreamSmart 410 [NW278AA] 2001 D-Link Corp. 0001 DWL-120 WIRELESS ADAPTER 0201 DHN-120 10Mb Home Phoneline Adapter 1a00 DUB-E100 Fast Ethernet Adapter(rev.A) [ASIX AX88172] 1a02 DUB-E100 Fast Ethernet Adapter(rev.C1) [ASIX AX88772] 200c 10/100 Ethernet + 3101 DWA-182 AC1200 DB Wireless Adapter(rev.A1) [Broadcom BCM43526] 3200 DWL-120 802.11b Wireless Adapter(rev.E1) [Atmel at76c503a] 3301 DWA-130 802.11n Wireless N Adapter(rev.C1) [Realtek RTL8192U] 3306 DWL-G122 Wireless Adapter(rev.F1) [Realtek RTL8188SU] 3308 DWA-121 802.11n Wireless N 150 Pico Adapter [Realtek RTL8188CUS] 3309 DWA-135 802.11n Wireless N Adapter(rev.A1) [Realtek RTL8192CU] 330a DWA-133 802.11n Wireless N Adapter [Realtek RTL8192CU] + 330d DWA-131 802.11n Wireless N Nano Adapter (rev.B1) [Realtek RTL8192CU] + 330f DWA-125 Wireless N 150 Adapter(rev.D1) [Realtek RTL8188ETV] + 3310 DWA-123 Wireless N 150 Adapter (rev.D1) + 3314 DWA-171 AC600 DB Wireless Adapter(rev.A1) [Realtek RTL8811AU] + 3315 DWA-182 Wireless AC Dualband Adapter(rev.C) [Realtek RTL8812AU] + 3317 DWA-137 Wireless N High-Gain Adapter [Ralink RT5372] + 3319 DWA-131 Wireless N Nano Adapter (Rev. E1) [Realtek RTL8192EU] 3500 Elitegroup Computer Systems WLAN card WL-162 3700 DWL-122 802.11b [Intersil Prism 3] 3701 DWL-G120 Spinnaker 802.11g [Intersil ISL3886] @@ -15816,12 +20659,14 @@ 3c19 DWA-125 Wireless N 150 Adapter(rev.A3) [Ralink RT5370] 3c1a DWA-160 802.11abgn Xtreme N Dual Band Adapter(rev.B2) [Ralink RT5572] 3c1b DWA-127 Wireless N 150 High-Gain Adapter(rev.A1) [Ralink RT3070] + 3c1e DWA-125 Wireless N 150 Adapter(rev.B1) [Ralink RT5370] 4000 DSB-650C Ethernet [klsi] 4001 DSB-650TX Ethernet [pegasus] 4002 DSB-650TX Ethernet [pegasus] 4003 DSB-650TX-PNA Ethernet [pegasus] 400b 10/100 Ethernet 4102 10/100 Ethernet + 4a00 DUB-1312 Gigabit Ethernet Adapter 5100 DSL-200 ADSL ATM Modem 5102 DSL-200 ADSL Loader 5b00 Remote NDIS Network Device @@ -15838,13 +20683,30 @@ f117 Formosa 3 f118 Formosa 4 2002 DAP Technologies +2003 detectomat + ea61 dc3500 +2006 LenovoMobile +2009 iStorage + 5004 datAshur 4GB + 5016 datAshur 16GB + 5032 datAshur 32GB 200c Reloop 100b Play audio soundcard 2013 PCTV Systems + 0242 QuatroStick 510e 0245 PCTV 73ESE 0246 PCTV 74E 0248 PCTV 282E + 024c DVB-S2 Stick 460e 024f nanoStick T2 290e + 0251 QuatroStick nano 520e + 0258 DVB-S2 Stick 461e + 025a AndroiDTV 78e + 025f tripleStick 292e + 0262 microStick 79e +2018 Deutsche Telekom AG + 0406 Eumex 800 + 0408 Eumex 800 2019 PLANEX 3220 GW-US11S WLAN [Atmel AT76C503A] 4901 GW-USSuper300 802.11bgn Wireless Adapter [Realtek RTL8191SU] @@ -15870,9 +20732,17 @@ ed16 GW-USMicroN2W 802.11bgn Wireless Adapter [Realtek RTL8188SU] ed17 GW-USValue-EZ 802.11n Wireless Adapter [Realtek RTL8188CUS] ed18 GW-USHyper300 / GW-USH300N 802.11bgn Wireless Adapter [Realtek RTL8191SU] +201e Haier + 2009 CE100 CDMA EVDO +203a PARALLELS +203d Encore Electronics Inc. + 1480 ENUWI-N3 [802.11n Wireless N150 Adapter] 2040 Hauppauge + 0265 WinTV-dualHD DVB + 026d WinTV-dualHD ATSC 0c80 Windham 0c90 Windham + 1605 WinTV-HVR 930C HD 1700 CataMount 1800 Okemo A 1801 Okemo B @@ -15883,6 +20753,7 @@ 2011 WinTV MiniCard [Dell Digital TV Receiver] 2019 Tiger Minicard 2400 WinTV PVR USB2 (Model 24019) + 4200 WinTV 4700 WinTV Nova-S-USB2 4902 HD PVR 4903 HS PVR @@ -15896,7 +20767,8 @@ 6500 WinTV HVR-900 6502 WinTV HVR-900 6503 WinTV HVR-930 - 6513 WinTV HVR-980 + 6513 WinTV HVR-950/HVR-980 + 6600 WinTV HVR-900H (Model 660xx) 7050 Nova-T Stick 7060 Nova-T Stick 2 7070 Nova-T Stick 3 @@ -15906,28 +20778,103 @@ 9301 WinTV NOVA-T USB2 (warm) 9941 WinTV Nova-T-500 9950 WinTV Nova-T-500 + b123 WinTV-HVR-955Q + b138 WinTV-HVR-900 model 00246 [WinTV-T Video] b910 Windham b980 Windham b990 Windham c000 Windham c010 Windham 2047 Texas Instruments - 0200 MSP430 USB HID Bootstrap Loader + 0013 MSP eZ-FET lite + 0014 MSP-FET + 0200 MSP430 Bootloader + 0203 eZ-FET Bootloader + 0204 MSP-FET Bootloader + 0300 MSP430 CDC Example + 0301 MSP430 HID Datapipe Example + 0302 MSP430 CDC+HID Example + 0309 MSP430 HID Mouse Example + 0313 MSP430 CDC+CDC Example + 0314 MSP430 HID+HID Example + 0315 MSP430 HID Keyboard Example + 0316 MSP430 MSC File System Emulation Example + 0317 MSP430 MSC SD Card Example + 0318 MSP430 MSC Multiple LUNs Example + 0319 MSP430 MSC+CDC+HID Example + 0320 MSP430 SYSBIOS Tasks MSC+CDC+HID Example + 0321 MSP430 SYSBIOS SWIs MSC+CDC+HID Example + 0322 MSP430 MSC Double-Buffering Example + 0323 MSP430 MSC CD-ROM Example + 03df MSP430 User Experiment + 03e0 MSP430 User Experiment + 03e1 MSP430 User Experiment + 03e2 MSP430 User Experiment + 03e3 MSP430 User Experiment + 03e4 MSP430 User Experiment + 03e5 MSP430 User Experiment + 03e6 MSP430 User Experiment + 03e7 MSP430 User Experiment + 03e8 MSP430 User Experiment + 03e9 MSP430 User Experiment + 03ea MSP430 User Experiment + 03eb MSP430 User Experiment + 03ec MSP430 User Experiment + 03ed MSP430 User Experiment + 03ee MSP430 User Experiment + 03ef MSP430 User Experiment + 03f0 MSP430 User Experiment + 03f1 MSP430 User Experiment + 03f2 MSP430 User Experiment + 03f3 MSP430 User Experiment + 03f4 MSP430 User Experiment + 03f5 MSP430 User Experiment + 03f6 MSP430 User Experiment + 03f7 MSP430 User Experiment + 03f8 MSP430 User Experiment + 03f9 MSP430 User Experiment + 03fa MSP430 User Experiment + 03fb MSP430 User Experiment + 03fc MSP430 User Experiment + 03fd MSP430 User Experiment + 0401 MSP430 Keyboard Example + 0855 Invensense Embedded MotionApp HID Sensor + 08f8 FDC2x14/LDC13xx/LDC16xx EVM + 0964 Inventio Software MSP430 + 0a76 GEOKON S-3810A-5 USB-RS485 CONVERTER + ffe7 HID v1.00 Device [Improv Device] +2058 Nano River Technology + 2058 ViperBoard I2C, SPI, GPIO interface +2077 Taicang T&W Electronics Co. Ltd + 9002 W1M100 HSPA/WCDMA Module 2080 Barnes & Noble 0001 nook 0002 NOOKcolor 0003 NOOK Simple Touch 0004 NOOK Tablet + 0005 BNTV600 [Nook HD+] + 0006 BNTV400 [Nook HD] + 0007 BNRV500 [Nook Glowlight] + 000a BNRV510 [Nook Glowlight Plus] + 000b BNRV520 [Nook Glowlight 3] + 000c BNRV700 [Nook Glowlight Plus] +2086 SIMPASS 2087 Cando 0a01 Multi Touch Panel 0a02 Multi Touch Panel 0b03 Multi Touch Panel 20a0 Clay Logic + 0006 flirc + 4107 GPF Crypto Stick V1.2 4123 IKALOGIC SCANALOGIC 2 414a MDE SPI Interface 415a OpenPilot 415b CopterControl 415c PipXtreme + 41e5 BlinkStick + 4211 Nitrokey Start + 4223 ATSAMD21 [castAR] + 428d Electrosense wideband converter 20b1 XMOS Ltd 10ad XUSB Loader f7d1 XTAG2 - JTAG Adapter @@ -15938,52 +20885,233 @@ 1540 ben-wpan, AT86RF230-based 1db5 IDBG in DFU mode 1db6 IDBG in normal mode + 9db1 Glasgow Debug Tool c25b C2 Dongle cb72 ben-wpan, cntr +20bc ShenZhen ShanWan Technology Co., Ltd. + 5500 Frostbite controller +20ce Minicircuits + 0012 RF Sythesizer 250-4200MHz model SSG-4000LH + 0021 RF Switch Matrix + 0022 I/O Controller 20df Simtec Electronics 0001 Entropy Key [UDEKEY01] +20f0 L3Harris Technologies + 2102 EWLA V2 Module +20f1 NET New Electronic Technology GmbH + 0101 iCube3 Camera 20f4 TRENDnet + 646b TEW-646UBH High Power 150Mbps Wireless N Adapter [Realtek RTL8188SU] 648b TEW-648UBM 802.11n 150Mbps Micro Wireless N Adapter [Realtek RTL8188CUS] + 664b TEW-664UB H/W:V2.0R + 804b TEW-804UB 802.11a/b/g/n/ac (1x1) Wireless Adapter [Realtek RTL8811AU] + 805b TEW-805UB 300Mbps+867Mbps Wireless AC Adapter [Realtek RTL8812AU] + 806b TEW-806UBH 802.11a/b/g/n/ac (1x1) Wireless Adapter [MediaTek MT7610U] +20f7 XIMEA + 3001 MQ or MD camera + 3002 MU camera + 3021 MJ camera + 30b3 MQ in U3V mode or MC camera + a003 MU camera +2100 RT Systems + 0e56 USB62C Radio Cable [Yaesu 857/D - 897/D] + 9e50 USB-59 Radio Cable [Yaesu VX-8/D/DR] + 9e52 Yaesu VX-7 + 9e54 CT29B Radio Cable + 9e57 RTS01 Radio Cable + 9e58 USB63C Radio Cable [Yaesu FTDX-1200] + 9e5d K4Y Radio Cable + 9e5f FT232RL [RTS05 Serial Cable] 2101 ActionStar 0201 SIIG 4-to-2 Printer Switch + 1402 Keyboard/Mouse Switch +2104 Tobii Technology AB + 0050 Eye tracker [EYEX2] + 0124 Eyechip +2107 RDING TECH CO.,LTD +2109 VIA Labs, Inc. + 0210 Hub + 0700 VL700 SATA 3Gb/s bridge + 0701 VL701 SATA 3Gb/s bridge + 0711 VL711 SATA 6Gb/s bridge + 0715 VL817 SATA Adaptor + 0810 VL81x Hub + 0811 Hub + 0812 VL812 Hub + 0813 VL813 Hub + 0820 VL820 Hub + 2210 Hub + 2811 Hub + 2812 VL812 Hub + 2813 VL813 Hub + 2820 VL820 Hub + 3431 Hub + 711f External + 8110 Hub +2113 Softkinetic + 0137 DepthSense 311 (3D) + 0145 DepthSense 325 + 8000 DepthSense 311 (Color) +2116 KT Tech + 000a IDE Hard Drive Enclosure +211f CELOT Corporation + 6801 CDMA Products +2123 Cheeky Dream + 1010 Rocket Launcher +2125 Fiberpro Inc. + 0000 Bootloader + 0010 MCB-100 Series +2133 signotec GmbH + 0001 LCD Signature Pad Sigma + 0018 Delta Pen + 0019 Delta Touch + 001c Kronos Pen + 0022 Epsilon Pen 2149 Advanced Silicon S.A. 211b Touchscreen Controller + 2306 TS58xxA/TC56xxA [CoolTouch] 2703 TS58xxA/TC56xxA [CoolTouch] -2162 Creative (?) +214b Huasheng Electronics + 7000 4-port hub [Maxxter ACT-HUB2-4P, HS8836, iSoul ultra-slim] +214e Swiftpoint + 0005 Z - Gaming mouse [SM700] +2162 Broadxent (Creative Labs) 2031 Network Blaster Wireless Adapter 500c DE5771 Modem Blaster 8001 Broadxent BritePort DSL Bridge 8010U +2166 JVC Kenwood + 600b TH-D74 2184 GW Instek 0005 GDS-3000 Oscilloscope 0006 GDS-3000 Oscilloscope 0011 AFG Function Generator (CDC) + 0017 DSO + 0018 DSO + 0036 AFG-125 Function Generator (CDC) +2188 No brand + 0610 Hub + 0611 Hub + 0620 Hub + 0625 Hub + 0754 Card Reader + 4042 CalDigit Pro Audio +219c Seal One AG + 0010 USB 2200 K Secure Sign Token 21a1 Emotiv Systems Pty. Ltd. 0001 EPOC Consumer Headset Wireless Dongle +21a4 Electronic Arts Inc. + ac27 SPORTS Active 2 Wireless Controller for PS3 + ac40 SPORTS Active 2 Wireless Controller for Wii +21a9 Saleae, Inc. + 1001 16-channel Logic Analyzer [Logic16] + 1003 Logic 4 + 1004 Logic8 + 1005 Logic Pro 8 + 1006 Logic Pro 16 +21ab Planeta Informatica + 0010 RC700 NFC SmartCard Reader + 0011 DSR700 SmartCard Reader +21b4 AudioQuest + 0081 DragonFly + 0082 DragonFly Red 21d6 Agecodagis SARL 0002 Seismic recorder [Tellus] +2207 Fuzhou Rockchip Electronics Company + 0010 GoClever Tab R83 + 0011 SmartTab + 281a RK2818 in Mask ROM mode + 290a RK2918 in Mask ROM mode + 292a RK2928 in Mask ROM mode + 292c RK3026 in Mask ROM mode + 300a RK3066 in Mask ROM mode + 300b RK3168 in Mask ROM mode + 301a RK3036 in Mask ROM mode + 310a RK3066B in Mask ROM mode + 310b RK3188 in Mask ROM mode + 310c RK3126/RK3128 in Mask ROM mode + 310d RK3126 in Mask ROM mode + 320a RK3288 in Mask ROM mode + 320b RK3228/RK3229 in Mask ROM mode + 320c RK3328 in Mask ROM mode + 330a RK3368 in Mask ROM mode + 330c RK3399 in Mask ROM mode +221a ZTEX GmbH + 0100 FPGA Boards 2222 MacAlly 0004 iWebKey Keyboard + 0005 ICEKey Keyboard + 1001 Generic Hub 2520 Mini Tablet 4050 AirStick joystick +2226 Copper Mountain technologies 2227 SAMWOO Enterprise 3105 SKYDATA SKD-U100 +222a ILI Technology Corp. + 0001 Multi-Touch Screen + 0037 Multi-Touch Screen +2230 Plugable + 0001 UD-160-A / M Integrated Hub + 0003 DC-125 / M Integrated Hub 2232 Silicon Motion 1005 WebCam SCB-0385N + 1024 Webcam SC-13HDL11624N [Namuga Co., Ltd.] 1028 WebCam SC-03FFL11939N 1029 WebCam SC-13HDL11939N 1037 WebCam SC-03FFM12339N + 1045 WebCam SC-10HDP12631N 2233 RadioShack Corporation 6323 USB Electronic Scale 2237 Kobo Inc. 4161 eReader White + 4163 Touch + 4173 Glo +2245 Aspeed Technology, Inc. + 1500 AST1500/1510 PC-over-LAN Virtual Hub +224f APDM + 0001 Access Point + 0002 Docking Station + 0004 V2 Opal ACM + 0005 V2 Opal + 0006 V2 Docking Station + 0007 V2 Access Point ACM + 0008 V2 Access Point +2256 Faderfox + 1007 LV3 MIDI Controller +225d Morpho + 0001 FINGER VP Multimodal Biometric Sensor + 0008 CBM-E3 Fingerprint Sensor + 0009 CBM-V3 Fingerprint Sensor + 000a MSO1300-E3 Fingerprint Sensor + 000b MSO1300-V3 Fingerprint Sensor + 000c MSO1350-E3 Fingerprint Sensor & SmartCard Reader + 000d MSO1350-V3 Fingerprint Sensor & SmartCard Reader + 000e MorphoAccess SIGMA Biometric Access Control Terminal + 9015 Tablet 2 + 9024 Tablet 2 + 9039 Tablet 2 secure multifunction biometric tablet + 904d Tablet 2 secure multifunction biometric tablet + 904e Tablet 2 secure multifunction biometric tablet + 9091 Tablet 2 secure multifunction biometric tablet + 9092 Tablet 2 secure multifunction biometric tablet + f000 Tablet 2 secure multifunction biometric tablet + f003 Tablet 2 secure multifunction biometric tablet + f006 Tablet 2 secure multifunction biometric tablet + f00e Tablet 2 secure multifunction biometric tablet +226e DISPLAX 228d 8D Technologies inc. 0001 Terminal Bike Key Reader +22a4 VERZO Technology 22a6 Pie Digital, Inc. ffff PieKey "beta" 4GB model 4E4F41482E4F5247 (SM3251Q BB) +22a7 Fortinet Technologies + 1001 FortiGate Device +22b1 Secret Labs LLC + 1000 Netduino MCU pcb 22b8 Motorola PCS 0001 Wally 2.2 chipset 0002 Wally 2.4 chipset 0005 V.60c/V.60i GSM Phone + 002e XT1806 0830 2386C-HT820 0833 2386C-HT820 [Flash Mode] 0850 Bluetooth Device @@ -16014,6 +21142,8 @@ 2ac1 MSM6100 chipset 2ac3 MSM6100 chipset flash 2d78 XT300[SPICE] + 2e82 XT1541 [Moto G 3rd Gen] + 2e83 XT1033 [Moto G], PTP mode 3001 A835/E1000 GSM Phone (P2K) 3002 A835/E1000 GSM Phone (AT) 3801 C350L/C450 (P2K) @@ -16033,6 +21163,7 @@ 4234 MPc CDMA 4244 MPx100 Smartphone 4285 Droid X (Mass storage) + 42d9 XT910 [Droid RAZR] 4801 Neptune LTS chipset 4803 Neptune LTS chipset flash 4810 Triplet GSM Phone (storage) @@ -16063,14 +21194,65 @@ 6101 Talon integrated chipset 6401 Argon chipset 6403 Argon chipset flash + 6411 ROKR Z6 (print mode) 6415 ROKR Z6 (MTP mode) + 6422 ROKR Z6 (modem mode) + 6426 ROKR Z6 (storage mode) 6604 Washington CDMA Phone 6631 CDC Modem 7001 Q Smartphone + 7086 Atrix + 70a8 Xoom Tablet fe01 StarTAC III MS900 22b9 eTurboTouch Technology, Inc. 0006 Touch Screen 22ba Technology Innovation Holdings, Ltd + 0108 Double Shock Steering Wheel HID + 0109 Double Shock Steering Wheel Hub +22c9 StepOver GmbH + 0601 naturaSign Pad Colour + 0701 naturaSign Pad Mobile + 0801 naturaSign Pad Comfort + 0881 naturaSign Pad Flawless + 0901 naturaSign Pad Classic + 09e1 naturaSign Pad Biometric + 0ce1 duraSign Pad Brilliance + 0cf1 duraSign Pad Biometric 5.0 + 0d01 duraSign 10.0 + 0df1 duraSign Pad Biometric 10.0 +22cd Kinova Robotics Inc. +22d4 Laview Technology + 1301 Mionix NAOS 8200 [STM32F103 MCU] + 1308 Mionix Avior 7000 + 130c Mionix Naos 7000 + 1316 Mionix Castor +22d9 OPPO Electronics Corp. + 2765 Oppo N1 + 2767 Oppo Find 5 (X909) +22db Phase One + 0003 IQ3 100MP IG030372 +22dc Mellanox Technologies + 0004 BlueField SOC +22de WeTelecom Incorporated +22df Medicom MTD, Ltd +22e0 secunet Security Networks AG + 0002 SINA Flash Drive + 0003 SINA ID Token A +22e8 Cambridge Audio + 6512 651N Audio + 6969 Audio Prototype + 7512 751R Audio + 770a X70A Audio + 850c 851C Audio [Azur 850C] + 851d 851D Audio [Azur 851D] + ca02 Audio + ca04 Audio + ca06 AmpMagic + dac2 DacMagic Plus + dac3 Azur DacMagic 100 + dac4 Azur DacMagic 100 + dac6 DacMagicXS 2.0 + dac8 Audio 2304 Pinnacle Systems, Inc. 0109 Studio PCTV USB (SECAM) 0110 Studio PCTV USB (PAL) @@ -16117,31 +21299,368 @@ 0419 PCTV Bungee USB (PAL) with FM radio 061d PCTV Deluxe (NTSC) Device 061e PCTV Deluxe (PAL) Device + 2304 1689 +230d Teracom + 0103 Huwaii 3g wireless modem +2314 INQ Mobile 2318 Shining Technologies, Inc. [hex] 0011 CitiDISK Jr. IDE Enclosure +2319 Tronsmart + 0014 TSM01 Air Mouse + Keyboard +232b Pantum Ltd. + 0810 P2000 +232e EA Elektro-Automatik GmbH & Co. KG + 0010 EA-PS-2000 B Series Power Supply +2340 Teleepoch 2341 Arduino SA 0001 Uno (CDC ACM) 0010 Mega 2560 (CDC ACM) + 0036 Leonardo Bootloader 003b Serial Adapter (CDC ACM) + 003d Due Programming Port + 003e Due 003f Mega ADK (CDC ACM) 0042 Mega 2560 R3 (CDC ACM) 0043 Uno R3 (CDC ACM) 0044 Mega ADK R3 (CDC ACM) 0045 Serial R3 (CDC ACM) + 0049 ISP 8036 Leonardo (CDC ACM, HID) + 8038 Robot Control Board (CDC ACM, HID) + 8039 Robot Motor Board (CDC ACM, HID) +2349 P2 Engineering Group, LLC +234b Free Software Initiative of Japan + 0000 Gnuk Token + 0001 NeuG True RNG +2357 TP-Link + 0005 M7350 4G Mi-Fi Router + 0100 TL-WN8200ND [Realtek RTL8192CU] + 0101 RTL8812AU Archer T4U 802.11ac + 0103 Archer T4UH wireless Realtek 8812AU + 0105 Archer T1U 802.11a/n/ac Wireless Adapter [MediaTek MT7610U] + 0106 Archer T9UH v1 [Realtek RTL8814AU] + 0107 TL-WN821N v5/v6 [RTL8192EU] + 0108 TL-WN822N Version 4 RTL8192EU + 0109 TL-WN823N v2/v3 [Realtek RTL8192EU] + 010b Archer T2UHP [MediaTek MT7610U] + 010c TL-WN722N v2/v3 [Realtek RTL8188EUS] + 010d Archer T4U v2 [Realtek RTL8812AU] + 010e Archer T4UH v2 [Realtek RTL8812AU] + 010f Archer T4UHP [Realtek RTL8812AU] + 0115 Archer T4U ver.3 + 011e AC600 wireless Realtek RTL8811AU [Archer T2U Nano] + 0120 Archer T2U PLUS [RTL8821AU] + 012d Archer T3U [Realtek RTL8812BU] + 0200 MA 180 Zero CD + 0201 HSUPA Modem MA180 + 0600 UE300 10/100/1000 LAN (mass storage CD-ROM mode) [Realtek RTL8153] + 0601 UE300 10/100/1000 LAN (ethernet mode) [Realtek RTL8153] +2366 Bitmanufaktur GmbH + 0001 Reserved Prototyping PID + 0002 OpenBeacon USB 2 + 0003 OpenPCD 2 RFID Reader for 13.56MHz + 0004 OpenBeacon + 0005 Blinkenlights WDIM + 0006 Blinkenlights WMCU + 0007 OpenBeacon Ethernet EasyReader PoE II - Active 2.4GHz RFID Reader + 0008 OpenBeacon WLAN + 0009 OpenPCD 2 RFID Reader for 13.56MHz + 000a OpenPCD 2 Audio & LCD Display +2367 Teenage Engineering + 0002 OP-1 Portable synthesizer + 000c OP-Z Portable synthesizer +2368 Peterson Electro-Musical Products Inc. + 0001 BBS-1 [BodyBeat Sync] +236a SiBEAM + 1965 SB6501 802.11ad Wireless Network Adapter 2373 Pumatronix Ltda 0001 5 MegaPixel Digital Still Camera [DSC5M] 2375 Digit@lway, Inc. 0001 Digital Audio Player +2378 OnLive + 100a Universal Wireless Controller +237d Cradlepoint + 0400 MC400 +2386 Raydium Corporation + 3125 Touch System + 4328 Touch System + 432f Touch System +238b Hytera Communications + 0a11 DMR Radio +239a Adafruit + 0001 CDC Bootloader + 801e Trinket M0 +23a0 BIFIT + 0001 Token iBank2key + 0002 iBank2Key Type M Token + 0003 iToken + 0008 MS_KEY K - Angara +23a6 Tronical Components GmbH + 2000 Gibson Firebird X Pedal Board + 2001 Gibson Firebird X Switch Board +23b4 Dental Wings Inc. + 0200 DW0200 Color Camera + 0300 DW0300 Hight Speed Monochrome Camera +23c7 Gemini + 1021 FirstMix +23fc SesKion GmbH + 0201 SPI-Simulyzer box for SPI data communication + 0202 PSI5-Simulyzer box for PSI5 (Peripheral-Sensor-Interfacs) data communication + 0203 SENT-Simulyzer box for SENT data communication + 0204 DSI-Simulyzer box for DSI3 data communication +2405 Custom Computer Services, Inc + 0002 West Mountain Radio RIGblaster Advantage Audio + 0003 West Mountain Radio RIGblaster Advantage 2406 SANHO Digital Electronics Co., Ltd. 6688 PD7X Portable Storage +2420 IRiver +242e Vossloh-Schwabe Deutschland GmbH + 0001 DALI Master + 0002 LiCS Bootloader Mode + 0003 LiCS Running Mode + 0004 iProgrammer + 0005 NFC programming device +2433 ASETEK + b200 [NZXT Kraken X60] 2443 Aessent Technology Ltd 00dc aes220 FPGA Mini-Module +2457 Ocean Optics Inc. + 100a HR2000 Spectrometer 1.00.0 + 1012 HR4000 Spectrometer +2458 Bluegiga Technologies + 0001 BLED112 Bluetooth 4.0 Single Mode Dongle +245f Chord Electronics Limited +2464 Nest + 0001 Learning Thermostat + 0002 Learning Thermostat (2nd Generation) + 0010 Protect : Smoke + Carbon Monoxide + 0020 Heat Link +2466 Fractal Audio Systems + 8003 Axe-Fx II + 8010 Axe-FX III +2476 YEI Technology + 1040 3-Space Embedded Sensor 2478 Tripp-Lite 2008 U209-000-R Serial Port +248a Maxxter + 8366 Wireless Optical Mouse ACT-MUSW-002 + 8367 Telink Wireless Receiver +249c M2Tech s.r.l. +24a4 Primare AB + 0002 I15_v1.06 [Primare Audio DAC] +24ae Shenzhen Rapoo Technology Co., Ltd. + 0001 KX Keyboard + 0197 meva Barcode Scanner + 1813 E9260 Wireless Multi-mode Keyboard + 2000 2.4G Wireless Device Serial + 2001 5 GHz Wireless Receiver + 2003 5GHz Wireless Transceiver + 4110 Optical Gaming Mouse [V280] + 6000 Wireless Audio +24c0 Chaney Instrument + 0003 Model 01036 weather center +24c6 ThrustMaster, Inc. + 5000 Razer Atrox Gaming Arcade Stick + 5300 PowerA Mini ProEX Controller for Xbox 360 + 5303 Airflo Wired Controller for Xbox 360 + 530a ProEX Controller for Xbox 360 + 531a Pro Ex mini for XBOX + 5397 FUS1ON Tournament Controller + 541a PowerA CPFA115320-01 [Mini Controller for Xbox One] + 542a Spectra for Xbox One + 543a PowerA Wired Controller for Xbox One + 5500 Horipad EX2 Turbo + 5501 Hori Real Arcade Pro.VX-SA for Xbox 360 + 5502 Hori Fighting Stick VX Alt for Xbox 360 + 5503 Hori Fighting Edge for Xbox 360 + 5506 Hori Soulcalibur V Stick for Xbox 360 + 550d Hori Gem Controller for Xbox 360 + 550e Real Arcade Pro V Kai for Xbox One / Xbox 360 + 551a Fusion Pro Controller + 561a Fusion Controller for Xbox One + 5b00 Ferrari 458 Italia Racing Wheel + 5b02 GPX Controller + 5d04 Sabertooth Elite + fa00 INF-8032385 Disney Infinity Reader + fafb Aplay Controller + fafd Afterglow Gamepad for Xbox 360 + fafe Rock Candy Gamepad for Xbox 360 +24cf Lytro, Inc. + 00a1 Light Field Camera +24dc Aladdin R.D. + 0406 JaCarta SF GOST +24e0 Yoctopuce Sarl +24e1 Paratronic + 3001 Adp-usb + 3005 Radius +24e3 K-Touch +24ea Meva + 0197 Barcode Scanner +24ed Zen Group + 044d Chat Headset +24f0 Metadot + 0105 Das Keyboard 4 + 0140 Das Keyboard 4 + 2020 Das Keyboard 5Q +24ff Acroname Inc. +2500 Ettus Research LLC + 0020 USRP B210 + 0021 USRP B200-mini + 0022 USRP B205-mini + 0200 USRP B200 +2516 Cooler Master Co., Ltd. + 0003 Storm Xornet + 0004 Storm QuickFire Rapid Mechanical Keyboard + 0006 Storm Recon + 0007 Storm Sentinel Advance II + 0009 Storm Quick Fire PRO + 0011 Storm Quick Fire TK 6keys + 0014 Storm Quick Fire TK Nkeys + 0015 Storm QuickFire Pro/Ultimate keyboard + 0017 CM Storm Quick Fire Stealth + 001a Storm Quick Fire XT + 0020 QuickFire Rapid-i Keyboard + 0027 CM Storm Coolermaster Novatouch TKL + 002d Alcor mouse + 0042 Masterkeys Lite L Combo RGB Keyboard + 0044 Masterkeys Lite L Combo RGB Mouse + 0046 Masterkeys PRO L + 0047 MasterKeys Pro L + 0055 MasterKeys L + 1006 MasterCase SL600M + 9494 Sirus Headset +2520 ANA-U GmbH + 0001 EasyPrinter S3 +2527 Software Bisque + 1388 Paramount 5 +2537 Norelsys + 1066 NS1066 + 1068 NS1068/NS1068X SATA Bridge Controller +2544 Energy Micro AS +2546 Ravensburger + e301 TipToi Pen +2548 Pulse-Eight + 1001 CEC Adapter + 1002 CEC Adapter +254e SHF Communication Technologies AG + e2b3 SHF 58035 A BiasBoard +2554 ASSA ABLOY AB +2555 Basis Science Inc. + 0001 B1 Fitness Band +255e Beijing Bonxeon Technology Co., Ltd. + 0001 Device + 0002 Dual +2560 e-con Systems + c152 See3CAM_CU51 5 Mpx monochrome camera +2563 ShenZhen ShanWan Technology Co., Ltd. + 031d DXT Mouse + 0523 BM0523 WirelessGamepad + 0575 ZD-V+ Wired Gaming Controller +256b Perreaux Industries Ltd + 0121 Audiant 80i +256f 3Dconnexion + c62e SpaceMouse Wireless (cabled) + c62f SpaceMouse Wireless Receiver + c631 SpaceMouse Pro Wireless (cabled) + c632 SpaceMouse Pro Wireless Receiver + c633 SpaceMouse Enterprise + c635 SpaceMouse Compact + c651 CadMouse Wireless + c652 Universal Receiver + c654 CadMouse Pro Wireless + c657 CadMouse Pro Wireless Left +2573 ESI Audiotechnik GmbH + 0017 MAYA22 +2574 AVer Information, Inc. + 0901 VC520 + 0910 CAM520 + 0920 VC320 + 0930 CAM530 + 0940 CAM340 + 0950 VC322 + 0960 VB342 +2575 Weida Hi-Tech Co., Ltd. +2576 AFO Co., Ltd. + 0003 TCM + 0005 BL [Boot Loader] + 0011 THM +2578 Pluscom + 4168 2.4GHZ Wireless Arc Folding Mouse +2581 Plug-up + 1807 Generic HID Smartcard + 1808 WinUSB Smartcard + f1d0 FIDO U2F Security Key +258d Sequans Communications +259a TriQuint Semiconductor +25a7 Areson Technology Corp + 2410 Laser mouse + fa23 2.4G Receiver + fa61 Elecom Co., Ltd MR-K013 Multicard Reader +25b5 FlatFrog + 0002 Multitouch 3200 +25bb Brunner Elektronik AG + 0063 PRT.5105 [Yoke] + 0064 PRT.5105 [reserved] + 0065 PRT.5096 [Battery Management System] + 0066 PRT.5096 [Battery Management System] + 0067 PRT.5094 + 0068 PRT.5094 + 0069 PRT.5119 [Ethernet2CAN LC Gateway] + 006a PRT.5113 [CLS CANaerospace Gateway] + 006b PRT.5123 + 006c PRT.5123 [reserved] + 006d PRT.5127 + 00ff MSP430 HID Update Agent +25bf Elegant Invention + 0001 Isostick + 0002 Isostick updater +25c4 ARCAM +25c6 Vitus Audio (AVA Group A/S) +25c8 Visual Planet Ltd + 0014 Single User touchfoil(tm) (SU2-80) +25da Netatmo + 0001 Weather Station +25e3 Lumigon +25f0 ShanWan + c131 Gioteck PS3 2.4G Wireless Controller +25fb Pentax Ricoh Imaging Co., Ltd + 0102 K-5 +2604 Tenda + 0012 U12 +2625 MilDef AB +2626 Aruba Networks + ea60 UART Bridge Controller [cp210x] +262a SAVITECH Corp. + 100e SA9027 Audio Streaming Controller + 10e0 SA9023 Audio Streaming Controller + 9020 SA9020 audio controller + 9023 SA9023 audio controller + 9027 SA9027 audio controller + 9226 SA9226 192KHz audio controller + 9227 SA9227 384KHz audio controller + 9228 SA9228 384KHz/DSD audio controller 2632 TwinMOS 3209 7-in-1 Card Reader +2639 Xsens + 0001 MTi-10 IMU + 0002 MTi-20 VRU + 0003 MTi-30 AHRS + 0011 MTi-100 IMU + 0012 MTi-200 VRU + 0013 MTi-300 AHRS + 0017 MTi-G 7xx GNSS/INS + 0100 Body Pack + 0101 Awinda Station + 0102 Awinda Dongle + 0103 Sync Station + 0200 MTw + 0300 Motion Tracker Development Board + 0301 MTi Converter + d00d Wireless Receiver +264a Thermaltake + 1004 Ventus 2650 Electronics For Imaging, Inc. [hex] + 1311 eBeam Classic [Luidia] 2659 Sundtek 1101 TNT DVB-T/DAB/DAB+/FM 1201 FM Transmitter/Receiver @@ -16157,7 +21676,119 @@ 1211 MediaTV Pro III (US) 1212 MediaTV Pro III MiniPCIe (EU) 1213 MediaTV Pro III MiniPCIe (US) +2662 Moog Music Inc. +266e Silicon Integrated Systems +2672 GoPro + 0004 Hero 3 + 0006 HERO 3+ Silver Edition + 0007 HERO 3+ Black + 000e HERO4 Black + 0011 Hero 3+ Black +2676 Basler AG + ba02 ace + ba03 ba03 dart Vision Caera + ba04 ba04 pulse Vision Camera + ba05 Vision Camera + ba06 Vision Camera + ba07 Vision Camera + ba08 Vision Camera + ba09 Vision Camera + ba0a Vision Camera + ba0b Vision Camera + ba0c Vision Camera + ba0d Vision Camera + ba0e Vision Camera + ba0f Vision Camera +2685 Cardo Peripheral Systems LTD + 0900 [Packtalk Bold Bluetooth Motorcycle Intercom] +2687 Fitbit Inc. + fb01 Base Station +2689 StepOver International GmbH + 0601 naturaSign Pad POS + 0901 naturaSign Pad Light + 0ce1 Pad Vivid US + 0cf1 Pad Biometric US 5.0 + 0d01 duraSign Pad US 10.0 + 0df1 duraSign Pad Biometric US 10.0 +268b Dimension Engineering + 0101 DELink 2 + 0201 Sabertooth 2x32 + 0405 Evolv DNA 200 + 0406 Evolv DNA 200 + 0407 Evolv DNA 200 + 0408 Evolv DNA 75 + 0409 Evolv DNA 250 + 0412 Evolv DNA 60 + 0413 Evolv DNA 200 + 0414 Evolv DNA 250 + 0415 Evolv DNA 75 + 0416 Evolv DNA 60 + 0417 Evolv DNA Go + 0419 Evolv DNA 250 Color + 0423 Evolv DNA 200 + 0424 Evolv DNA 250 + 0425 Evolv DNA 75 + 0426 Evolv DNA 60 + 8405 Evolv DNA 200 (recovery mode) + 8406 Evolv DNA 200 (recovery mode) + 8407 Evolv DNA 200 (recovery mode) + 8408 Evolv DNA 75 (recovery mode) + 8409 Evolv DNA 250 (recovery mode) + 8412 Evolv DNA 60 (recovery mode) + 8413 Evolv DNA 200 (recovery mode) + 8414 Evolv DNA 250 (recovery mode) + 8415 Evolv DNA 75 (recovery mode) + 8416 Evolv DNA 60 (recovery mode) + 8423 Evolv DNA 200 (recovery mode) + 8424 Evolv DNA 250 (recovery mode) + 8425 Evolv DNA 75 (recovery mode) + 8426 Evolv DNA 60 (recovery mode) +26a9 Research Industrial Systems Engineering + 0001 Payment Terminal v1.0 +26aa Yaesu Musen + 0001 FT-1D + 000e FTA-550 + 000f FTA-750 +26b5 Electrocompaniet + 0002 ECD 2 + 0003 ECD 2 (Audio Class 1) + 0004 PI 2D + 0005 PI 2D (Audio Class 1) + 0006 ECI 6 + 0007 ECI 6 (Audio Class 1) + 0020 ECI 80 +26bd Integral Memory + 9917 Fusion Flash Drive +26e2 Ingenieurbuero Dietzsch und Thiele, PartG +26f2 Micromega + 0200 MyDac +2707 Bardac Corporation + 0005 drive.web +270d Rosand Technologies + 1001 R-Idge Bootloader + 1002 R-Idge Router +2717 Xiaomi Inc. + 0011 100Mbps Network Card Adapter + 0360 Mi3W + 0368 Mi4 LTE + 3801 Mi ANC & Type-C In-Ear Earphones + 4106 MediaTek MT7601U [MI WiFi] + ff08 Redmi Note 3 (ADB Interface) + ff10 Mi/Redmi series (PTP) + ff18 Mi/Redmi series (PTP + ADB) + ff40 Mi/Redmi series (MTP) + ff48 Mi/Redmi series (MTP + ADB) + ff60 redmi prime 2 + ff68 Mi-4c + ff80 Mi/Redmi series (RNDIS) + ff88 Mi/Redmi series (RNDIS + ADB) +272a StarLeaf Ltd. +272c Signum Systems + 7d13 I-jet 2730 Citizen + 0fff CT-S2000/4000/310/CLP-521/621/631/CL-S700 Series + 1004 PPU-700 + 2002 CT-S2000 Thermal Printer (Parallel mode) 200f CT-S310 Label printer 2735 DigitalWay 0003 MPIO HS100 @@ -16193,6 +21824,21 @@ 1042 MPIO FY670 1043 HCT HMD-180A 1044 HCT HMD-180A +273f Hughski Limited + 1000 ColorHug bootloader + 1001 ColorHug + 1002 ColorHug+ + 1003 ColorHug+ Bootloader + 1004 ColorHug2 + 1005 ColorHug2 bootloader +2756 Victor Hasselblad AB + 0002 X1D Camera +2759 Philip Morris Products S.A. + 0003 IQOS Pocket Charger 2.4 +2765 Firstbeat Technologies, Ltd. + 0004 Bodyguard 2 +2766 LifeScan + 0000 OneTouch Verio 2770 NHJ, Ltd 0a01 ScanJet 4600 series 905c Che-Ez Snap SNAP-U/Digigr8/Soundstar TDC-35 @@ -16205,28 +21851,576 @@ 915d Cyberpix S-210S / Little Tikes My Real Digital Camera 930b CCD Webcam(PC370R) 930c CCD Webcam(PC370R) +27a8 Square, Inc. + a120 Contactless + Chip Reader +27b8 ThingM + 01ed blink(1) +27bd Codethink Ltd. + 0001 Slab Node Manager + 0002 Slab Node Manager JTAG +27c0 Cadwell Laboratories, Inc. + 0818 Paperlike HD-FT +27c6 Shenzhen Goodix Technology Co.,Ltd. + 5117 Fingerprint Reader + 5201 Fingerprint Reader + 5301 Fingerprint Reader + 530c Fingerprint Reader + 532d Fingerprint + 5381 Fingerprint Reader + 5385 Fingerprint Reader + 538c Fingerprint Reader + 5395 Fingerprint Reader + 5584 Fingerprint Reader + 55b4 Fingerprint Reader + 5740 Fingerprint Reader +27d4 Blackstar Amplification Limited +27dd Mindeo + 0002 Mindeo Virtual COM Port +27f2 Softnautics LLP +2803 StarLine LLC. + 0001 Controller Area Network car alarm module [SLCAN-2] +2806 SIMPASS + 0001 N-PASS X1 +2817 Signal Hound, Inc. + 0002 BB60C Spectrum Analyzer + 0004 SM200A Spectrum Analyzer +2818 Codex Digital Limited + 0001 Transfer Drive Dock 2821 ASUSTek Computer Inc. 0161 WL-161 802.11b Wireless Adapter [SiS 162U] 160f WL-160g 802.11g Wireless Adapter [Envara WiND512] 3300 WL-140 / Hawking HWU36D 802.11b Wireless Adapter [Intersil PRISM 3] +2822 REFLEXdigital +2833 Oculus VR, Inc. + 0001 Rift Developer Kit 1 + 0021 Rift DK2 + 0031 Rift CV1 + 0101 Latency Tester + 0137 Quest Headset + 0201 Camera DK2 + 0211 Rift CV1 Sensor + 0330 Rift CV1 Audio + 1031 Rift CV1 + 2021 Rift DK2 + 2031 Rift CV1 + 3031 Rift CV1 +2836 OUYA +286b STANEO SAS + 0003 D6BB/D9 seismic digitizer +2886 Seeed Technology Co., Ltd. + 0002 Seeeduino Lite +2890 Teknic, Inc + 0213 ClearPath 4-axis Comm Hub 2899 Toptronic Industrial Co., Ltd 012c Camera Device +289b Dracal/Raphnet technologies + 0001 Gamecube/N64 controller v2.2 + 0002 2nes2snes + 0003 4nes4snes + 0004 Gamecube/N64 controller v2.3 + 0005 Saturn (Joystick mode) + 0006 Saturn (Mouse mode) + 0007 Famicom controller + 0008 Dreamcast (Joystick mode) + 0009 Dreamcast (Mouse mode) + 000a Dreamcast (Keyboard mode) + 000b Gamecube/N64 controller v2.9 (Keyboard mode) + 000c Gamecube/N64 controller v2.9 (Joystick mode) + 000e VirtualBoy controller + 0010 WUSBMote v1.2 (Joystick mode) + 0011 WUSBMote v1.2 (Mouse mode) + 0012 WUSBMote v1.2.1 (Joystick mode) + 0013 WUSBMote v1.2.1 (Mouse mode) + 0014 WUSBMote v1.3 (Joystick mode) + 0015 WUSBMote v1.3 (Mouse mode) + 0016 WUSBMote v1.3 (I2C interface mode) + 0017 Gamecube/N64 controller v3.0 + 0018 Atari Jaguar controller + 0019 MultiDB9joy v3 + 001a MultiDB9joy v3 (multitap mode) + 0100 Dual-relay board + 0500 Energy meter + 0502 Precision barometer +289d Seek Thermal, Inc. + 0010 PIR206 Thermal Camera [Seek Compact] +28bd XP-Pen + 0920 Star G960 Graphic Tablet +28c7 Ultimaker B.V. + 0001 3D printer serial interface +28d4 Devialet + 0008 120/200/250/400/800/D-Premier +28de Valve Software + 1102 Wired Controller + 1142 Wireless Steam Controller + 2000 Lighthouse FPGA RX + 2012 Virtual Reality Controller [VRC] + 2101 Watchman Dongle + 2500 Lighthouse Base Station +28e0 PT. Prasimax Inovasi Teknologi + 1001 BTS Monitoring Config for Prototype + 5740 TRUMON TS-107 + 5741 TRUMON TS-108 +28e9 GDMicroelectronics + 0189 GD32 DFU Bootloader (Longan Nano) +28f3 Clover Network, Inc. + 2000 Mobile Wi-Fi (C200) + 3000 Mini + 4000 Flex +28f9 Profitap HQ BV + 0001 Profishark 1G Black + 0003 Profishark 1G+ + 0004 Profishark 1G + 0005 Profishark 10G + 0006 Profishark 100M +290c R. Hamilton & Co. Ltd. + 4b4d Mercury iPod Dock +2912 Audioengine + 20c8 D1 24-bit DAC + 30c8 D1 24-bit DAC +2916 Yota Devices +2931 Jolla Oy + 0a01 Jolla Phone MTP + 0a02 Jolla Phone Developer + 0a05 Jolla PC connection + 0a07 Phone MTP + 0afe Jolla charging only +2939 Zaber Technologies Inc. + 4959 A-MCB2 + 495a X-MCB1 + 495b X-MCB2 + 49b1 X-MCB1 + 49b2 X-MCB2 + 49c1 X-MCC1 + 49c2 X-MCC2 + 49c3 X-MCC3 + 49c4 X-MCC4 +2957 Obsidian Research Corporation + 0001 Management Console +2961 Miselu + 0001 C.24 keyboard +296b Xacti Corporation + 3917 CX-WE100 Camera +2972 FiiO Electronics Technology + 0007 X3 2nd gen audio player / DAC +298d Next Biometrics + 2020 NB-2020-U Fingerprint Reader +29bd Silicon Works + 4101 Multi-touch Device +29c1 Taztag + 1105 M17-G903-1 [Tazpad] + 1107 M17-G903-A [Tazpad] (CCID) +29c2 Lewitt GmbH + 0001 DGT 650 + 0003 DGT 450 + 0009 DGT 260 + 0011 Stream 4x5 +29c3 Noviga +29e2 Huatune Technology (Shanghai) Co., Ltd. +29e7 Brunel University +29e8 4Links Limited +29ea Kinesis Corporation + 0102 Advantage2 Keyboard +29f1 Canaan Creative Co., Ltd + 33f1 Avalon nano 1.0 + 33f2 Avalon USB2IIC Converter + 33f3 Avalon nano 2.0 + 40f1 Avalon4 mini +2a03 dog hunter AG + 0001 Linino ONE (bootloader) + 0036 Arduino Leonardo (bootloader) + 0037 Arduino Micro (bootloader) + 0038 Arduino Robot Control (bootloader) + 0039 Arduino Robot Motor (bootloader) + 003a Arduino Micro ADK rev3 (bootloader) + 003b Arduino usb2serial + 003c Arduino Explora (bootloader) + 003d Arduino Due (usb2serial) + 003e Arduino Due + 0041 Arduino Yun (bootloader) + 0042 Arduino Mega 2560 Rev3 + 0043 Arduino Uno Rev3 + 004d Arduino Zero Pro (bootloader) + 8001 Linino ONE (CDC ACM) + 8036 Arduino Leonardo (CDC ACM) + 8037 Arduino Micro (CDC ACM) + 8038 Arduino Robot Control (CDC ACM) + 8039 Arduino Robot Motor (CDC ACM) + 803a Arduino Micro ADK rev3 (CDC ACM) + 803c Arduino Explora (CDC ACM) + 8041 Arduino Yun (CDC ACM) + 804d Arduino Zero Pro (CDC ACM) +2a0e Shenzhen DreamSource Technology Co., Ltd. +2a13 Grabba International + 0000 S-Series data capture device +2a19 Numato Systems Pvt. Ltd + 1002 Mimas V2 Spartan6 FPGA Development Board + 5440 TimVideos' HDMI2USB Opsis (FX2) - Unconfigured device + 5441 TimVideos' HDMI2USB Opsis (FX2) - Firmware load/upgrade + 5442 TimVideos' HDMI2USB Opsis (FX2) - HDMI/DVI Capture Device +2a1d Oxford Nanopore Technologies, Ltd + 0000 MinION + 0001 MinION + 0010 VolTRAX + 0011 VolTRAX + 0020 GridION + 0021 GridION +2a37 RTD Embedded Technologies, Inc. + 5110 UPS35110/UPS25110 +2a39 RME + 3fb0 Babyface Pro (Class Compliant Mode) + 3fc0 Babyface Pro + 3fc1 Fireface UFX+ + 3fc2 Fireface UFX+ + 3fd1 Fireface UFX+ +2a3c Trinamic Motion Control GmbH & Co KG + 0100 Stepper Device + 0200 BLDC/PMSM Device + 0300 Motor Control Device + 0400 Motor Control Device + 0500 PANdrive(TM) + 0600 motionCookie(TM) + 0700 Evaluation Device + 0800 Interface Device + 0900 Generic Device +2a45 Meizu Corp. + 0001 MX Phone (BICR) + 0c02 MX Phone (MTP & ADB) + 0c03 MX Phone (BICR & ADB) + 2008 MX Phone (MTP) + 200a MX Phone (MTP & ACM & ADB) + 200b MX Phone (PTP) + 200c MX Phone (PTP & ADB) + 2012 MX Phone (MTP & ACM) +2a47 Mundo Reader, S.L. + 0c02 bq Aquaris E4.5 + 201d Tablet Edison 3 + 903a bq Aquaris U +2a4b EMULEX Corporation + 0400 Pilot4 Integrated Hub +2a62 Flymaster Avionics + b301 LiveSD + b302 NavSD +2a6e Bare Conductive + 0003 Touch Board + 8003 Touch Board +2a70 OnePlus Technology (Shenzhen) Co., Ltd. + 4ee7 ONEPLUS A3010 [OnePlus 3T] / A5010 [OnePlus 5T] / A6003 [OnePlus 6] (Charging + USB debugging modes) + 904d A3000 phone (PTP mode) [3T] + 904e A3000 phone (PTP mode, with debug) [3T] +2a88 DFU Technology Ltd + ffff DFU +2a8d Keysight Technologies, Inc. +2ab6 T+A elektroakustik GmbH & Co KG, Germany + 0001 PDP3000HV DAC + 0002 MP1000E, MP2000R, MP2500R, MP3100HV + 0003 TA HD AUDIO V2 +2ac7 Ultrahaptics Ltd. + 0101 Evaluation Kit [Dragonfly] + 0102 UHDK5 + 0104 Touchbase + 0110 STRATOS Explore + 0111 STRATOS Explore DFU + 0112 STRATOS Inspire + 0113 STRATOS Inspire DFU + ffff DFU +2ad1 Picotronic GmbH + 7ab8 Turningtable +2ae5 Fairphone B.V. + 9015 2 (Mass storage & ADB) + 9024 2 (RNDIS & ADB) + 9039 2 (MTP & ADB) + 904d 2 (PTP) + 904e 2 (PTP & ADB) + 90de 2 (Charging) + f000 2 (Mass storage) + f003 2 (MTP) + f005 2 (tethering) + f00e 2 (RNDIS) +2aec Ambiq Micro, Inc. + 6011 Converter +2af4 ROLI Ltd. + 0100 Seaboard GRAND + 0200 Seaboard RISE + 0300 BlueWing Proto + 0400 VOICE + 0500 BLOCKS +2b03 STEREOLABS + f580 ZED camera + f582 ZED camera + f680 ZED-M camera + f681 ZED-M HID Interface + f682 ZED-M camera + f683 ZED-M HID Interface + f684 ZED-M camera +2b0e LeEco + 171b Le2 + 171e Le2 in USB tethering mode + 1830 Le1 Pro + 1844 Le Max2 + 2b0e LeEco + 6108 Lex720 [LePro 3] in connection sharing usb + 610b Lex720 [LePro 3] in Camera mode + 610c Lex720 [LePro 3] + 610d Lex720 [LePro 3] in debug +2b23 Red Hat, Inc. + cafe UsbDk (USB Development Kit) +2b24 KeepKey LLC + 0001 Bitcoin Wallet [KeepKey] + 0002 Bitcoin Wallet +2b3e NewAE Technology Inc. + ace2 CW1173 [ChipWhisperer-Lite] +2b4c ZUK + 1004 Z1 MTP +2bc5 Orbbec 3D Technology International, Inc + 0401 Astra + 0403 Astra Pro + 0407 Astra Mini S +2bcc InoTec GmbH Organisationssysteme +2bd6 Coroware, Inc. + 4201 RS-485 Controller and Interface [Cypress Semiconductor] +2bd8 ROPEX Industrie-Elektronik GmbH 2c02 Planex Communications 14ea GW-US11H WLAN 2c1a Dolphin Peripherals 0000 Wireless Optical Mouse +2c23 Supermicro Computer Incorporated + 1b83 NIC +2c4e Mercucys INC + 0100 MW300UM RTL8192EU wifi +2c4f Canon Electronic Business Machines Co., Ltd. + 3003 PR Wireless Presenter +2c55 Magic Leap, Inc. + a100 ML1 Lightpack (MLDB) + b100 ML1 Lightpack (fastboot) + c001 ML1 Control (COM) + c002 ML1 Control (Bootloader) +2c7c Quectel Wireless Solutions Co., Ltd. + 0121 EC21 LTE modem + 0125 EC25 LTE modem + 0191 EG91 LTE modem + 0195 EG95 LTE modem + 0296 BG96 CAT-M1/NB-IoT modem + 0306 EG06/EP06/EM06 LTE-A modem + 0435 AG35 LTE modem +2c97 Ledger + 0000 Blue + 0001 Nano S + 0004 Nano X +2c99 Prusa + 0001 i3 MK2S +2c9c Vayyar Imaging Ltd. + 1000 Walabot Makers Series + 1020 Walabot DIY + 1022 Walabot DIY Plus + 1030 Walabot Home (vHC) + 9100 VNAKit +2c9d Nod Inc + 90a0 Goa + bac5 Backspin +2ca3 DJI Technology Co., Ltd. + 0008 Mavic Mini MR1SD25 Remote controller +2cb7 Fibocom + 0210 L830-EB-00 LTE WWAN Modem +2cc0 Hangzhou Zero Zero Infinity Technology Co., Ltd. +2cc2 Lautsprecher Teufel GmbH +2ccf Hypersecu + 0880 HyperFIDO +2cd9 Cambrionix Ltd + 0804 PowerSync4 USBPD Hub +2cdc Sea & Sun Technology GmbH + f232 CTD48Mc CTD Probe +2ce5 InX8 Inc [AKiTiO] + 0014 Mass Storage [NT2 U31C] +2cf0 Nuand LLC + 5246 bladeRF + 5250 bladeRF 2.0 micro +2d1f Wacom Taiwan Information Co. Ltd. +2d25 Kronegger GmbH. +2d2d proxmark.org + 504d Proxmark3 +2d37 Zhuhai Poskey Technology Co.,Ltd +2d6b NetUP Inc. + 7777 Joker TV universal DTV receiver +2d81 Evollve Inc. + 4f01 Ozobot Evo +2d84 Zhuhai Poskey Technology Co.,Ltd + b806 DT-108B Thermal Label Printer +2dc8 8BitDo + 5006 M30 Bluetooth gamepad + 5750 Bootloader + 6000 SF30 Pro gamepad + 6001 SN30/SF30 Pro gamepad + ab11 F30 gamepad + ab12 N30 gamepad + ab20 SN30/SF30 gamepad + ab21 SF30 gamepad +2dcf Dialog Semiconductor + c951 Audio Class 1.0 Devices + c952 Audio Class 2.0 Devices +2def Kirale Technologies + 0000 KiNOS Boot DFU + 0102 KTWM102 Module +2df2 LIPS Corporation + 0213 LIPSedge DL 3D ToF Camera + 0215 LIPSedge DL RGB Camera + 2102 LIPSedge 5 Megapixel RGB Camera +2e04 HMD Global + 0001 Nokia 3310 3G + 0002 Nokia 3310 3G + 0a14 Nokia 3310 3G + c008 Tethering Network Interface + c009 Nokia 1 (bootloader) + c025 Nokia 8 (MTP mode) + c026 Nokia Smartphone + c029 Nokia 8 (PTP mode) + c031 Nokia 1 (PTP) + c03f Nokia 8 (MIDI mode) +2e0e Hatteland Display AS + 0001 CAN Gateway +2e24 Hyperkin + 0652 Duke Xbox One controller + 1688 X91 Xbox One controller +2e3b uSens Inc. +2e57 MEGWARE Computer Vertrieb und Service GmbH + 454d SlideSX EnergyMeter + 454e SlideSX EnergyMeter DFU + 5cba SlideSX / ClustSafe Bus Adapter +2e69 Swift Navigation + 1001 Piksi Multi +2e95 SCUF Gaming + 7725 Controller +2f76 KeyXentic Inc. + 0905 KX905 Smart Terminal + 0906 KX906 Smart Card Reader + 1906 KX906 Smart Token (Mass Storage) +2fad Definium Technologies +2fb0 Infocrypt 2fb2 Fujitsu, Ltd +2fc0 Sensidyne, LP + 0001 Project Archer +2fc6 Comtrue Inc. + 6012 UAC2 Device GB +2fe0 Xaptum, Inc. + 8b01 XAP-RC-001 ENF Router Card + 8b02 XAP-RW-001 ENF Router Card with WiFi + 8bde XAP-EA-002 ENF Access Card + 8bee XAP-EA-003 ENF Access Card +2fe3 NordicSemiconductor +2fe7 ELGIN S.A. + 0001 SMART S@T +2feb Beijing Veikk E-Commerce Co., Ltd. + 0004 Veikk A15 Pen Tablet +2ff4 Quixant Plc +3016 Boundary Devices, LLC + 0001 Nitrogen Bootloader +3036 Control iD + 0001 Print iD + 0002 iDBio +3037 Beijing Chushifengmang Technology Development Co.,Ltd. +3057 Kingsis Corporation + 0002 ZOWIE Gaming mouse +308f Input Club + 0000 Infinity 60% Bootloader + 0001 Infinity 60% - Standard + 0002 Infinity 60% - Hacker + 0003 Infinity Ergodox Bootloader + 0004 Infinity Ergodox + 0005 WhiteFox Bootloader + 0006 WhiteFox - Vanilla + 0007 WhiteFox - ISO + 0008 WhiteFox - Aria + 0009 WhiteFox - Winkeyless + 000a WhiteFox - True Fox + 000b WhiteFox - Jack of All Trades + 000c Infinity 60% LED Bootloader + 000d Infinity 60% LED - Standard + 000e Infinity 60% LED - Hacker + 000f Infinity 60% LED - Alphabet + 0010 K-Type Bootloader + 0011 K-Type + 0012 Kira Bootloader + 0013 Kira + 0014 Gemini Dawn/Dusk Bootloader + 0015 Gemini Dawn/Dusk + 0016 Re:Type Bootloader + 0017 Re:Type + 0018 Re:Type USB Hub + 0019 WhiteFox (SAM4S) Bootloader + 001a WhiteFox (SAM4S) - Vanilla + 001b WhiteFox (SAM4S) - ISO + 001c WhiteFox (SAM4S) - Aria + 001d WhiteFox (SAM4S) - Winkeyless + 001e WhiteFox (SAM4S) - True Fox + 001f WhiteFox (SAM4S) - Jack of All Trades +30a4 Blues Wireless + 0001 Notecard +30c2 UNPARALLEL Innovation, Lda + 1388 SPL Meter +30c9 Luxvisions Innotech Limited +30ee Fujitsu Connected Technologies Limited + 1001 F-01L +30f2 Varex Imaging +3111 Hiperscan GmbH + 0000 SGS-NT Microspectrometer +3112 Meteca SA + 0001 MBC-WB01 (CDC-ACM) + 0002 MBC-WB01 (Bootloader) + 0003 ABC (CDC ACM) + 0004 ABC (Bootloader) 3125 Eagletron 0001 TrackerPod Camera Stand +3136 Navini Networks +3145 SafeLogic Inc. +3147 Tanvas, Inc. +316c SigmaSense, LLC +316d Purism, SPC + 4c4b Librem Key +316e SPECINFOSYSTEMS + 0001 DIAMOND token +3171 8086 Consultancy + 0011 ClusterCTRL DA + 0012 ClusterCTRL pHAT + 0013 ClusterCTRL A+6 + 0014 ClusterCTRL Triple + 0015 ClusterCTRL Single 3176 Whanam Electronics Co., Ltd +3195 Link Instruments + f190 MSO-19 + f280 MSO-28 + f281 MSO-28 +31c9 BeiJing LanXum Computer Technology Co., Ltd. + 1001 Printer + 1301 Black and White Laser Printer + 1501 LaserPrint GA50 series +3200 Alcatel-Lucent Enterprise + 2100 ALE 8058s + 2101 ALE 8068s + 2102 8078s +3219 Smak Tecnologia e Automacao LTDA + 0044 SKO44 Optical Keyboard +321c Premio, Inc. +324c CUPRIS Ltd. +326d Agile Display Solutions Co., Ltd + 0001 Avocor USB Camera 3275 VidzMedia Pte Ltd 4fb1 MonsterTV P2H +3293 Unhuman Inc. +32b3 TEXA + d1a6 TXT Multihub + d1a7 TXT Multihub +3333 InLine + 3333 2 port KVM switch model 60652K 3334 AEI 1701 Fast Ethernet 3340 Yakumo 043a Mio A701 DigiWalker PPCPhone 0e3a Pocket PC 300 GPS SL / Typhoon MyGuide 3500 a0a3 deltaX 5 BT (D) PDA + ffff Mio DigiWalker Sync +3344 Leaguer Microelectronics (LME) + 3744 OEM PC Remote +348f ISY + 2322 Wireless Presenter 3504 Micro Star f110 Security Key 3538 Power Quotient International Co., Ltd @@ -16235,11 +22429,17 @@ 0022 Hi-Speed Mass Storage Device 0042 Cool Drive U339 Flash Disk 0054 Flash Drive (2GB) + 0901 Traveling Disk U273 (4GB) 3579 DIVA 6901 Media Reader +357d Sharkoon + 7788 JMicron JMS567 ATA/ATAPI Bridge 3636 InVibro +3767 Fanatec + 0101 Speedster 3 Forceshock Wheel 3838 WEM 0001 5-in-1 Card Reader + 1031 2.4G Wireless Mouse 3923 National Instruments Corp. 12c0 DAQPad-6020E 12d0 DAQPad-6507 @@ -16257,11 +22457,29 @@ 1f50 DAQPad-6036E 2f80 DAQPad-6052E 2f90 DAQPad-6052E - 702b GPIB-USB-B + 702a GPIB-USB-B + 702b GPIB-USB-B Initialization 703c USB-485 RS485 Cable 709b GPIB-USB-HS + 7166 USB-8451 + 716e USB-8451 Firmware Loader + 717a USB-6008 + 717b USB-6009 + 71d6 USB-6008 OEM + 71d7 USB-6009 OEM + 71d8 USB-6009 OEM 7254 NI MIO (data acquisition card) firmware updater 729e USB-6251 (OEM) data acquisition card + 7346 USB-6229 + 755b myDAQ + 76af USB-6000 + 76b0 USB-6000 OEM + 76bf USB-6001 + 76c0 USB-6001 OEM + 76c4 USB-6002 + 76c5 USB-6002 OEM + 76c6 USB-6003 + 76c7 USB-6003 OEM 40bb I-O Data 0a09 USB2.0-SCSI Bridge USB2-SC 4101 i-rocks @@ -16299,19 +22517,26 @@ 1005 Multimedia Pro Keyboard Hub 2001 Keyboard HID Support 2002 SK-8125 Keyboard - 2003 Keyboard + 2003 Keyboard SK-8115 2005 RT7D50 Keyboard 2010 Keyboard 2011 Multimedia Pro Keyboard 2100 SK-3106 Keyboard - 2101 SmartCard Reader Keyboard + 2101 SK-3205 SmartCard Reader Keyboard 2105 Model L100 Keyboard - 2106 Dell QuietKey Keyboard + 2106 QuietKey Keyboard + 2107 KB212-B Quiet Key Keyboard + 2113 KB216 Wired Keyboard + 2134 Hub of E-Port Replicator + 21d7 Dell Wireless 5560 HSPA+ Mobile Broadband Modem 2500 DRAC4 Remote Access Card + 2501 Keyboard and mouse dongle 2513 internal USB Hub of E-Port Replicator 3010 Optical Wheel Mouse 3012 Optical Wheel Mouse 3016 Optical 5-Button Wheel Mouse + 301a Dell MS116 Optical Mouse + 301b Universal Bluetooth Receiver 3200 Mouse 4001 Axim X5 4002 Axim X3 @@ -16338,6 +22563,7 @@ 5118 AIO 810 5124 Laser MFP 1815 5128 Photo AIO 928 + 5133 968 AIO Printer 5200 Laser Printer 5202 Printing Support 5203 Printing Support @@ -16346,13 +22572,18 @@ 5220 Laser MFP 1600n 5225 Printing Support 5226 Printing Support + 5228 Laser Printer 1720dn 5300 Laser Printer 5400 Laser Printer 5401 Laser Printer + 5404 1250c Color Printer 5513 WLA3310 Wireless Adapter [Intersil ISL3887] + 5534 Hub of E-Port Replicator 5601 Laser Printer 3100cn 5602 Laser Printer 3000cn + 5607 MFP Color Laser Printer 3115cn 5631 Laser Printer 5100cn + 564a C1765 series Multifunction Color LaserPrinter, Scanner & Copier 5905 Printing Support 8000 BC02 Bluetooth Adapter 8010 TrueMobile Bluetooth Module in @@ -16387,6 +22618,7 @@ 8138 Wireless 5520 Voda I Mobile Broadband (3G HSDPA) Minicard EAP-SIM Port 8140 Wireless 360 Bluetooth 8142 Mobile 360 in DFU + 8143 Broadcom BCM20702A0 Bluetooth 8147 F3507g Mobile Broadband Module 8156 Wireless 370 Bluetooth Mini-card 8157 Integrated Keyboard @@ -16401,24 +22633,41 @@ 8185 Gobi 2000 Wireless Modem (QDL mode) 8186 Gobi 2000 Wireless Modem 8187 DW375 Bluetooth Module + 818e DW5560 miniPCIe HSPA+ Mobile Broadband Modem + 8197 BCM20702A0 Bluetooth Module + 81a0 Wireless 5808 Mobile Broadband (Sierra Wireless MC7355 Mini PCIE, 4G UMTS,HSDPA,HSPA+,LTE,1xRTT,EVDO Rev A,GSM,GPRS) + 81a3 Hub of E-Port Replicator + 81a8 Wireless 5808 Mobile Broadband (Sierra Wireless Mini PCIE, 4G UMTS,HSDPA,HSPA+,LTE,1xRTT,EVDO Rev A,GSM,GPRS) 8501 Bluetooth Adapter + 9001 ATA Bridge + 9009 Portable Device 9500 USB CP210x UART Bridge Controller [DW700] a001 Hub a005 Internal 2.0 Hub + a101 Internal Dual SD Card module + a102 iDRAC Virtual NIC + a503 AC511 Sound Bar a700 Hub (in 1905FP LCD Monitor) + b007 Streak 5 Android Tablet 4146 USBest Technology 9281 Iomega Micro Mini 128MB Flash Drive ba01 Intuix Flash Drive +4168 Targus + 1010 Wireless Compact Laser Mouse 4242 USB Design by Example 4201 Buttons and Lights HID device 4220 Echo 1 Camera +4255 GoPro + 1000 9FF2 [Digital Photo Display] + 2000 HD2-14 [Hero 2 Camera] 4317 Broadcom Corp. 0700 U.S. Robotics USR5426 802.11g Adapter 0701 U.S. Robotics USR5425 Wireless MAXg Adapter 0711 Belkin F5D7051 v3000 802.11g 0720 Dynex DX-BUSB + 0721 Dynex DX-EBUSB 4348 WinChipHead - 5523 USB->RS 232 adapter with Prolifec PL 2303 chipset + 5523 USB->RS 232 adapter with Prolific PL 2303 chipset 5537 13.56Mhz RFID Card Reader and Writer 5584 CH34x printer adapter cable 4572 Shuttle, Inc. @@ -16427,6 +22676,7 @@ 1026 Crystal Bar Flash Drive 4670 EMS Production 9394 Game Cube USB Memory Adaptor 64M +46f4 QEMU 4752 Miditech 0011 Midistart-2 4757 GW Instek @@ -16437,8 +22687,18 @@ 4855 Memorex 7288 Ultra Traveldrive 160G 2.5" HDD 4971 SimpleTech + 1004 Hitachi LifeStudio Desk (3.5" HDD) [w/o flash key] + 1013 Touro Desk Pro + 1015 Touro Desk 3.0 + 8001 G-Tech G-DRIVE Mobile cb01 SP-U25/120G + cd15 Simple Drive Mini (2.5" HDD) + ce07 SimpleDrive (3.5" HDD) + ce12 FV-U35 ce17 1TB SimpleDrive II USB External Hard Drive + ce18 (re)Drive + ce21 JMicron JM20329 SATA Bridge [eg. HITACHI SimpleDrive mini] + ce22 Hitachi SimpleTough (3.5" HDD) 4d46 Musical Fidelity 0001 V-Link 0002 V-DAC II @@ -16447,17 +22707,26 @@ 0bb9 Grandtec USB1.1 DVB-T (warm) 0fa0 Grandtec USB1.1 DVB-T (cold) 0fa1 Grandtec USB1.1 DVB-T (warm) -5041 Linksys (?) - 2234 WUSB54G v1 802.11g Adapter [Intersil ISL3886] - 2235 WUSB54GP v1 802.11g Adapter [Intersil ISL3886] 50c2 Averatec (?) 4013 WLAN Adapter +5131 MSR + 2007 MSR-101U Mini HID magnetic card reader 5173 Sweex 1809 ZD1211 5219 I-Tetra 1001 Cetus CDC Device +5332 Clearly Superior Technologies, Inc. + 1300 CST2545-5W (L-Trac) 5345 Owon 1234 PDS6062T Oscilloscope +534c SatoshiLabs + 0001 Bitcoin Wallet [TREZOR] + 0002 Bitcoin Wallet [TREZOR v2] +534d MacroSilicon + 0021 MS210x Video Grabber [EasierCAP] + 6021 VGA Display Adapter +5354 Meyer Instruments (MIS) + 0017 PAXcam2 544d Transmeta Corp. 5543 UC-Logic Technology Corp. 0002 SuperPen WP3325U Tablet @@ -16466,7 +22735,10 @@ 0005 Tablet WP8060U 0041 Genius PenSketch 6x8 Tablet 0042 Tablet PF1209 + 004a XP-Pen Artist 10S tablet + 004d Tablet Monitor MSP19U 0064 Aiptek HyperPen 10000U + 3031 Graphics tablet [DrawImage G3, Ugee G3] 5555 Epiphan Systems Inc. 1110 VGA2USB 1120 KVM2USB @@ -16477,6 +22749,10 @@ 3344 KVM2USB LR 3411 DVI2USB Solo 3422 DVI2USB Duo + 3500 DVI2USB3 + 3501 DVI2USB3 Rev3 + 3510 DVI2USB3_ET + 3520 SDI2USB3 55aa OnSpec Electronic, Inc. 0015 Hard Drive 0102 SuperDisk @@ -16492,6 +22768,8 @@ b200 Compact Flash Reader b204 MMC/ SD Reader b207 Memory Stick Reader +5654 Gotview + ca42 MasterHD 3 5656 Uni-Trend Group Limited 0832 UT2000/UT3000 Digital Storage Oscilloscope 595a IRTOUCHSYSTEMS Co. Ltd. @@ -16500,47 +22778,131 @@ 0100 Orbicam 0101 USB2.0 Camera 0102 Crystal Eye Webcam + 0137 HP Webcam + 0141 BisonCam, NB Pro + 0149 HP Webcam-101 + 014c MSI Integrated Webcam 01a6 Lenovo Integrated Webcam 01a7 Lenovo Integrated Webcam 01a9 Lenovo Integrated Webcam 0200 OrbiCam + 0202 Fujitsu Webcam 0203 BisonCam NB Pro 1300 + 0205 Lenovo EasyCamera + 0217 Integrated Webcam 0241 BisonCam, NB Pro + 0268 SunplusIT INC. Integrated Camera + 026a Integrated Camera + 0292 Lenovo Integrated Webcam + 0294 Lenovo Integrated Webcam + 0295 Lenovo Integrated Webcam + 0299 Lenovo Integrated Webcam + 029c Lenovo EasyCamera + 02ac HP TrueVision HD Webcam 02d0 Lenovo Integrated Webcam [R5U877] + 02d2 ThinkPad Integrated Camera + 02d5 Integrated Camera + 03b3 Lenovo Integrated Webcam 03d0 Lenovo Integrated Webcam [R5U877] + 0400 BisonCam, NB Pro + 0535 Lenovo EasyCamera integrated webcam + 055a Lenovo Integrated Webcam + 0652 Lenovo EasyCamera + 0670 Lenovo EasyCamera + 0671 Lenovo EasyCamera + 0706 ThinkPad P50 Integrated Camera + 2113 SunplusIT Integrated Camera + a002 Lenovo EasyCamera Integrated Webcam +59e3 Nonolith Labs 5a57 Zinwell 0260 RT2570 0280 802.11a/b/g/n USB Wireless LAN Card 0282 802.11b/g/n USB Wireless LAN Card 0283 802.11b/g/n USB Wireless LAN Card 0284 802.11a/b/g/n USB Wireless LAN Card - 0290 ZW-N290 802.11n [Realtek RTL8192SU] + 0290 ZW-N290 802.11n [Realtek RTL8192U] 5257 Metronic 495257 wifi 802.11ng 6000 Beholder International Ltd. + 0001 Trident TVBOX Video Grabber dec0 TV Wander dec1 TV Voyage 601a Ingenic Semiconductor Ltd. 4740 XBurst Jz4740 boot mode + 4760 JZ4760 Boot Device +6022 Xektek + 0500 SuperPro Universal Device Programmer 6189 Sitecom - 182d USB 2.0 Ethernet + 182d LN-029 10/100 Ethernet Adapter 2068 USB to serial cable (v2) +6244 LightingSoft AG + 0101 Intelligent Usb Dmx Interface SIUDI5A + 0201 Intelligent Usb Dmx Interface SIUDI5C + 0300 Intelligent Usb Dmx Interface SIUDI6 Firmware download + 0301 Intelligent Usb Dmx Interface SIUDI6C + 0302 Intelligent Usb Dmx Interface SIUDI6A + 0303 Intelligent Usb Dmx Interface SIUDI6D + 0400 Touch Sensitive Intelligent Control Keypad STICK1A + 0401 Touch Sensitive Intelligent Control Keypad STICK1A + 0410 Intelligent Usb Dmx Interface SIUDI7 Firmware Download + 0411 Intelligent Usb Dmx Interface SIUDI7A + 0420 Intelligent Usb Dmx Interface SIUDI8A Firmware Download + 0421 Intelligent Usb Dmx Interface SIUDI8A + 0430 Intelligent Usb Dmx Interface SIUDI8C Firmware Download + 0431 Intelligent Usb Dmx Interface SIUDI8C + 0440 Intelligent Usb Dmx Interface SIUDI9A Firmware Download + 0441 Intelligent Usb Dmx Interface SIUDI9A + 0450 Intelligent Usb Dmx Interface SIUDI9C Firmware Download + 0451 Intelligent Usb Dmx Interface SIUDI9C + 0460 Touch Sensitive Intelligent Control Keypad STICK2 Firmware download + 0461 Touch Sensitive Intelligent Control Keypad STICK2 + 0470 Touch Sensitive Intelligent Control Keypad STICK1B Firmware download + 0471 Touch Sensitive Intelligent Control Keypad STICK1B + 0480 Touch Sensitive Intelligent Control Keypad STICK3 Firmware download + 0481 Touch Sensitive Intelligent Control Keypad STICK3 + 0490 Intelligent Usb Dmx Interface SIUDI9D Firmware Download + 0491 Intelligent Usb Dmx Interface SIUDI9D + 0500 Touch Sensitive Intelligent Control Keypad STICK2B Firmware download + 0501 Touch Sensitive Intelligent Control Keypad STICK2B + 0520 Touch Sensitive Intelligent Control Keypad (STICK2C Firmware download, 32/64bits + 0521 Touch Sensitive Intelligent Control Keypad (STICK2C, 32/64bits) + 0540 Sunlite Universal Smart Handy Interface (SUSHI1A Firmware download, 32/64bits) + 0541 Sunlite Universal Smart Handy Interface (SUSHI1A, 32/64bits) + 0570 Touch Sensitive Intelligent Control Keypad (STICK4A Firmware download, 32/64bits) + 0571 Touch Sensitive Intelligent Control Keypad (STICK4A, 32/64bits) + 0580 Touch Sensitive Intelligent Control Keypad (STICK5A Firmware download, 32/64bits) + 0581 Touch Sensitive Intelligent Control Keypad (STICK5A, 32/64bits) + 0590 Intelligent Dmx Interface (SIUDI9S Firmware Download, 32/64bits) + 0591 Intelligent Dmx Interface (SIUDI9S, 32/64bits) + 0600 Intelligent Dmx Interface (SIUDI9M Firmware Download, 32/64bits) + 0601 Intelligent Dmx Interface (SIUDI9M, 32/64bits) + 0610 Intelligent Dmx Interface SIUDI10A Firmware Download + 0611 Intelligent Dmx Interface SIUDI10A 6253 TwinHan Technology Co., Ltd 0100 Ir reciver f. remote control 636c CoreLogic, Inc. -6472 Unknown (Sony?) +6472 Sony Corp. 01c8 PlayStation Portable [Mass Storage] 6547 Arkmicro Technologies Inc. 0232 ARK3116 Serial +6557 Emtec + 5500 Mass Storage Device + 8005 Car Key 6615 IRTOUCHSYSTEMS Co. Ltd. 0001 Touchscreen + 0020 IRTOUCH InfraRed TouchScreen + 0081 TouchScreen 6666 Prototype product Vendor ID 0667 WiseGroup Smart Joy PSX, PS-PC Smart JoyPad + 1c40 TELEMIC 802.15.4 Sensor node (Bootloader) + 1c41 TELEMIC 802.15.4 Sensor node 2667 JCOP BlueZ Smartcard reader 8802 SmartJoy Dual Plus PS2 converter 8804 WiseGroup SuperJoy Box 5 6677 WiseGroup, Ltd. 8802 SmartJoy Dual Plus PS2 converter 8811 Deluxe Dance Mat +675d Humanscale + 062a Switch Mouse 6891 3Com a727 3CRUSB10075 802.11bg [ZyDAS ZD1211] 695c Opera1 @@ -16552,15 +22914,47 @@ 2202 UF5/UF6/UF7/UF8 MIDI Master Keyboard 726c StackFoundry LLC 2149 EntropyKing Random Number Generator +7302 Solinftec + 0001 HUB 4X232 734c TBS Technologies China 5920 Q-Box II DVB-S2 HD 5928 Q-Box II DVB-S2 HD +7373 Beijing STONE Technology Co. Ltd. + 5740 Intelligent TFT-LCD Module 7392 Edimax Technology Co., Ltd - 7711 EW-7711UTn nLite Wireless Adapter [Ralink RT2870] - 7717 EW-7717UN 802.11n Wireless Adapter [Ralink RT2870] + 7711 EW-7711UTn nLite Wireless Adapter [Ralink RT3070] + 7717 EW-7717UN 802.11n Wireless Adapter [Ralink RT2770] 7718 EW-7718UN 802.11n Wireless Adapter [Ralink RT2870] - 7722 EW-7722UTn 802.11n Wireless Adapter [Ralink RT307x] + 7722 EW-7722UTn 802.11n Wireless Adapter [Ralink RT3072] + 7733 EW-7733UnD 802.11abgn 3x3:3 [Ralink RT3573] 7811 EW-7811Un 802.11n Wireless Adapter [Realtek RTL8188CUS] + 7822 EW-7612UAn V2 802.11n Wireless Adapter [Realtek RTL8192CU] + a611 EW-7611ULB 802.11b/g/n and Bluetooth 4.0 Adapter + a711 EW-7711MAC 802.11ac Wireless Adapter + a811 EW-7811UTC 802.11ac Wireless Adapter + b711 EW-7722UAC 802.11a/b/g/n/ac (2x2) Wireless Adapter [MediaTek MT7612U] + b822 EW-7822ULC 802.11ac Wireless Adapter [Realtek RTL8812AU] +73d8 Progeny Dental Equipment Specialists + 0104 VetPro DR, Size 1 + 0105 VetPro DR, Size 2 +7669 Venable Instruments + 350c Model 350c, Frequency Response Analyzer + 5140 Model 5140, Frequency Response Analyzer + 6305 Model 6305, Frequency Response Analyzer + 6320 Model 6320, Frequency Response Analyzer + 6340 Model 6340, Frequency Response Analyzer + 7405 Model 7405, Frequency Response Analyzer + 7420 Model 7420, Frequency Response Analyzer + 7440 Model 7440, Frequency Response Analyzer + 8805 Model 8805, Frequency Response Analyzer + 8820 Model 8820, Frequency Response Analyzer + 8840 Model 8840, Frequency Response Analyzer +7825 Other World Computing + a2a4 External SATA Hard Drive Adapter cable PA023U3 + b0b3 miniStack MAX +8070 ACCES I/O Products, Inc. + 8003 USB-DIO-96 + 8070 USB-AO16-16A 8086 Intel Corp. 0001 AnyPoint (TM) Home Network 1.6 Mbps Wireless Adapter 0044 CPU DRAM Controller @@ -16574,18 +22968,22 @@ 0182 WiMAX Connection 2400m 0186 WiMAX Connection 2400m 0188 WiMAX Connection 2400m + 0189 Centrino Advanced-N 6230 Bluetooth adapter 0200 AnyPoint(TM) Wireless II Network 11Mbps Adapter [Atmel AT76C503A] - 0431 Intel Pro Video PC Camera + 0431 Pro Video PC Camera 0510 Digital Movie Creator 0630 Pocket PC Camera 0780 CS780 Microphone Input 07d3 BLOB boot loader firmware + 07dc Bluetooth 4.0* Smart Ready (low energy) + 0b07 RealSense D435 0dad Cherry MiniatureCard Keyboard 1010 AnyPoint(TM) Home Network 10 Mbps Phoneline Adapter 110a Bluetooth Controller from (Ericsson P4A) 110b Bluetooth Controller from (Intel/CSR) 1110 PRO/Wireless LAN Module 1111 PRO/Wireless 2011B 802.11b Adapter [Intersil PRISM 2.5] + 1122 Integrated Hub 1134 Hollister Mobile Monitor 1139 In-Target Probe (ITP) 1234 Prototype Reader/Writer @@ -16598,23 +22996,60 @@ 3240 AnyPoint速 3240 Modem - WAN 3241 AnyPoint速 3240 Modem 8602 Miniature Card Slot - 9303 Intel 8x930Hx Hub + 8c26 8 Series/C220 Series EHCI #1 + 8c2d 8 Series/C220 Series EHCI #2 + 8c31 eXtensible Host Controller + 9303 8x930Hx Hub 9500 CE 9500 DVB-T 9890 82930 Test Board beef SCM Miniature Card Reader/Writer c013 Wireless HID Station + dead Galileo f001 XScale PXA27x Bulverde flash f1a5 Z-U130 [Value Solid State Drive] 8087 Intel Corp. 0020 Integrated Rate Matching Hub 0024 Integrated Rate Matching Hub + 0025 Wireless-AC 9260 Bluetooth Adapter + 0029 AX200 Bluetooth + 0716 Modem Flashloader + 07da Centrino Bluetooth Wireless Transceiver + 07dc Bluetooth wireless interface + 07eb Oaktrail tablet + 0a2a Bluetooth wireless interface + 0a2b Bluetooth wireless interface + 0a9e Edison + 0aa7 Wireless-AC 3168 Bluetooth + 0aaa Bluetooth 9460/9560 Jefferson Peak (JfP) + 0fff Intel Android Bootloader Interface + 8000 Integrated Rate Matching Hub + 8001 Integrated Hub + 8002 8 channel internal hub + 8008 Integrated Rate Matching Hub + 800a Hub 80ee VirtualBox 0021 USB Tablet + 0022 multitouch tablet 8282 Keio 3201 Retro Adapter 3301 Retro Adapter Mouse +8301 Hapurs + 0089 HPBT05R 2.4 G Mini Wireless Touchpad Keyboard 8341 EGO Systems, Inc. 2000 Flashdisk +8564 Transcend Information, Inc. + 1000 JetFlash + 4000 microSD/SD/CF UHS-II Card Reader [RDF8, RDF9] + 6000 digital photo frame PF830 + 6002 digital photo frame PF830 + 7000 StoreJet 25H3 +8644 Intenso GmbG + 8003 Micro Line + 800b Micro Line (4GB) +8e06 CH Products, Inc. + f700 DT225 Trackball +8ea3 Doosl + a02c Wireless Presenter Receiver 9016 Sitecom 182d WL-022 802.11b Adapter 9022 TeVii Technology Ltd. @@ -16624,6 +23059,7 @@ 9148 GeoLab, Ltd # All of GeoLab's devices share the same ID 0004. 0004 R3 Compatible Device +9516 Studiologic 9710 MosChip Semiconductor 7703 MCS7703 Serial Port Adapter 7705 MCS7705 Parallel port adapter @@ -16632,13 +23068,30 @@ 7720 MCS7720 Dual serial port adapter 7730 MCS7730 10/100 Mbps Ethernet adapter 7780 MCS7780 4Mbps Fast IrDA Adapter + 7784 MCS7784 115.2Kb IrDA Adapter + 7810 MCS7810 Serial Port Adapter + 7820 MCS7820 Dual Serial Port Adapter 7830 MCS7830 10/100 Mbps Ethernet adapter 7832 MCS7832 10/100 Mbps Ethernet adapter 7840 MCS7820/MCS7840 2/4 port serial adapter + 9990 MCS9990 PCIe Host Controller +9849 Bestmedia CD Recordable GmbH & Co. KG + 0701 Platinum MyDrive HP +9886 Astro Gaming + 0015 A50 +9999 Odeon + 0001 JAF Mobile Phone Flasher Interface 99fa Grandtec 8988 V.cap Camera Device 9ac4 J. Westhues 4b8f ProxMark-3 RFID Instrument +9e88 Marvell Semiconductor, Inc. + 9e8f Plug Computer Basic [SheevaPlug] +a014 Insignia (Best Buy) + b014 Desktop Microphone NS-PAUM50 +a108 Ingenic Semiconductor Co.,Ltd + 1000 X1000 + 4775 JZ4775 Boot Device a128 AnMo Electronics Corp. / Dino-Lite (?) 0610 Dino-Lite Digital Microscope (SN9C201 + HV7131R) 0611 Dino-Lite Digital Microscope (SN9C201 + HV7131R) @@ -16657,22 +23110,63 @@ a168 AnMo Electronics Corporation 0615 Dino-Lite Pro Digital Microscope 0617 Dino-Lite Pro Digital Microscope 0618 Dino-Lite Digital Microscope -a600 Asix +a466 Haikou Xingong Electronics Co.,Ltd + 0a53 TL866II Plus Device Programmer [MiniPRO] +a600 ASIX s.r.o. + 5500 zuban H2OPS - GPS for canoeing + a000 SIGMA Logic Analyzer + a002 EMUSB interface pro MU Beta + c000 MREL Data Trap II + c001 VUTS DMU4 + c002 Electrone MASH + c005 MREL HTU HandiTrap cable + c006 JRC COmeter e110 OK1ZIA Davac 4.x + e112 OK1ZIA Antenna rotator + e113 OK1ZIA GPIO + e114 OK1ZIA HD&Keyb a727 3Com 6893 3CRUSB20075 OfficeConnect Wireless 108Mbps 11g Adapter [Atheros AR5523] 6895 AR5523 6897 AR5523 -abcd Unknown +a88a Clas Ohlsson + 3003 PCFree Multimedia Remote Control PC +aaaa MXT + 8815 microSD CardReader + 8816 microSD CardReader +ab12 aplic + 34cd JMICRON JMS578 SATA 6Gb/s bridge +abcd LogiLink + 1234 UDisk flash drive + 6104 PCCloneEX Lite+ SATA docking station [QP0017] cdee Petcam +b58e Blue Microphones + 9e84 Yeti Stereo Microphone +ba77 Clockmaker + 7147 Agterbosch +c216 Card Device Expert Co., LTD + 0180 MSR90 MagStripe reader c251 Keil Software, Inc. + 1705 MCB2300 2710 ULink + 2723 ULink-ME +c502 AGPTek + 0029 Rocker cace CACE Technologies Inc. 0002 AirPCAP Classic 802.11 packet capture adapter - 0300 AirPcap NX [Atheros AR9001U-(2)NG] + 0300 AirPcap NX [Atheros AR9170+AR9104] +cd12 SMART TECHNOLOGY INDUSTRIAL LTD. +d208 Ultimarc + 0310 Mini-PAC Arcade Control Interface d209 Ultimarc 0301 I-PAC Arcade Control Interface 0501 Ultra-Stik Ultimarc Ultra-Stik Player 1 + 1571 A-PAC Arcade Control Interface +d904 LogiLink + 0003 Laser Mouse (ID0009A) +e2b7 Jie Li + 0811 CD002 + 0812 CD005 MP3 Player e4e4 Xorcom Ltd. 1130 Astribank series 1131 Astribank series @@ -16696,19 +23190,51 @@ eb1a eMPIA Technology, Inc. 2750 ECS Elitegroup G220 integrated Webcam 2761 EeePC 701 integrated Webcam 2776 Combined audio and video input device - 2800 Terratec Cinergy 200 - 2801 GrabBeeX+ Video Encoder + 2800 EM2800 Video Capture + 2801 EM2801 Video Capture + 2820 EM2820 Video Capture + 2821 EM2820 Video Capture + 2840 EM2840 Video Capture + 2841 EM2840 Video Capture + 2861 EasyCAP DC60+ [EM2861] 2863 Video Grabber 2870 Pinnacle PCTV Stick 2881 EM2881 Video Controller 50a3 Gadmei UTV380 TV Box 50a6 Gadmei UTV330 TV Box + 5166 video grabber 28282 + 5184 VIDBOX NW06 [EM28281] + 8179 Terratec Cinergy T2 Stick HD + e305 KWorld PlusTV Analog Stick e355 KWorld DVB-T 355U Digital TV Dongle eb2a KWorld +ef18 SMART TECHNOLOGY INDUSTRIAL LTD. f003 Hewlett Packard 6002 PhotoSmart C500 +f007 Teslong + a999 Endoscope Camera + b999 Otoscope Camera +f182 Leap Motion + 0003 Controller +f3f0 CCT, Inc + 0740 multi-function device + 1340 multi-function printer + 1440 printer device + 1921 printer f4ec Atten Electronics / Siglent Technologies ee38 Digital Storage Oscilloscope +f4ed Shenzhen Siglent Co., Ltd. + ee37 SDG1010 Waveform Generator + ee3a SDG1010 Waveform Generator (TMC mode) +f766 Hama + 0001 PC-Gamepad "Greystorm" +fa11 DyingLight + 5afe DyingLight +fc08 Conrad Electronic SE + 0101 MIDI Cable UA0037 +ff00 Power Delivery +ffee FNK Tech + 0100 Card Reader Controller RTS5101/RTS5111/RTS5116 # List of known device classes, subclasses and protocols @@ -16831,6 +23357,7 @@ C ef Miscellaneous Device 02 Wire Adapter Multifunction Peripheral 03 ? 01 Cable Based Association + 05 USB3 Vision C fe Application Specific Interface 01 Device Firmware Update 02 IRDA Bridge diff --git a/Testing/nbproject/project.xml b/Testing/nbproject/project.xml index 2ebb94a835..2f8d76f7a1 100644 --- a/Testing/nbproject/project.xml +++ b/Testing/nbproject/project.xml @@ -47,7 +47,7 @@ 10 - 10.19 + 10.20 diff --git a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties index 5f60aed634..f4d5248a8b 100644 --- a/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties +++ b/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties @@ -1,5 +1,5 @@ #Updated by build script -#Fri, 12 Jun 2020 14:50:38 -0400 +#Fri, 19 Jun 2020 10:14:47 -0400 LBL_splash_window_title=Starting Autopsy SPLASH_HEIGHT=314 SPLASH_WIDTH=538 diff --git a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties index 6160c1ec95..52d17e0e96 100644 --- a/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties +++ b/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties @@ -1,4 +1,4 @@ #Updated by build script -#Fri, 12 Jun 2020 14:50:38 -0400 +#Fri, 19 Jun 2020 10:14:47 -0400 CTL_MainWindow_Title=Autopsy 4.15.0 CTL_MainWindow_Title_No_Project=Autopsy 4.15.0 diff --git a/build-windows-installer.xml b/build-windows-installer.xml index 3cb3876df9..5e40e0ce55 100644 --- a/build-windows-installer.xml +++ b/build-windows-installer.xml @@ -39,7 +39,12 @@ - + + + + + + @@ -111,6 +116,9 @@ + + + @@ -137,6 +145,9 @@ + + + @@ -195,6 +206,16 @@ + + + + + + + + + + diff --git a/build-windows.xml b/build-windows.xml index 27cbf31f26..7f03aa3dde 100644 --- a/build-windows.xml +++ b/build-windows.xml @@ -29,15 +29,11 @@ - - - - + + - - + Testdisk - Fix MBR and Recover lost partitions PhotoRec - Recover lost files (Doc, Pic and Video) + QPhotoRec - GUI to recover lost files (Doc, Pic and Video) diff --git a/thirdparty/photorec_exec/plugins/WinBuilder/Help.htm b/thirdparty/photorec_exec/bin/plugins/WinBuilder/Help.htm similarity index 93% rename from thirdparty/photorec_exec/plugins/WinBuilder/Help.htm rename to thirdparty/photorec_exec/bin/plugins/WinBuilder/Help.htm index be824606e9..a5507f7b0b 100644 --- a/thirdparty/photorec_exec/plugins/WinBuilder/Help.htm +++ b/thirdparty/photorec_exec/bin/plugins/WinBuilder/Help.htm @@ -30,7 +30,7 @@

Instructions

    -
  • 1- Download TestDisk and PhotoRec from Here
    • +
  • 1- Download TestDisk and PhotoRec from Here
  • 2- Uncompress the download.
  • 3- Copy TestDisk.script to the WinBuilder App project folder.
  • 4- Start your build and enjoy !
    • @@ -38,7 +38,7 @@

    Support

diff --git a/thirdparty/photorec_exec/plugins/WinBuilder/ReadMe.txt b/thirdparty/photorec_exec/bin/plugins/WinBuilder/ReadMe.txt similarity index 95% rename from thirdparty/photorec_exec/plugins/WinBuilder/ReadMe.txt rename to thirdparty/photorec_exec/bin/plugins/WinBuilder/ReadMe.txt index 0ac9e4b000..4f4b6004f7 100644 --- a/thirdparty/photorec_exec/plugins/WinBuilder/ReadMe.txt +++ b/thirdparty/photorec_exec/bin/plugins/WinBuilder/ReadMe.txt @@ -1,4 +1,4 @@ -TestDisk and PhotoRec v6.14 Plugin +TestDisk and PhotoRec v7.1 Plugin ===================================== Plugin by: Xtreme - Ahmed Hossam Plugin for: Christophe GRENIER (www.cgsecurity.org) diff --git a/thirdparty/photorec_exec/plugins/WinBuilder/TestDisk.script b/thirdparty/photorec_exec/bin/plugins/WinBuilder/TestDisk.script similarity index 75% rename from thirdparty/photorec_exec/plugins/WinBuilder/TestDisk.script rename to thirdparty/photorec_exec/bin/plugins/WinBuilder/TestDisk.script index 2ada4659c2..d1e83c966c 100644 --- a/thirdparty/photorec_exec/plugins/WinBuilder/TestDisk.script +++ b/thirdparty/photorec_exec/bin/plugins/WinBuilder/TestDisk.script @@ -1,12 +1,12 @@ [main] -Title=TestDisk & PhotoRec 6.14 +Title=TestDisk & PhotoRec 7.1 Description=A powerful free data recovery software utility. Selected=True Level=5 Version=1 Author=Xtreme Contact=http://www.boot-land.net/forums/ -Credits=Christophe GRENIER (http://www.cgsecurity.org) +Credits=Christophe GRENIER (https://www.cgsecurity.org) Date=Friday, May 16,2008 [Interface] @@ -26,15 +26,33 @@ StrFormat,CTrim,"%two_folders_up%","\",%two_folders_up% If,NotExistFile,"%two_folders_up%\testdisk_win.exe",Run,%ScriptFile%,Halt DirMake,"%Target_Prog%\%ProgramFolder%" DirMake,"%Target_Prog%\%ProgramFolder%\63" -FileCopy,"%two_folders_up%\cygwin1.dll","%Target_Prog%\%ProgramFolder%" +FileCopy,"%two_folders_up%\cyggcc_s-1.dll","%Target_Prog%%ProgramFolder%" +FileCopy,"%two_folders_up%\cygiconv-2.dll","%Target_Prog%%ProgramFolder%" +FileCopy,"%two_folders_up%\cygjpeg-8.dll","%Target_Prog%%ProgramFolder%" +FileCopy,"%two_folders_up%\cygncursesw-10.dll","%Target_Prog%%ProgramFolder%" +FileCopy,"%two_folders_up%\cygssp-0.dll","%Target_Prog%%ProgramFolder%" +FileCopy,"%two_folders_up%\cygwin1.dll","%Target_Prog%%ProgramFolder%" +FileCopy,"%two_folders_up%\cygz.dll","%Target_Prog%%ProgramFolder%" +FileCopy,"%two_folders_up%\iconv.dll","%Target_Prog%%ProgramFolder%" +FileCopy,"%two_folders_up%\libgcc_s_sjlj-1.dll","%Target_Prog%%ProgramFolder%" +FileCopy,"%two_folders_up%\libjpeg-62.dll","%Target_Prog%%ProgramFolder%" +FileCopy,"%two_folders_up%\libpng16-16.dll","%Target_Prog%%ProgramFolder%" +FileCopy,"%two_folders_up%\libssp-0.dll","%Target_Prog%%ProgramFolder%" +FileCopy,"%two_folders_up%\libstdc++-6.dll","%Target_Prog%%ProgramFolder%" +FileCopy,"%two_folders_up%\libwinpthread-1.dll","%Target_Prog%%ProgramFolder%" +FileCopy,"%two_folders_up%\QtCore4.dll","%Target_Prog%%ProgramFolder%" +FileCopy,"%two_folders_up%\QtGui4.dll","%Target_Prog%%ProgramFolder%" +FileCopy,"%two_folders_up%\zlib1.dll","%Target_Prog%%ProgramFolder%" FileCopy,"%two_folders_up%\fidentify_win.exe","%Target_Prog%\%ProgramFolder%" FileCopy,"%two_folders_up%\photorec_win.exe","%Target_Prog%\%ProgramFolder%" +FileCopy,"%two_folders_up%\qphotorec_win.exe","%Target_Prog%\%ProgramFolder%" FileCopy,"%two_folders_up%\readme.txt","%Target_Prog%\%ProgramFolder%" FileCopy,"%two_folders_up%\testdisk_win.exe","%Target_Prog%\%ProgramFolder%" DirCopy,"%two_folders_up%\63\*.*","%Target_Prog%\%ProgramFolder%\63" ::DirCopy,"%two_folders_up%\TestDisk\*.*","%Target_Prog%\%ProgramFolder%" Add_Shortcut,StartMenu,"%TestDisk & PhotoRec" Add_Shortcut,StartMenu,"TestDisk & PhotoRec","%PE_Programs%\%ProgramFolder%\photorec_win.exe","PhotoRec" +Add_Shortcut,StartMenu,"TestDisk & PhotoRec","%PE_Programs%\%ProgramFolder%\qphotorec_win.exe","QPhotoRec" Add_Shortcut,StartMenu,"TestDisk & PhotoRec","%PE_Programs%\%ProgramFolder%\testdisk_win.exe","Testdisk" Add_Shortcut,StartMenu,"TestDisk & PhotoRec","%PE_Programs%\%ProgramFolder%\fidentify_win.exe","Files Identify" diff --git a/thirdparty/photorec_exec/bin/qphotorec_win.exe b/thirdparty/photorec_exec/bin/qphotorec_win.exe new file mode 100644 index 0000000000..7415ccea4c Binary files /dev/null and b/thirdparty/photorec_exec/bin/qphotorec_win.exe differ diff --git a/thirdparty/photorec_exec/readme.txt b/thirdparty/photorec_exec/bin/readme.txt similarity index 79% rename from thirdparty/photorec_exec/readme.txt rename to thirdparty/photorec_exec/bin/readme.txt index 57cd3b6f3a..1995c1fc42 100644 --- a/thirdparty/photorec_exec/readme.txt +++ b/thirdparty/photorec_exec/bin/readme.txt @@ -12,12 +12,12 @@ For Windows 64-bit without WoW64, use the Windows 64-bit version of TestDisk & PhotoRec. If you are using an older version of Windows, run the DOS version of TestDisk. -You can download it from http://www.cgsecurity.org/wiki/TestDisk_Download +You can download it from https://www.cgsecurity.org/wiki/TestDisk_Download TestDisk doesn't need to be installed, you only need to - extract the files - run testdisk_win.exe or photorec_win.exe TestDisk & PhotoRec documentation can be found online: -- http://www.cgsecurity.org/wiki/TestDisk -- http://www.cgsecurity.org/wiki/PhotoRec +- https://www.cgsecurity.org/wiki/TestDisk +- https://www.cgsecurity.org/wiki/PhotoRec diff --git a/thirdparty/photorec_exec/bin/testdisk.pdf b/thirdparty/photorec_exec/bin/testdisk.pdf new file mode 100644 index 0000000000..c8ccc59522 Binary files /dev/null and b/thirdparty/photorec_exec/bin/testdisk.pdf differ diff --git a/thirdparty/photorec_exec/bin/testdisk_win.exe b/thirdparty/photorec_exec/bin/testdisk_win.exe new file mode 100644 index 0000000000..0fd829923b Binary files /dev/null and b/thirdparty/photorec_exec/bin/testdisk_win.exe differ diff --git a/thirdparty/photorec_exec/bin/zlib1.dll b/thirdparty/photorec_exec/bin/zlib1.dll new file mode 100644 index 0000000000..75aa81eab3 Binary files /dev/null and b/thirdparty/photorec_exec/bin/zlib1.dll differ diff --git a/thirdparty/photorec_exec/cyggcc_s-1.dll b/thirdparty/photorec_exec/cyggcc_s-1.dll deleted file mode 100755 index d2ea601c9f..0000000000 Binary files a/thirdparty/photorec_exec/cyggcc_s-1.dll and /dev/null differ diff --git a/thirdparty/photorec_exec/cygjpeg-8.dll b/thirdparty/photorec_exec/cygjpeg-8.dll deleted file mode 100755 index 7f1f2eb953..0000000000 Binary files a/thirdparty/photorec_exec/cygjpeg-8.dll and /dev/null differ diff --git a/thirdparty/photorec_exec/cygncursesw-10.dll b/thirdparty/photorec_exec/cygncursesw-10.dll deleted file mode 100755 index 7f105b32b7..0000000000 Binary files a/thirdparty/photorec_exec/cygncursesw-10.dll and /dev/null differ diff --git a/thirdparty/photorec_exec/cygssp-0.dll b/thirdparty/photorec_exec/cygssp-0.dll deleted file mode 100755 index 23bd09df51..0000000000 Binary files a/thirdparty/photorec_exec/cygssp-0.dll and /dev/null differ diff --git a/thirdparty/photorec_exec/cygwin1.dll b/thirdparty/photorec_exec/cygwin1.dll deleted file mode 100755 index 12a08b7adc..0000000000 Binary files a/thirdparty/photorec_exec/cygwin1.dll and /dev/null differ diff --git a/thirdparty/photorec_exec/cygz.dll b/thirdparty/photorec_exec/cygz.dll deleted file mode 100755 index fe28c63335..0000000000 Binary files a/thirdparty/photorec_exec/cygz.dll and /dev/null differ diff --git a/thirdparty/photorec_exec/documentation.html b/thirdparty/photorec_exec/documentation.html deleted file mode 100644 index e4f0877567..0000000000 --- a/thirdparty/photorec_exec/documentation.html +++ /dev/null @@ -1,12 +0,0 @@ - - -TestDisk & PhotoRec documentation - - -TestDisk & PhotoRec documentation can be found online: - - - diff --git a/thirdparty/photorec_exec/fidentify_win.exe b/thirdparty/photorec_exec/fidentify_win.exe deleted file mode 100755 index eff25a8065..0000000000 Binary files a/thirdparty/photorec_exec/fidentify_win.exe and /dev/null differ diff --git a/thirdparty/photorec_exec/iconv.dll b/thirdparty/photorec_exec/iconv.dll deleted file mode 100755 index 12140fcdf6..0000000000 Binary files a/thirdparty/photorec_exec/iconv.dll and /dev/null differ diff --git a/thirdparty/photorec_exec/libgcc_s_sjlj-1.dll b/thirdparty/photorec_exec/libgcc_s_sjlj-1.dll deleted file mode 100755 index 358b42e762..0000000000 Binary files a/thirdparty/photorec_exec/libgcc_s_sjlj-1.dll and /dev/null differ diff --git a/thirdparty/photorec_exec/libjpeg-62.dll b/thirdparty/photorec_exec/libjpeg-62.dll deleted file mode 100755 index 376a18e42f..0000000000 Binary files a/thirdparty/photorec_exec/libjpeg-62.dll and /dev/null differ diff --git a/thirdparty/photorec_exec/libpng16-16.dll b/thirdparty/photorec_exec/libpng16-16.dll deleted file mode 100755 index e1c18e9bcd..0000000000 Binary files a/thirdparty/photorec_exec/libpng16-16.dll and /dev/null differ diff --git a/thirdparty/photorec_exec/libssp-0.dll b/thirdparty/photorec_exec/libssp-0.dll deleted file mode 100755 index 7a87258557..0000000000 Binary files a/thirdparty/photorec_exec/libssp-0.dll and /dev/null differ diff --git a/thirdparty/photorec_exec/libstdc++-6.dll b/thirdparty/photorec_exec/libstdc++-6.dll deleted file mode 100755 index 00a52cb5df..0000000000 Binary files a/thirdparty/photorec_exec/libstdc++-6.dll and /dev/null differ diff --git a/thirdparty/photorec_exec/libwinpthread-1.dll b/thirdparty/photorec_exec/libwinpthread-1.dll deleted file mode 100755 index bc94f0183e..0000000000 Binary files a/thirdparty/photorec_exec/libwinpthread-1.dll and /dev/null differ diff --git a/thirdparty/photorec_exec/photorec_win.exe b/thirdparty/photorec_exec/photorec_win.exe deleted file mode 100755 index e3fb92dec8..0000000000 Binary files a/thirdparty/photorec_exec/photorec_win.exe and /dev/null differ diff --git a/thirdparty/photorec_exec/qphotorec_win.exe b/thirdparty/photorec_exec/qphotorec_win.exe deleted file mode 100755 index 7d7931cd09..0000000000 Binary files a/thirdparty/photorec_exec/qphotorec_win.exe and /dev/null differ diff --git a/thirdparty/photorec_exec/testdisk_win.exe b/thirdparty/photorec_exec/testdisk_win.exe deleted file mode 100755 index 7455bd0657..0000000000 Binary files a/thirdparty/photorec_exec/testdisk_win.exe and /dev/null differ diff --git a/thirdparty/photorec_exec/zlib1.dll b/thirdparty/photorec_exec/zlib1.dll deleted file mode 100755 index b39de53bf3..0000000000 Binary files a/thirdparty/photorec_exec/zlib1.dll and /dev/null differ diff --git a/thirdparty/rr-full/plugins/system b/thirdparty/rr-full/plugins/system index f95897e19d..568b92c648 100644 --- a/thirdparty/rr-full/plugins/system +++ b/thirdparty/rr-full/plugins/system @@ -4,6 +4,7 @@ appcompatcache auditfail backuprestore bam +bam_tln bthport comfoo compname diff --git a/thirdparty/rr/plugins/arunmru.pl b/thirdparty/rr/plugins/arunmru.pl index 504700f145..9d8ed281bd 100644 --- a/thirdparty/rr/plugins/arunmru.pl +++ b/thirdparty/rr/plugins/arunmru.pl @@ -36,43 +36,44 @@ sub pluginmain { my $class = shift; my $ntuser = shift; #::logMsg("autospyrunmru"); - my $reg = Parse::Win32Registry->new($ntuser); - my $root_key = $reg->get_root_key; + if (defined(Parse::Win32Registry->new($ntuser))) { + my $reg = Parse::Win32Registry->new($ntuser); + my $root_key = $reg->get_root_key; - my $key_path = 'Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\RunMRU'; - my $key; - if ($key = $root_key->get_subkey($key_path)) { - #::rptMsg("RunMru"); - #::rptMsg($key_path); - - my @vals = $key->get_list_of_values(); - ::rptMsg(""); - ::rptMsg("".gmtime($key->get_timestamp()).""); - ::rptMsg(""); - my %runvals; - my $mru; - if (scalar(@vals) > 0) { - foreach my $v (@vals) { - $runvals{$v->get_name()} = $v->get_data() unless ($v->get_name() =~ m/^MRUList/i); - $mru = $v->get_data() if ($v->get_name() =~ m/^MRUList/i); - } - ::rptMsg("".$mru.""); - foreach my $r (sort keys %runvals) { - ::rptMsg("".$r." ".$runvals{$r}.""); - } - } - else { - #::rptMsg($key_path." has no values."); - #::logMsg($key_path." has no values."); - } - ::rptMsg(""); - ::rptMsg(""); - } - else { - #::rptMsg($key_path." not found."); - #::logMsg($key_path." not found."); - } - + my $key_path = 'Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\RunMRU'; + my $key; + if ($key = $root_key->get_subkey($key_path)) { + #::rptMsg("RunMru"); + #::rptMsg($key_path); + + my @vals = $key->get_list_of_values(); + ::rptMsg(""); + ::rptMsg("".gmtime($key->get_timestamp()).""); + ::rptMsg(""); + my %runvals; + my $mru; + if (scalar(@vals) > 0) { + foreach my $v (@vals) { + $runvals{$v->get_name()} = $v->get_data() unless ($v->get_name() =~ m/^MRUList/i); + $mru = $v->get_data() if ($v->get_name() =~ m/^MRUList/i); + } + ::rptMsg("".$mru.""); + foreach my $r (sort keys %runvals) { + ::rptMsg("".$r." ".$runvals{$r}.""); + } + } + else { + #::rptMsg($key_path." has no values."); + #::logMsg($key_path." has no values."); + } + ::rptMsg(""); + ::rptMsg(""); + } + else { + #::rptMsg($key_path." not found."); + #::logMsg($key_path." not found."); + } + } } 1; diff --git a/thirdparty/rr/plugins/autopsylogin.pl b/thirdparty/rr/plugins/autopsylogin.pl index ab0365817e..2a72ba6936 100644 --- a/thirdparty/rr/plugins/autopsylogin.pl +++ b/thirdparty/rr/plugins/autopsylogin.pl @@ -35,36 +35,38 @@ sub pluginmain { my $class = shift; my $ntuser = shift; #::logMsg("||logonusername||"); - my $reg = Parse::Win32Registry->new($ntuser); - my $root_key = $reg->get_root_key; - - my $logon_name = "Username"; - - my $key_path = 'Software\\Microsoft\\Windows\\CurrentVersion\\Explorer'; - my $key; - if ($key = $root_key->get_subkey($key_path)) { - my @vals = $key->get_list_of_values(); - if (scalar(@vals) > 0) { - #::rptMsg("Logon User Name"); - #::rptMsg($key_path); - ::rptMsg(""); - ::rptMsg("".gmtime($key->get_timestamp()).""); - foreach my $v (@vals) { - if ($v->get_name() eq $logon_name) { - ::rptMsg(" ".$v->get_data() .""); - } - } - ::rptMsg(""); - } - else { - #::rptMsg($key_path." has no values."); - #::logMsg($key_path." has no values."); - } - } - else { - #::rptMsg($key_path." not found."); - #::logMsg($key_path." not found."); - } + if (defined(Parse::Win32Registry->new($ntuser))) { + my $reg = Parse::Win32Registry->new($ntuser); + my $root_key = $reg->get_root_key; + + my $logon_name = "Username"; + + my $key_path = 'Software\\Microsoft\\Windows\\CurrentVersion\\Explorer'; + my $key; + if ($key = $root_key->get_subkey($key_path)) { + my @vals = $key->get_list_of_values(); + if (scalar(@vals) > 0) { + #::rptMsg("Logon User Name"); + #::rptMsg($key_path); + ::rptMsg(""); + ::rptMsg("".gmtime($key->get_timestamp()).""); + foreach my $v (@vals) { + if ($v->get_name() eq $logon_name) { + ::rptMsg(" ".$v->get_data() .""); + } + } + ::rptMsg(""); + } + else { + #::rptMsg($key_path." has no values."); + #::logMsg($key_path." has no values."); + } + } + else { + #::rptMsg($key_path." not found."); + #::logMsg($key_path." not found."); + } + } } 1; diff --git a/thirdparty/rr/plugins/autopsyntusernetwork.pl b/thirdparty/rr/plugins/autopsyntusernetwork.pl index 715e89b8ff..910679be95 100644 --- a/thirdparty/rr/plugins/autopsyntusernetwork.pl +++ b/thirdparty/rr/plugins/autopsyntusernetwork.pl @@ -30,64 +30,67 @@ sub pluginmain { my $ntuser = shift; #::logMsg("Launching ntusernetwork v.".$VERSION); #::rptMsg("ntusernetwork v.".$VERSION); # banner - #::rptMsg("(".$config{hive}.") ".getShortDescr()."\n"); # banner - my $reg = Parse::Win32Registry->new($ntuser); - my $root_key = $reg->get_root_key; - - ::rptMsg(""); - ::rptMsg(""); - ::rptMsg(""); + #::rptMsg("(".$config{hive}.") ".getShortDescr()."\n"); # banner + if (defined(Parse::Win32Registry->new($ntuser))) { + + my $reg = Parse::Win32Registry->new($ntuser); + my $root_key = $reg->get_root_key; + + ::rptMsg(""); + ::rptMsg(""); + ::rptMsg(""); - my $key_path = 'Network'; - my $key; - if ($key = $root_key->get_subkey($key_path)) { + my $key_path = 'Network'; + my $key; + if ($key = $root_key->get_subkey($key_path)) { - my @subkeys = $key->get_list_of_subkeys(); - if (scalar @subkeys > 0) { - foreach my $s (@subkeys) { - #::rptMsg($key_path."\\".$s->get_name()); - my $localPath = $key_path."\\".$s->get_name(); + my @subkeys = $key->get_list_of_subkeys(); + if (scalar @subkeys > 0) { + foreach my $s (@subkeys) { + #::rptMsg($key_path."\\".$s->get_name()); + my $localPath = $key_path."\\".$s->get_name(); - my $remotePath; - eval { - $remotePath = $s->get_value("RemotePath")->get_data(); - }; - if ($@) { - # ::rptMsg("OS value not found."); - } - else { - ::rptMsg("". $remotePath . ""); - } - } - } + my $remotePath; + eval { + $remotePath = $s->get_value("RemotePath")->get_data(); + }; + if ($@) { + # ::rptMsg("OS value not found."); + } + else { + ::rptMsg("". $remotePath . ""); + } + } + } - # ::rptMsg($key_path); - # ::rptMsg(""); + # ::rptMsg($key_path); + # ::rptMsg(""); - - # my @subkeys = $key->get_list_of_subkeys(); - # if (scalar @subkeys > 0) { - # foreach my $s (@subkeys) { - # ::rptMsg($key_path."\\".$s->get_name()); - # ::rptMsg("LastWrite time: ".gmtime($s->get_timestamp())); - # my @vals = $s->get_list_of_values(); - # if (scalar @vals > 0) { - # foreach my $v (@vals) { - # ::rptMsg(sprintf " %-15s %-25s",$v->get_name(),$v->get_data()); - # } - # ::rptMsg(""); - # } - # } - # } - # else { - # ::rptMsg($key_path." key has no subkeys."); - # } - } - else { - #::rptMsg($key_path." key not found."); - } - ::rptMsg(""); + + # my @subkeys = $key->get_list_of_subkeys(); + # if (scalar @subkeys > 0) { + # foreach my $s (@subkeys) { + # ::rptMsg($key_path."\\".$s->get_name()); + # ::rptMsg("LastWrite time: ".gmtime($s->get_timestamp())); + # my @vals = $s->get_list_of_values(); + # if (scalar @vals > 0) { + # foreach my $v (@vals) { + # ::rptMsg(sprintf " %-15s %-25s",$v->get_name(),$v->get_data()); + # } + # ::rptMsg(""); + # } + # } + # } + # else { + # ::rptMsg($key_path." key has no subkeys."); + # } + } + else { + #::rptMsg($key_path." key not found."); + } + ::rptMsg(""); + } } 1; diff --git a/thirdparty/rr/plugins/autopsyrecentdocs.pl b/thirdparty/rr/plugins/autopsyrecentdocs.pl index 776126175b..e2a05aa699 100644 --- a/thirdparty/rr/plugins/autopsyrecentdocs.pl +++ b/thirdparty/rr/plugins/autopsyrecentdocs.pl @@ -41,80 +41,82 @@ sub pluginmain { my $class = shift; my $ntuser = shift; #::logMsg("||recentdocs||"); - my $reg = Parse::Win32Registry->new($ntuser); - my $root_key = $reg->get_root_key; - my $key_path = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\RecentDocs"; - my $key; - if ($key = $root_key->get_subkey($key_path)) { - #::rptMsg("RecentDocs"); - #::rptMsg("**All values printed in MRUList\\MRUListEx order."); - #::rptMsg($key_path); - ::rptMsg("".gmtime($key->get_timestamp()).""); -# Get RecentDocs values - my %rdvals = getRDValues($key); - if (%rdvals) { - my $tag; - if (exists $rdvals{"MRUListEx"}) { - $tag = "MRUListEx"; - } - elsif (exists $rdvals{"MRUList"}) { - $tag = "MRUList"; - } - else { - - } - - my @list = split(/,/,$rdvals{$tag}); - foreach my $i (@list) { - ::rptMsg("".$rdvals{$i} . ""); - } - - } - else { - #::rptMsg($key_path." has no values."); - #::logMsg("Error: ".$key_path." has no values."); - } - ::rptMsg(""); -# Get RecentDocs subkeys' values - my @subkeys = $key->get_list_of_subkeys(); - if (scalar(@subkeys) > 0) { - foreach my $s (@subkeys) { - #::rptMsg($key_path."\\".$s->get_name()); - #::rptMsg("LastWrite Time ".gmtime($s->get_timestamp())." (UTC)"); - - my %rdvals = getRDValues($s); - if (%rdvals) { - my $tag; - if (exists $rdvals{"MRUListEx"}) { - $tag = "MRUListEx"; - } - elsif (exists $rdvals{"MRUList"}) { - $tag = "MRUList"; - } - else { - - } - - my @list = split(/,/,$rdvals{$tag}); - #::rptMsg($tag." = ".$rdvals{$tag}); - foreach my $i (@list) { - #::rptMsg("".$rdvals{$i}); - } - - #::rptMsg(""); - } - else { - #::rptMsg($key_path." has no values."); - } - } - } - else { - #::rptMsg($key_path." has no subkeys."); - } - } - else { - #::rptMsg($key_path." not found."); - } + if (defined(Parse::Win32Registry->new($ntuser))) { + my $reg = Parse::Win32Registry->new($ntuser); + my $root_key = $reg->get_root_key; + my $key_path = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\RecentDocs"; + my $key; + if ($key = $root_key->get_subkey($key_path)) { + #::rptMsg("RecentDocs"); + #::rptMsg("**All values printed in MRUList\\MRUListEx order."); + #::rptMsg($key_path); + ::rptMsg("".gmtime($key->get_timestamp()).""); + # Get RecentDocs values + my %rdvals = getRDValues($key); + if (%rdvals) { + my $tag; + if (exists $rdvals{"MRUListEx"}) { + $tag = "MRUListEx"; + } + elsif (exists $rdvals{"MRUList"}) { + $tag = "MRUList"; + } + else { + + } + + my @list = split(/,/,$rdvals{$tag}); + foreach my $i (@list) { + ::rptMsg("".$rdvals{$i} . ""); + } + + } + else { + #::rptMsg($key_path." has no values."); + #::logMsg("Error: ".$key_path." has no values."); + } + ::rptMsg(""); + # Get RecentDocs subkeys' values + my @subkeys = $key->get_list_of_subkeys(); + if (scalar(@subkeys) > 0) { + foreach my $s (@subkeys) { + #::rptMsg($key_path."\\".$s->get_name()); + #::rptMsg("LastWrite Time ".gmtime($s->get_timestamp())." (UTC)"); + + my %rdvals = getRDValues($s); + if (%rdvals) { + my $tag; + if (exists $rdvals{"MRUListEx"}) { + $tag = "MRUListEx"; + } + elsif (exists $rdvals{"MRUList"}) { + $tag = "MRUList"; + } + else { + + } + + my @list = split(/,/,$rdvals{$tag}); + #::rptMsg($tag." = ".$rdvals{$tag}); + foreach my $i (@list) { + #::rptMsg("".$rdvals{$i}); + } + + #::rptMsg(""); + } + else { + #::rptMsg($key_path." has no values."); + } + } + } + else { + #::rptMsg($key_path." has no subkeys."); + } + } + else { + #::rptMsg($key_path." not found."); + } + } } diff --git a/thirdparty/rr/plugins/autopsyshellfolders.pl b/thirdparty/rr/plugins/autopsyshellfolders.pl index d625820ec5..01a5b22e6a 100644 --- a/thirdparty/rr/plugins/autopsyshellfolders.pl +++ b/thirdparty/rr/plugins/autopsyshellfolders.pl @@ -41,32 +41,35 @@ sub pluginmain { my $class = shift; my $hive = shift; #::logMsg("Launching shellfolders v.".$VERSION); - my $reg = Parse::Win32Registry->new($hive); - my $root_key = $reg->get_root_key; + if (defined(Parse::Win32Registry->new($hive))) { + my $reg = Parse::Win32Registry->new($hive); - my $key_path = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders"; - my $key; - if ($key = $root_key->get_subkey($key_path)) { - ::rptMsg(""); - ::rptMsg("".gmtime($key->get_timestamp()).""); - - my @vals = $key->get_list_of_values(); - ::rptMsg(""); - if (scalar(@vals) > 0) { - foreach my $v (@vals) { - my $str = sprintf "%-20s %-40s","get_name()."\">",$v->get_data().""; - ::rptMsg($str); - } - ::rptMsg(""); - } - else { - #::rptMsg($key_path." has no values."); - } - ::rptMsg(""); - } - else { - #::rptMsg($key_path." not found."); - #::logMsg($key_path." not found."); - } + my $root_key = $reg->get_root_key; + + my $key_path = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders"; + my $key; + if ($key = $root_key->get_subkey($key_path)) { + ::rptMsg(""); + ::rptMsg("".gmtime($key->get_timestamp()).""); + + my @vals = $key->get_list_of_values(); + ::rptMsg(""); + if (scalar(@vals) > 0) { + foreach my $v (@vals) { + my $str = sprintf "%-20s %-40s","get_name()."\">",$v->get_data().""; + ::rptMsg($str); + } + ::rptMsg(""); + } + else { + #::rptMsg($key_path." has no values."); + } + ::rptMsg(""); + } + else { + #::rptMsg($key_path." not found."); + #::logMsg($key_path." not found."); + } + } } 1; diff --git a/thirdparty/rr/plugins/officedocs.pl b/thirdparty/rr/plugins/officedocs.pl index 707a5c254f..fac96f52ff 100644 --- a/thirdparty/rr/plugins/officedocs.pl +++ b/thirdparty/rr/plugins/officedocs.pl @@ -37,115 +37,117 @@ sub pluginmain { # ::rptMsg("officedocs v.".$VERSION); # 20110830 [fpi] + banner # ::rptMsg("(".getHive().") ".getShortDescr()."\n"); # 20110830 [fpi] + banner ::rptMsg(""); - my $reg = Parse::Win32Registry->new($ntuser); - my $root_key = $reg->get_root_key; - #::rptMsg("officedocs v.".$VERSION); -# First, let's find out which version of Office is installed - my $version; - my $tag = 0; - my @versions = ("7\.0","8\.0", "9\.0", "10\.0", "11\.0","12\.0"); - foreach my $ver (@versions) { - my $key_path = "Software\\Microsoft\\Office\\".$ver."\\Common\\Open Find"; - if (defined($root_key->get_subkey($key_path))) { - $version = $ver; - $tag = 1; - } - } - - if ($tag) { - #::rptMsg("MSOffice version ".$version." located."); - my $key_path = "Software\\Microsoft\\Office\\".$version; - my $of_key = $root_key->get_subkey($key_path); - ::rptMsg(" ".gmtime($of_key->get_timestamp()).""); - ::rptMsg(""); - if ($of_key) { -# Attempt to retrieve Word docs - my @funcs = ("Open","Save As","File Save"); - foreach my $func (@funcs) { - my $word = "Common\\Open Find\\Microsoft Office Word\\Settings\\".$func."\\File Name MRU"; - my $word_key = $of_key->get_subkey($word); - if ($word_key) { - #::rptMsg($word); - - #::rptMsg(""); - my $value = $word_key->get_value("Value")->get_data(); - my @data = split(/\00/,$value); - ::rptMsg("". @data . ""); - #map{::rptMsg("$_");}@data; - } - else { -# ::rptMsg("Could not access ".$word); - } - #::rptMsg(""); - } -# Attempt to retrieve Excel docs - my $excel = 'Excel\\Recent Files'; - if (my $excel_key = $of_key->get_subkey($excel)) { - #::rptMsg($key_path."\\".$excel); - #::rptMsg("LastWrite Time ".gmtime($excel_key->get_timestamp())." (UTC)"); - my @vals = $excel_key->get_list_of_values(); - if (scalar(@vals) > 0) { - my %files; -# Retrieve values and load into a hash for sorting - foreach my $v (@vals) { - my $val = $v->get_name(); - my $data = $v->get_data(); - my $tag = (split(/File/,$val))[1]; - $files{$tag} = $val.":".$data; - } -# Print sorted content to report file - foreach my $u (sort {$a <=> $b} keys %files) { - my ($val,$data) = split(/:/,$files{$u},2); - ::rptMsg("".$data . ""); - } - } - else { - #::rptMsg($key_path.$excel." has no values."); - } - } - else { - #::rptMsg($key_path.$excel." not found."); - } - #::rptMsg(""); -# Attempt to retrieve PowerPoint docs - my $ppt = 'PowerPoint\\Recent File List'; - if (my $ppt_key = $of_key->get_subkey($ppt)) { - #::rptMsg($key_path."\\".$ppt); - #::rptMsg("LastWrite Time ".gmtime($ppt_key->get_timestamp())." (UTC)"); - my @vals = $ppt_key->get_list_of_values(); - if (scalar(@vals) > 0) { - my %files; -# Retrieve values and load into a hash for sorting - foreach my $v (@vals) { - my $val = $v->get_name(); - my $data = $v->get_data(); - my $tag = (split(/File/,$val))[1]; - $files{$tag} = $val.":".$data; - } -# Print sorted content to report file - foreach my $u (sort {$a <=> $b} keys %files) { - my ($val,$data) = split(/:/,$files{$u},2); - ::rptMsg("".$data . ""); - } - } - else { - #::rptMsg($key_path."\\".$ppt." has no values."); - } - } - else { - #::rptMsg($key_path."\\".$ppt." not found."); - } - } - else { - #::rptMsg("Could not access ".$key_path); - #::logMsg("Could not access ".$key_path); - } - ::rptMsg(""); - } - else { - #::logMsg("MSOffice version not found."); - #::rptMsg("MSOffice version not found."); - } + if (defined(Parse::Win32Registry->new($ntuser))) { + my $reg = Parse::Win32Registry->new($ntuser); + my $root_key = $reg->get_root_key; + #::rptMsg("officedocs v.".$VERSION); + # First, let's find out which version of Office is installed + my $version; + my $tag = 0; + my @versions = ("7\.0","8\.0", "9\.0", "10\.0", "11\.0","12\.0"); + foreach my $ver (@versions) { + my $key_path = "Software\\Microsoft\\Office\\".$ver."\\Common\\Open Find"; + if (defined($root_key->get_subkey($key_path))) { + $version = $ver; + $tag = 1; + } + } + + if ($tag) { + #::rptMsg("MSOffice version ".$version." located."); + my $key_path = "Software\\Microsoft\\Office\\".$version; + my $of_key = $root_key->get_subkey($key_path); + ::rptMsg(" ".gmtime($of_key->get_timestamp()).""); + ::rptMsg(""); + if ($of_key) { + # Attempt to retrieve Word docs + my @funcs = ("Open","Save As","File Save"); + foreach my $func (@funcs) { + my $word = "Common\\Open Find\\Microsoft Office Word\\Settings\\".$func."\\File Name MRU"; + my $word_key = $of_key->get_subkey($word); + if ($word_key) { + #::rptMsg($word); + + #::rptMsg(""); + my $value = $word_key->get_value("Value")->get_data(); + my @data = split(/\00/,$value); + ::rptMsg("". @data . ""); + #map{::rptMsg("$_");}@data; + } + else { + # ::rptMsg("Could not access ".$word); + } + #::rptMsg(""); + } + # Attempt to retrieve Excel docs + my $excel = 'Excel\\Recent Files'; + if (my $excel_key = $of_key->get_subkey($excel)) { + #::rptMsg($key_path."\\".$excel); + #::rptMsg("LastWrite Time ".gmtime($excel_key->get_timestamp())." (UTC)"); + my @vals = $excel_key->get_list_of_values(); + if (scalar(@vals) > 0) { + my %files; + # Retrieve values and load into a hash for sorting + foreach my $v (@vals) { + my $val = $v->get_name(); + my $data = $v->get_data(); + my $tag = (split(/File/,$val))[1]; + $files{$tag} = $val.":".$data; + } + # Print sorted content to report file + foreach my $u (sort {$a <=> $b} keys %files) { + my ($val,$data) = split(/:/,$files{$u},2); + ::rptMsg("".$data . ""); + } + } + else { + #::rptMsg($key_path.$excel." has no values."); + } + } + else { + #::rptMsg($key_path.$excel." not found."); + } + #::rptMsg(""); + # Attempt to retrieve PowerPoint docs + my $ppt = 'PowerPoint\\Recent File List'; + if (my $ppt_key = $of_key->get_subkey($ppt)) { + #::rptMsg($key_path."\\".$ppt); + #::rptMsg("LastWrite Time ".gmtime($ppt_key->get_timestamp())." (UTC)"); + my @vals = $ppt_key->get_list_of_values(); + if (scalar(@vals) > 0) { + my %files; + # Retrieve values and load into a hash for sorting + foreach my $v (@vals) { + my $val = $v->get_name(); + my $data = $v->get_data(); + my $tag = (split(/File/,$val))[1]; + $files{$tag} = $val.":".$data; + } + # Print sorted content to report file + foreach my $u (sort {$a <=> $b} keys %files) { + my ($val,$data) = split(/:/,$files{$u},2); + ::rptMsg("".$data . ""); + } + } + else { + #::rptMsg($key_path."\\".$ppt." has no values."); + } + } + else { + #::rptMsg($key_path."\\".$ppt." not found."); + } + } + else { + #::rptMsg("Could not access ".$key_path); + #::logMsg("Could not access ".$key_path); + } + ::rptMsg(""); + } + else { + #::logMsg("MSOffice version not found."); + #::rptMsg("MSOffice version not found."); + } + } ::rptMsg(""); } diff --git a/thirdparty/rr/plugins/officedocs2010.pl b/thirdparty/rr/plugins/officedocs2010.pl index 2783dc01f6..15073deed3 100644 --- a/thirdparty/rr/plugins/officedocs2010.pl +++ b/thirdparty/rr/plugins/officedocs2010.pl @@ -72,150 +72,151 @@ sub pluginmain { #::logMsg("Launching officedocs2010 v.".$VERSION); #::rptMsg("officedocs2010 v.".$VERSION); # 20110830 [fpi] + banner #::rptMsg("(".getHive().") ".getShortDescr()."\n"); # 20110830 [fpi] + banner - - my $reg = Parse::Win32Registry->new($ntuser); - my $root_key = $reg->get_root_key; - # ::rptMsg("officedocs v.".$VERSION); # 20110830 [fpi] - redundant - my $tag = 0; - my $key_path = "Software\\Microsoft\\Office\\14.0"; - if (defined($root_key->get_subkey($key_path))) { - $tag = 1; - } - - if ($tag) { - #::rptMsg("MSOffice version 2010 located."); - my $key_path = "Software\\Microsoft\\Office\\14.0"; - my $of_key = $root_key->get_subkey($key_path); - if ($of_key) { -# Attempt to retrieve Word docs - my $word = 'Word\\File MRU'; - if (my $word_key = $of_key->get_subkey($word)) { - #::rptMsg($key_path."\\".$word); - #::rptMsg("LastWrite Time ".gmtime($word_key->get_timestamp())." (UTC)"); - my @vals = $word_key->get_list_of_values(); - if (scalar(@vals) > 0) { - my %files; -# Retrieve values and load into a hash for sorting - foreach my $v (@vals) { - my $val = $v->get_name(); - if ($val eq "Max Display") { next; } - my $data = getWinTS($v->get_data()); - my $tag = (split(/Item/,$val))[1]; - $files{$tag} = $val.":".$data; - } -# Print sorted content to report file - foreach my $u (sort {$a <=> $b} keys %files) { - my ($val,$data) = split(/:/,$files{$u},2); - ::rptMsg("".$data . ""); - } - } - else { - #::rptMsg($key_path.$word." has no values."); - } - } - else { - #::rptMsg($key_path.$word." not found."); - } - #::rptMsg(""); -# Attempt to retrieve Excel docs - my $excel = 'Excel\\File MRU'; - if (my $excel_key = $of_key->get_subkey($excel)) { - #::rptMsg($key_path."\\".$excel); - #::rptMsg("LastWrite Time ".gmtime($excel_key->get_timestamp())." (UTC)"); - my @vals = $excel_key->get_list_of_values(); - if (scalar(@vals) > 0) { - my %files; -# Retrieve values and load into a hash for sorting - foreach my $v (@vals) { - my $val = $v->get_name(); - if ($val eq "Max Display") { next; } - my $data = getWinTS($v->get_data()); - my $tag = (split(/Item/,$val))[1]; - $files{$tag} = $val.":".$data; - } -# Print sorted content to report file - foreach my $u (sort {$a <=> $b} keys %files) { - my ($val,$data) = split(/:/,$files{$u},2); - ::rptMsg("".$data . ""); - } - } - else { - #::rptMsg($key_path.$excel." has no values."); - } - } - else { - #::rptMsg($key_path.$excel." not found."); - } - #::rptMsg(""); -# Attempt to retrieve Access docs - my $access = 'Access\\File MRU'; - if (my $access_key = $of_key->get_subkey($access)) { - #::rptMsg($key_path."\\".$access); - #::rptMsg("LastWrite Time ".gmtime($access_key->get_timestamp())." (UTC)"); - my @vals = $access_key->get_list_of_values(); - if (scalar(@vals) > 0) { - my %files; -# Retrieve values and load into a hash for sorting - foreach my $v (@vals) { - my $val = $v->get_name(); - if ($val eq "Max Display") { next; } - my $data = getWinTS($v->get_data()); - my $tag = (split(/Item/,$val))[1]; - $files{$tag} = $val.":".$data; - } -# Print sorted content to report file - foreach my $u (sort {$a <=> $b} keys %files) { - my ($val,$data) = split(/:/,$files{$u},2); - ::rptMsg("".$data . ""); - } - } - else { - # ::rptMsg($key_path.$access." has no values."); - } - } - else { - # ::rptMsg($key_path.$access." not found."); - } - #::rptMsg(""); -# Attempt to retrieve PowerPoint docs - my $ppt = 'PowerPoint\\File MRU'; - if (my $ppt_key = $of_key->get_subkey($ppt)) { - #::rptMsg($key_path."\\".$ppt); - #::rptMsg("LastWrite Time ".gmtime($ppt_key->get_timestamp())." (UTC)"); - my @vals = $ppt_key->get_list_of_values(); - if (scalar(@vals) > 0) { - my %files; -# Retrieve values and load into a hash for sorting - foreach my $v (@vals) { - my $val = $v->get_name(); - if ($val eq "Max Display") { next; } - my $data = getWinTS($v->get_data()); - my $tag = (split(/Item/,$val))[1]; - $files{$tag} = $val.":".$data; - } -# Print sorted content to report file - foreach my $u (sort {$a <=> $b} keys %files) { - my ($val,$data) = split(/:/,$files{$u},2); - ::rptMsg("".$data . ""); - } - } - else { - # ::rptMsg($key_path."\\".$ppt." has no values."); - } - } - else { - # ::rptMsg($key_path."\\".$ppt." not found."); - } - } - else { - # ::rptMsg("Could not access ".$key_path); - # ::logMsg("Could not access ".$key_path); - } - } - else { - # ::logMsg("MSOffice version not found."); - # ::rptMsg("MSOffice version not found."); - } + if (defined(Parse::Win32Registry->new($ntuser))) { + my $reg = Parse::Win32Registry->new($ntuser); + my $root_key = $reg->get_root_key; + # ::rptMsg("officedocs v.".$VERSION); # 20110830 [fpi] - redundant + my $tag = 0; + my $key_path = "Software\\Microsoft\\Office\\14.0"; + if (defined($root_key->get_subkey($key_path))) { + $tag = 1; + } + + if ($tag) { + #::rptMsg("MSOffice version 2010 located."); + my $key_path = "Software\\Microsoft\\Office\\14.0"; + my $of_key = $root_key->get_subkey($key_path); + if ($of_key) { + # Attempt to retrieve Word docs + my $word = 'Word\\File MRU'; + if (my $word_key = $of_key->get_subkey($word)) { + #::rptMsg($key_path."\\".$word); + #::rptMsg("LastWrite Time ".gmtime($word_key->get_timestamp())." (UTC)"); + my @vals = $word_key->get_list_of_values(); + if (scalar(@vals) > 0) { + my %files; + # Retrieve values and load into a hash for sorting + foreach my $v (@vals) { + my $val = $v->get_name(); + if ($val eq "Max Display") { next; } + my $data = getWinTS($v->get_data()); + my $tag = (split(/Item/,$val))[1]; + $files{$tag} = $val.":".$data; + } + # Print sorted content to report file + foreach my $u (sort {$a <=> $b} keys %files) { + my ($val,$data) = split(/:/,$files{$u},2); + ::rptMsg("".$data . ""); + } + } + else { + #::rptMsg($key_path.$word." has no values."); + } + } + else { + #::rptMsg($key_path.$word." not found."); + } + #::rptMsg(""); + # Attempt to retrieve Excel docs + my $excel = 'Excel\\File MRU'; + if (my $excel_key = $of_key->get_subkey($excel)) { + #::rptMsg($key_path."\\".$excel); + #::rptMsg("LastWrite Time ".gmtime($excel_key->get_timestamp())." (UTC)"); + my @vals = $excel_key->get_list_of_values(); + if (scalar(@vals) > 0) { + my %files; + # Retrieve values and load into a hash for sorting + foreach my $v (@vals) { + my $val = $v->get_name(); + if ($val eq "Max Display") { next; } + my $data = getWinTS($v->get_data()); + my $tag = (split(/Item/,$val))[1]; + $files{$tag} = $val.":".$data; + } + # Print sorted content to report file + foreach my $u (sort {$a <=> $b} keys %files) { + my ($val,$data) = split(/:/,$files{$u},2); + ::rptMsg("".$data . ""); + } + } + else { + #::rptMsg($key_path.$excel." has no values."); + } + } + else { + #::rptMsg($key_path.$excel." not found."); + } + #::rptMsg(""); + # Attempt to retrieve Access docs + my $access = 'Access\\File MRU'; + if (my $access_key = $of_key->get_subkey($access)) { + #::rptMsg($key_path."\\".$access); + #::rptMsg("LastWrite Time ".gmtime($access_key->get_timestamp())." (UTC)"); + my @vals = $access_key->get_list_of_values(); + if (scalar(@vals) > 0) { + my %files; + # Retrieve values and load into a hash for sorting + foreach my $v (@vals) { + my $val = $v->get_name(); + if ($val eq "Max Display") { next; } + my $data = getWinTS($v->get_data()); + my $tag = (split(/Item/,$val))[1]; + $files{$tag} = $val.":".$data; + } + # Print sorted content to report file + foreach my $u (sort {$a <=> $b} keys %files) { + my ($val,$data) = split(/:/,$files{$u},2); + ::rptMsg("".$data . ""); + } + } + else { + # ::rptMsg($key_path.$access." has no values."); + } + } + else { + # ::rptMsg($key_path.$access." not found."); + } + #::rptMsg(""); + # Attempt to retrieve PowerPoint docs + my $ppt = 'PowerPoint\\File MRU'; + if (my $ppt_key = $of_key->get_subkey($ppt)) { + #::rptMsg($key_path."\\".$ppt); + #::rptMsg("LastWrite Time ".gmtime($ppt_key->get_timestamp())." (UTC)"); + my @vals = $ppt_key->get_list_of_values(); + if (scalar(@vals) > 0) { + my %files; + # Retrieve values and load into a hash for sorting + foreach my $v (@vals) { + my $val = $v->get_name(); + if ($val eq "Max Display") { next; } + my $data = getWinTS($v->get_data()); + my $tag = (split(/Item/,$val))[1]; + $files{$tag} = $val.":".$data; + } + # Print sorted content to report file + foreach my $u (sort {$a <=> $b} keys %files) { + my ($val,$data) = split(/:/,$files{$u},2); + ::rptMsg("".$data . ""); + } + } + else { + # ::rptMsg($key_path."\\".$ppt." has no values."); + } + } + else { + # ::rptMsg($key_path."\\".$ppt." not found."); + } + } + else { + # ::rptMsg("Could not access ".$key_path); + # ::logMsg("Could not access ".$key_path); + } + } + else { + # ::logMsg("MSOffice version not found."); + # ::rptMsg("MSOffice version not found."); + } + } } 1; diff --git a/thunderbirdparser/nbproject/project.xml b/thunderbirdparser/nbproject/project.xml index 5f285136a0..106d3d64a3 100644 --- a/thunderbirdparser/nbproject/project.xml +++ b/thunderbirdparser/nbproject/project.xml @@ -45,7 +45,7 @@ 10 - 10.19 + 10.20