diff --git a/analyzer/src/main/resources/UserAgents/BrokenUseragents.yaml b/analyzer/src/main/resources/UserAgents/BrokenUseragents.yaml index b6bffacebb..488a52f4c6 100644 --- a/analyzer/src/main/resources/UserAgents/BrokenUseragents.yaml +++ b/analyzer/src/main/resources/UserAgents/BrokenUseragents.yaml @@ -1166,11 +1166,11 @@ config: LayoutEngineNameVersionMajor : 'Gecko 1' LayoutEngineBuild : '20090624' AgentClass : 'Browser' - AgentName : 'Firefox' - AgentVersion : '3.5' - AgentVersionMajor : '3' - AgentNameVersion : 'Firefox 3.5' - AgentNameVersionMajor : 'Firefox 3' + AgentName : 'AskTb{TB_NAME}' + AgentVersion : '{TB_VERSION}' + AgentVersionMajor : '{TB' + AgentNameVersion : 'AskTb{TB_NAME} {TB_VERSION}' + AgentNameVersionMajor : 'AskTb{TB_NAME} {TB' AgentLanguage : 'Arabic' AgentLanguageCode : 'ar' AgentSecurity : 'Strong security' diff --git a/analyzer/src/main/resources/UserAgents/GeckoFirefox.yaml b/analyzer/src/main/resources/UserAgents/GeckoFirefox.yaml index 7c19cf5e15..e68705f484 100644 --- a/analyzer/src/main/resources/UserAgents/GeckoFirefox.yaml +++ b/analyzer/src/main/resources/UserAgents/GeckoFirefox.yaml @@ -92,6 +92,20 @@ config: - 'AgentName : 2003:@Gecko.name[3]="Firefox"' - 'AgentVersion : 2003:@Gecko.version' +- matcher: + variable: + - 'Browser: agent.(2-5)product.name="Gecko"^>' + require: + - 'agent.product.name="Firefox"' # Performance trick + - '@Browser>.name="Firefox"' + - 'IsNull[@Browser.name?OSPatterns]' + - 'IsNull[@Browser.name~"toolbar"]' + extract: + - 'AgentClass : 2005:"Browser"' + - 'AgentName : 2005:@Browser.name' + - 'AgentVersion : 2005:@Browser.version' + + # In some obscure cases we have a parse problem that sends everything inside a comment block - matcher: extract: @@ -568,9 +582,9 @@ config: DeviceCpu : 'x86' DeviceCpuBits : '32' OperatingSystemClass : 'Desktop' - OperatingSystemName : 'Linux' - OperatingSystemVersion : 'x86' - OperatingSystemNameVersion : 'Linux x86' + OperatingSystemName : 'Ultimate Edition' + OperatingSystemVersion : '3.8' + OperatingSystemNameVersion : 'Ultimate Edition 3.8' LayoutEngineClass : 'Browser' LayoutEngineName : 'Gecko' LayoutEngineVersion : '8.0' diff --git a/analyzer/src/main/resources/UserAgents/OSDeviceNames/Generate.sh b/analyzer/src/main/resources/UserAgents/OSDeviceNames/Generate.sh index 428a9b000f..8a39961507 100755 --- a/analyzer/src/main/resources/UserAgents/OSDeviceNames/Generate.sh +++ b/analyzer/src/main/resources/UserAgents/OSDeviceNames/Generate.sh @@ -48,6 +48,16 @@ echo "# limitations under the License." echo "#" echo "config:" +echo "- set:" +echo " name: 'OSPatterns'" +echo " values:" +fgrep -v '#' "${INPUT}" | grep . | sed 's/ *|/|/g;s/| */|/g' | while read line +do + ospattern=$(echo "${line}" | cut -d'|' -f1) + echo " - '${ospattern}'" +done +echo "" + fgrep -v '#' "${INPUT}" | grep . | sed 's/ *|/|/g;s/| */|/g' | while read line do ospattern=$(echo "${line}" | cut -d'|' -f1) @@ -57,16 +67,19 @@ do devbrand=$( echo "${line}" | cut -d'|' -f5) osclass=$( echo "${line}" | cut -d'|' -f6) echo " -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text=\"${ospattern}\"' - extract: - - 'DeviceClass : 111:\"${devclass}\"' - - 'DeviceName : 111:\"${devname}\"' - - 'DeviceBrand : 111:\"${devbrand}\"' - - 'OperatingSystemClass : 150:\"${osclass}\"' - - 'OperatingSystemName : 150:\"${osname}\"' - - 'OperatingSystemVersion: 149:\"??\"' +# ======================================================================= +# ${ospattern} + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text=\"${ospattern}\"' +# extract: +# - 'DeviceClass : 111:\"${devclass}\"' +# - 'DeviceName : 111:\"${devname}\"' +# - 'DeviceBrand : 111:\"${devbrand}\"' +# - 'OperatingSystemClass : 150:\"${osclass}\"' +# - 'OperatingSystemName : 150:\"${osname}\"' +# - 'OperatingSystemVersion: 149:\"??\"' - matcher: extract: @@ -98,8 +111,8 @@ echo " - 'DeviceClass : 111:\"${devclass}\"' - 'DeviceName : 111:\"${devname}\"' - 'DeviceBrand : 111:\"${devbrand}\"' - - 'OperatingSystemClass : 150:\"${osclass}\"' - - 'OperatingSystemName : 150:\"${osname}\"' + - 'OperatingSystemClass : 151:\"${osclass}\"' + - 'OperatingSystemName : 151:\"${osname}\"' - 'OperatingSystemVersion: 149:\"??\"' - matcher: @@ -132,8 +145,8 @@ echo " - 'DeviceClass : 111:\"${devclass}\"' - 'DeviceName : 111:\"${devname}\"' - 'DeviceBrand : 111:\"${devbrand}\"' - - 'OperatingSystemClass : 151:\"${osclass}\"' - - 'OperatingSystemName : 151:\"${osname}\"' + - 'OperatingSystemClass : 152:\"${osclass}\"' + - 'OperatingSystemName : 152:\"${osname}\"' - 'OperatingSystemVersion: 149:\"??\"' - matcher: @@ -143,8 +156,8 @@ echo " - 'DeviceClass : 112:\"${devclass}\"' - 'DeviceName : 112:\"${devname}\"' - 'DeviceBrand : 112:\"${devbrand}\"' - - 'OperatingSystemClass : 152:\"${osclass}\"' - - 'OperatingSystemName : 152:\"${osname}\"' + - 'OperatingSystemClass : 153:\"${osclass}\"' + - 'OperatingSystemName : 153:\"${osname}\"' - 'OperatingSystemVersion: 149:\"??\"' " diff --git a/analyzer/src/main/resources/UserAgents/OSDeviceNames/OperatingSystemDeviceNames.csv b/analyzer/src/main/resources/UserAgents/OSDeviceNames/OperatingSystemDeviceNames.csv index 46b3b6ec96..912bb57911 100644 --- a/analyzer/src/main/resources/UserAgents/OSDeviceNames/OperatingSystemDeviceNames.csv +++ b/analyzer/src/main/resources/UserAgents/OSDeviceNames/OperatingSystemDeviceNames.csv @@ -33,7 +33,7 @@ Mint | Linux Mint | Desktop | Linux Desktop | Linux Mint | Linux Mint | Desktop | Linux Desktop | Unknown | Desktop Edition Linux Mint | Linux Mint | Desktop | Linux Desktop | Unknown | Desktop Moblin | Moblin | Desktop | Linux Desktop | Unknown | Desktop -Namoroka | Namoroka | Desktop | Linux Desktop | Unknown | Desktop +#Namoroka | Namoroka | Desktop | Linux Desktop | Unknown | Desktop NaverBot | NaverBot | Desktop | Linux Desktop | Unknown | Desktop PCLinuxOS | PCLinuxOS | Desktop | Linux Desktop | Unknown | Desktop Slackware | Slackware | Desktop | Linux Desktop | Unknown | Desktop @@ -41,6 +41,7 @@ SUSE | SUSE | Desktop | Linux Desktop | Ubuntu | Ubuntu | Desktop | Linux Desktop | Unknown | Desktop Kubuntu | Kubuntu | Desktop | Linux Desktop | Unknown | Desktop Xubuntu | Xubuntu | Desktop | Linux Desktop | Unknown | Desktop +Ultimate Edition | Ultimate Edition | Desktop | Linux Desktop | Unknown | Desktop Yoper | Yoper | Desktop | Linux Desktop | Unknown | Desktop SugarLabs | SugarLabs | Desktop | Linux Desktop | Unknown | Desktop SunOS | SunOS | Desktop | SUN Microsystems Desktop | Sun Microsystems | Desktop diff --git a/analyzer/src/main/resources/UserAgents/OperatingSystemDeviceNames.yaml b/analyzer/src/main/resources/UserAgents/OperatingSystemDeviceNames.yaml index 4a9ccf361b..ed8d8698bd 100644 --- a/analyzer/src/main/resources/UserAgents/OperatingSystemDeviceNames.yaml +++ b/analyzer/src/main/resources/UserAgents/OperatingSystemDeviceNames.yaml @@ -18,17 +18,64 @@ # limitations under the License. # config: - -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="ASPLinux"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"ASPLinux"' - - 'OperatingSystemVersion: 149:"??"' +- set: + name: 'OSPatterns' + values: + - 'ASPLinux' + - 'CentOS' + - 'Red Hat' + - 'Debian' + - 'Debian GNU' + - 'Fedora' + - 'FoxOS' + - 'Joli OS' + - 'JoliCloud' + - 'Linpus' + - 'Linspire' + - 'Mandriva Linux' + - 'Mandriva' + - 'Mint' + - 'Linux Mint' + - 'Edition Linux Mint' + - 'Moblin' + - 'NaverBot' + - 'PCLinuxOS' + - 'Slackware' + - 'SUSE' + - 'Ubuntu' + - 'Kubuntu' + - 'Xubuntu' + - 'Ultimate Edition' + - 'Yoper' + - 'SugarLabs' + - 'SunOS' + - 'Solaris' + - 'illumOS' + - 'MeeGo' + - 'Symbian' + - 'SymbianOS' + - 'Symbian OS' + - 'PalmSource' + - 'DragonFly' + - 'FreeBSD' + - 'NetBSD' + - 'OpenBSD' + - 'hpwOS' + + +# ======================================================================= +# ASPLinux + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="ASPLinux"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"Linux Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"ASPLinux"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -60,8 +107,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"ASPLinux"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"ASPLinux"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -94,8 +141,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"ASPLinux"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"ASPLinux"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -105,22 +152,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"Linux Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"ASPLinux"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"ASPLinux"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="CentOS"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"CentOS"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# CentOS + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="CentOS"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"Linux Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"CentOS"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -152,8 +202,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"CentOS"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"CentOS"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -186,8 +236,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"CentOS"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"CentOS"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -197,22 +247,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"Linux Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"CentOS"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"CentOS"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="Red Hat"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Red Hat"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# Red Hat + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="Red Hat"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"Linux Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"Red Hat"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -244,8 +297,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Red Hat"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"Red Hat"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -278,8 +331,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"Red Hat"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"Red Hat"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -289,22 +342,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"Linux Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"Red Hat"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"Red Hat"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="Debian"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Debian"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# Debian + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="Debian"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"Linux Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"Debian"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -336,8 +392,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Debian"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"Debian"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -370,8 +426,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"Debian"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"Debian"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -381,22 +437,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"Linux Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"Debian"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"Debian"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="Debian GNU"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Debian"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# Debian GNU + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="Debian GNU"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"Linux Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"Debian"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -428,8 +487,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Debian"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"Debian"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -462,8 +521,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"Debian"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"Debian"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -473,22 +532,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"Linux Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"Debian"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"Debian"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="Fedora"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Fedora"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# Fedora + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="Fedora"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"Linux Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"Fedora"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -520,8 +582,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Fedora"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"Fedora"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -554,8 +616,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"Fedora"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"Fedora"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -565,22 +627,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"Linux Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"Fedora"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"Fedora"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="FoxOS"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"FoxOS"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# FoxOS + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="FoxOS"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"Linux Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"FoxOS"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -612,8 +677,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"FoxOS"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"FoxOS"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -646,8 +711,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"FoxOS"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"FoxOS"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -657,22 +722,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"Linux Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"FoxOS"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"FoxOS"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="Joli OS"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Joli OS"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# Joli OS + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="Joli OS"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"Linux Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"Joli OS"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -704,8 +772,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Joli OS"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"Joli OS"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -738,8 +806,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"Joli OS"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"Joli OS"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -749,22 +817,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"Linux Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"Joli OS"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"Joli OS"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="JoliCloud"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Joli Cloud"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# JoliCloud + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="JoliCloud"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"Linux Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"Joli Cloud"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -796,8 +867,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Joli Cloud"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"Joli Cloud"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -830,8 +901,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"Joli Cloud"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"Joli Cloud"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -841,22 +912,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"Linux Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"Joli Cloud"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"Joli Cloud"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="Linpus"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Linpus"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# Linpus + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="Linpus"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"Linux Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"Linpus"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -888,8 +962,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Linpus"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"Linpus"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -922,8 +996,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"Linpus"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"Linpus"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -933,22 +1007,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"Linux Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"Linpus"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"Linpus"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="Linspire"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Linspire"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# Linspire + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="Linspire"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"Linux Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"Linspire"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -980,8 +1057,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Linspire"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"Linspire"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -1014,8 +1091,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"Linspire"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"Linspire"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -1025,22 +1102,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"Linux Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"Linspire"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"Linspire"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="Mandriva Linux"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Mandriva Linux"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# Mandriva Linux + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="Mandriva Linux"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"Linux Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"Mandriva Linux"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -1072,8 +1152,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Mandriva Linux"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"Mandriva Linux"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -1106,8 +1186,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"Mandriva Linux"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"Mandriva Linux"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -1117,22 +1197,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"Linux Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"Mandriva Linux"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"Mandriva Linux"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="Mandriva"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Mandriva"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# Mandriva + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="Mandriva"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"Linux Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"Mandriva"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -1164,8 +1247,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Mandriva"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"Mandriva"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -1198,8 +1281,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"Mandriva"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"Mandriva"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -1209,22 +1292,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"Linux Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"Mandriva"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"Mandriva"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="Mint"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Linux Mint"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# Mint + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="Mint"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"Linux Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"Linux Mint"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -1256,8 +1342,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Linux Mint"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"Linux Mint"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -1290,8 +1376,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"Linux Mint"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"Linux Mint"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -1301,22 +1387,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"Linux Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"Linux Mint"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"Linux Mint"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="Linux Mint"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Linux Mint"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# Linux Mint + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="Linux Mint"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"Linux Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"Linux Mint"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -1348,8 +1437,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Linux Mint"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"Linux Mint"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -1382,8 +1471,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"Linux Mint"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"Linux Mint"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -1393,22 +1482,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"Linux Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"Linux Mint"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"Linux Mint"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="Edition Linux Mint"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Linux Mint"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# Edition Linux Mint + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="Edition Linux Mint"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"Linux Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"Linux Mint"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -1440,8 +1532,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Linux Mint"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"Linux Mint"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -1474,8 +1566,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"Linux Mint"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"Linux Mint"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -1485,22 +1577,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"Linux Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"Linux Mint"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"Linux Mint"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="Moblin"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Moblin"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# Moblin + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="Moblin"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"Linux Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"Moblin"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -1532,8 +1627,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Moblin"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"Moblin"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -1566,125 +1661,36 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"Moblin"' - - 'OperatingSystemVersion: 149:"??"' - -- matcher: - require: - - 'agent.product.name[-2]="Moblin"' - extract: - - 'DeviceClass : 112:"Desktop"' - - 'DeviceName : 112:"Linux Desktop"' - - 'DeviceBrand : 112:"Unknown"' - 'OperatingSystemClass : 152:"Desktop"' - 'OperatingSystemName : 152:"Moblin"' - 'OperatingSystemVersion: 149:"??"' - - -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="Namoroka"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Namoroka"' - - 'OperatingSystemVersion: 149:"??"' - -- matcher: - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Namoroka"' - - 'OperatingSystemVersion: 150:CleanVersion[agent.(1)product.(1)comments.entry.product.name="Namoroka"^.(1)version]' - -# Only if the second version field is NOT a type of CPU. -- matcher: - variable: - - 'Version: agent.(1)product.(1)comments.entry.product.name="Namoroka"^.(2)version' - require: - - 'IsNull[LookUp[CPUArchitectures;@Version]]' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Namoroka"' - - 'OperatingSystemVersion: 151:CleanVersion[@Version]' - -- matcher: - require: - - 'agent.product.(1)comments.entry.text="Namoroka"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Namoroka"' - - 'OperatingSystemVersion: 149:"??"' - - matcher: - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Namoroka"' - - 'OperatingSystemVersion: 150:CleanVersion[agent.product.name="Namoroka"^.(1)version]' - -# Only if the second version field is NOT a type of CPU. -- matcher: - variable: - - 'Version: agent.product.name="Namoroka"^.(2)version' require: - - 'IsNull[LookUp[CPUArchitectures;@Version]]' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Namoroka"' - - 'OperatingSystemVersion: 151:CleanVersion[@Version]' - -- matcher: - require: - - 'agent.product.name[-1]="Namoroka"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"Namoroka"' - - 'OperatingSystemVersion: 149:"??"' - -- matcher: - require: - - 'agent.product.name[-2]="Namoroka"' + - 'agent.product.name[-2]="Moblin"' extract: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"Linux Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"Namoroka"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"Moblin"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="NaverBot"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"NaverBot"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# NaverBot + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="NaverBot"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"Linux Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"NaverBot"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -1716,8 +1722,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"NaverBot"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"NaverBot"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -1750,8 +1756,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"NaverBot"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"NaverBot"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -1761,22 +1767,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"Linux Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"NaverBot"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"NaverBot"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="PCLinuxOS"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"PCLinuxOS"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# PCLinuxOS + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="PCLinuxOS"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"Linux Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"PCLinuxOS"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -1808,8 +1817,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"PCLinuxOS"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"PCLinuxOS"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -1842,8 +1851,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"PCLinuxOS"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"PCLinuxOS"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -1853,22 +1862,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"Linux Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"PCLinuxOS"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"PCLinuxOS"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="Slackware"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Slackware"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# Slackware + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="Slackware"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"Linux Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"Slackware"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -1900,8 +1912,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Slackware"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"Slackware"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -1934,8 +1946,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"Slackware"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"Slackware"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -1945,22 +1957,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"Linux Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"Slackware"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"Slackware"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="SUSE"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"SUSE"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# SUSE + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="SUSE"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"Linux Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"SUSE"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -1992,8 +2007,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"SUSE"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"SUSE"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -2026,8 +2041,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"SUSE"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"SUSE"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -2037,22 +2052,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"Linux Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"SUSE"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"SUSE"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="Ubuntu"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Ubuntu"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# Ubuntu + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="Ubuntu"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"Linux Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"Ubuntu"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -2084,8 +2102,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Ubuntu"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"Ubuntu"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -2118,8 +2136,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"Ubuntu"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"Ubuntu"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -2129,22 +2147,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"Linux Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"Ubuntu"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"Ubuntu"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="Kubuntu"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Kubuntu"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# Kubuntu + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="Kubuntu"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"Linux Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"Kubuntu"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -2176,8 +2197,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Kubuntu"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"Kubuntu"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -2210,8 +2231,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"Kubuntu"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"Kubuntu"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -2221,22 +2242,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"Linux Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"Kubuntu"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"Kubuntu"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="Xubuntu"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Xubuntu"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# Xubuntu + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="Xubuntu"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"Linux Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"Xubuntu"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -2268,8 +2292,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Xubuntu"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"Xubuntu"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -2302,8 +2326,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"Xubuntu"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"Xubuntu"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -2313,23 +2337,121 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"Linux Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"Xubuntu"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"Xubuntu"' - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# Ultimate Edition + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="Ultimate Edition"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"Linux Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"Ultimate Edition"' +# - 'OperatingSystemVersion: 149:"??"' + +- matcher: + extract: + - 'DeviceClass : 111:"Desktop"' + - 'DeviceName : 111:"Linux Desktop"' + - 'DeviceBrand : 111:"Unknown"' + - 'OperatingSystemClass : 150:"Desktop"' + - 'OperatingSystemName : 150:"Ultimate Edition"' + - 'OperatingSystemVersion: 150:CleanVersion[agent.(1)product.(1)comments.entry.product.name="Ultimate Edition"^.(1)version]' + +# Only if the second version field is NOT a type of CPU. +- matcher: + variable: + - 'Version: agent.(1)product.(1)comments.entry.product.name="Ultimate Edition"^.(2)version' + require: + - 'IsNull[LookUp[CPUArchitectures;@Version]]' + extract: + - 'DeviceClass : 111:"Desktop"' + - 'DeviceName : 111:"Linux Desktop"' + - 'DeviceBrand : 111:"Unknown"' + - 'OperatingSystemClass : 150:"Desktop"' + - 'OperatingSystemName : 150:"Ultimate Edition"' + - 'OperatingSystemVersion: 151:CleanVersion[@Version]' + +- matcher: + require: + - 'agent.product.(1)comments.entry.text="Ultimate Edition"' + extract: + - 'DeviceClass : 111:"Desktop"' + - 'DeviceName : 111:"Linux Desktop"' + - 'DeviceBrand : 111:"Unknown"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"Ultimate Edition"' + - 'OperatingSystemVersion: 149:"??"' + - matcher: + extract: + - 'DeviceClass : 111:"Desktop"' + - 'DeviceName : 111:"Linux Desktop"' + - 'DeviceBrand : 111:"Unknown"' + - 'OperatingSystemClass : 150:"Desktop"' + - 'OperatingSystemName : 150:"Ultimate Edition"' + - 'OperatingSystemVersion: 150:CleanVersion[agent.product.name="Ultimate Edition"^.(1)version]' + +# Only if the second version field is NOT a type of CPU. +- matcher: + variable: + - 'Version: agent.product.name="Ultimate Edition"^.(2)version' require: - - 'agent.(1)product.(1)comments.entry.text="Yoper"' + - 'IsNull[LookUp[CPUArchitectures;@Version]]' extract: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Yoper"' + - 'OperatingSystemName : 150:"Ultimate Edition"' + - 'OperatingSystemVersion: 151:CleanVersion[@Version]' + +- matcher: + require: + - 'agent.product.name[-1]="Ultimate Edition"' + extract: + - 'DeviceClass : 111:"Desktop"' + - 'DeviceName : 111:"Linux Desktop"' + - 'DeviceBrand : 111:"Unknown"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"Ultimate Edition"' - 'OperatingSystemVersion: 149:"??"' +- matcher: + require: + - 'agent.product.name[-2]="Ultimate Edition"' + extract: + - 'DeviceClass : 112:"Desktop"' + - 'DeviceName : 112:"Linux Desktop"' + - 'DeviceBrand : 112:"Unknown"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"Ultimate Edition"' + - 'OperatingSystemVersion: 149:"??"' + + + +# ======================================================================= +# Yoper + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="Yoper"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"Linux Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"Yoper"' +# - 'OperatingSystemVersion: 149:"??"' + - matcher: extract: - 'DeviceClass : 111:"Desktop"' @@ -2360,8 +2482,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Yoper"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"Yoper"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -2394,8 +2516,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"Yoper"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"Yoper"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -2405,22 +2527,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"Linux Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"Yoper"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"Yoper"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="SugarLabs"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"SugarLabs"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# SugarLabs + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="SugarLabs"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"Linux Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"SugarLabs"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -2452,8 +2577,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"SugarLabs"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"SugarLabs"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -2486,34 +2611,37 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"SugarLabs"' - - 'OperatingSystemVersion: 149:"??"' - -- matcher: - require: - - 'agent.product.name[-2]="SugarLabs"' - extract: - - 'DeviceClass : 112:"Desktop"' - - 'DeviceName : 112:"Linux Desktop"' - - 'DeviceBrand : 112:"Unknown"' - 'OperatingSystemClass : 152:"Desktop"' - 'OperatingSystemName : 152:"SugarLabs"' - 'OperatingSystemVersion: 149:"??"' - - - matcher: require: - - 'agent.(1)product.(1)comments.entry.text="SunOS"' + - 'agent.product.name[-2]="SugarLabs"' extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"SUN Microsystems Desktop"' - - 'DeviceBrand : 111:"Sun Microsystems"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"SunOS"' + - 'DeviceClass : 112:"Desktop"' + - 'DeviceName : 112:"Linux Desktop"' + - 'DeviceBrand : 112:"Unknown"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"SugarLabs"' - 'OperatingSystemVersion: 149:"??"' + + +# ======================================================================= +# SunOS + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="SunOS"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"SUN Microsystems Desktop"' +# - 'DeviceBrand : 111:"Sun Microsystems"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"SunOS"' +# - 'OperatingSystemVersion: 149:"??"' + - matcher: extract: - 'DeviceClass : 111:"Desktop"' @@ -2544,8 +2672,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"SUN Microsystems Desktop"' - 'DeviceBrand : 111:"Sun Microsystems"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"SunOS"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"SunOS"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -2578,8 +2706,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"SUN Microsystems Desktop"' - 'DeviceBrand : 111:"Sun Microsystems"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"SunOS"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"SunOS"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -2589,22 +2717,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"SUN Microsystems Desktop"' - 'DeviceBrand : 112:"Sun Microsystems"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"SunOS"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"SunOS"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="Solaris"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"Linux Desktop"' - - 'DeviceBrand : 111:"Sun Microsystems"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Solaris"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# Solaris + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="Solaris"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"Linux Desktop"' +# - 'DeviceBrand : 111:"Sun Microsystems"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"Solaris"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -2636,8 +2767,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Sun Microsystems"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"Solaris"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"Solaris"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -2670,8 +2801,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"Linux Desktop"' - 'DeviceBrand : 111:"Sun Microsystems"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"Solaris"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"Solaris"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -2681,22 +2812,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"Linux Desktop"' - 'DeviceBrand : 112:"Sun Microsystems"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"Solaris"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"Solaris"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="illumOS"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"OpenSolaris Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"illumOS"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# illumOS + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="illumOS"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"OpenSolaris Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"illumOS"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -2728,8 +2862,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"OpenSolaris Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"illumOS"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"illumOS"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -2762,8 +2896,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"OpenSolaris Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"illumOS"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"illumOS"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -2773,22 +2907,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"OpenSolaris Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"illumOS"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"illumOS"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="MeeGo"' - extract: - - 'DeviceClass : 111:"Mobile"' - - 'DeviceName : 111:"MeeGo Device"' - - 'DeviceBrand : 111:"Nokia"' - - 'OperatingSystemClass : 150:"Mobile"' - - 'OperatingSystemName : 150:"MeeGo"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# MeeGo + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="MeeGo"' +# extract: +# - 'DeviceClass : 111:"Mobile"' +# - 'DeviceName : 111:"MeeGo Device"' +# - 'DeviceBrand : 111:"Nokia"' +# - 'OperatingSystemClass : 150:"Mobile"' +# - 'OperatingSystemName : 150:"MeeGo"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -2820,8 +2957,8 @@ config: - 'DeviceClass : 111:"Mobile"' - 'DeviceName : 111:"MeeGo Device"' - 'DeviceBrand : 111:"Nokia"' - - 'OperatingSystemClass : 150:"Mobile"' - - 'OperatingSystemName : 150:"MeeGo"' + - 'OperatingSystemClass : 151:"Mobile"' + - 'OperatingSystemName : 151:"MeeGo"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -2854,8 +2991,8 @@ config: - 'DeviceClass : 111:"Mobile"' - 'DeviceName : 111:"MeeGo Device"' - 'DeviceBrand : 111:"Nokia"' - - 'OperatingSystemClass : 151:"Mobile"' - - 'OperatingSystemName : 151:"MeeGo"' + - 'OperatingSystemClass : 152:"Mobile"' + - 'OperatingSystemName : 152:"MeeGo"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -2865,22 +3002,25 @@ config: - 'DeviceClass : 112:"Mobile"' - 'DeviceName : 112:"MeeGo Device"' - 'DeviceBrand : 112:"Nokia"' - - 'OperatingSystemClass : 152:"Mobile"' - - 'OperatingSystemName : 152:"MeeGo"' + - 'OperatingSystemClass : 153:"Mobile"' + - 'OperatingSystemName : 153:"MeeGo"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="Symbian"' - extract: - - 'DeviceClass : 111:"Phone"' - - 'DeviceName : 111:"Symbian Phone"' - - 'DeviceBrand : 111:"Nokia"' - - 'OperatingSystemClass : 150:"Mobile"' - - 'OperatingSystemName : 150:"Symbian"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# Symbian + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="Symbian"' +# extract: +# - 'DeviceClass : 111:"Phone"' +# - 'DeviceName : 111:"Symbian Phone"' +# - 'DeviceBrand : 111:"Nokia"' +# - 'OperatingSystemClass : 150:"Mobile"' +# - 'OperatingSystemName : 150:"Symbian"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -2912,8 +3052,8 @@ config: - 'DeviceClass : 111:"Phone"' - 'DeviceName : 111:"Symbian Phone"' - 'DeviceBrand : 111:"Nokia"' - - 'OperatingSystemClass : 150:"Mobile"' - - 'OperatingSystemName : 150:"Symbian"' + - 'OperatingSystemClass : 151:"Mobile"' + - 'OperatingSystemName : 151:"Symbian"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -2946,8 +3086,8 @@ config: - 'DeviceClass : 111:"Phone"' - 'DeviceName : 111:"Symbian Phone"' - 'DeviceBrand : 111:"Nokia"' - - 'OperatingSystemClass : 151:"Mobile"' - - 'OperatingSystemName : 151:"Symbian"' + - 'OperatingSystemClass : 152:"Mobile"' + - 'OperatingSystemName : 152:"Symbian"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -2957,22 +3097,25 @@ config: - 'DeviceClass : 112:"Phone"' - 'DeviceName : 112:"Symbian Phone"' - 'DeviceBrand : 112:"Nokia"' - - 'OperatingSystemClass : 152:"Mobile"' - - 'OperatingSystemName : 152:"Symbian"' + - 'OperatingSystemClass : 153:"Mobile"' + - 'OperatingSystemName : 153:"Symbian"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="SymbianOS"' - extract: - - 'DeviceClass : 111:"Phone"' - - 'DeviceName : 111:"Symbian Phone"' - - 'DeviceBrand : 111:"Nokia"' - - 'OperatingSystemClass : 150:"Mobile"' - - 'OperatingSystemName : 150:"SymbianOS"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# SymbianOS + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="SymbianOS"' +# extract: +# - 'DeviceClass : 111:"Phone"' +# - 'DeviceName : 111:"Symbian Phone"' +# - 'DeviceBrand : 111:"Nokia"' +# - 'OperatingSystemClass : 150:"Mobile"' +# - 'OperatingSystemName : 150:"SymbianOS"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -3004,8 +3147,8 @@ config: - 'DeviceClass : 111:"Phone"' - 'DeviceName : 111:"Symbian Phone"' - 'DeviceBrand : 111:"Nokia"' - - 'OperatingSystemClass : 150:"Mobile"' - - 'OperatingSystemName : 150:"SymbianOS"' + - 'OperatingSystemClass : 151:"Mobile"' + - 'OperatingSystemName : 151:"SymbianOS"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -3038,8 +3181,8 @@ config: - 'DeviceClass : 111:"Phone"' - 'DeviceName : 111:"Symbian Phone"' - 'DeviceBrand : 111:"Nokia"' - - 'OperatingSystemClass : 151:"Mobile"' - - 'OperatingSystemName : 151:"SymbianOS"' + - 'OperatingSystemClass : 152:"Mobile"' + - 'OperatingSystemName : 152:"SymbianOS"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -3049,22 +3192,25 @@ config: - 'DeviceClass : 112:"Phone"' - 'DeviceName : 112:"Symbian Phone"' - 'DeviceBrand : 112:"Nokia"' - - 'OperatingSystemClass : 152:"Mobile"' - - 'OperatingSystemName : 152:"SymbianOS"' + - 'OperatingSystemClass : 153:"Mobile"' + - 'OperatingSystemName : 153:"SymbianOS"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="Symbian OS"' - extract: - - 'DeviceClass : 111:"Phone"' - - 'DeviceName : 111:"Symbian Phone"' - - 'DeviceBrand : 111:"Nokia"' - - 'OperatingSystemClass : 150:"Mobile"' - - 'OperatingSystemName : 150:"SymbianOS"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# Symbian OS + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="Symbian OS"' +# extract: +# - 'DeviceClass : 111:"Phone"' +# - 'DeviceName : 111:"Symbian Phone"' +# - 'DeviceBrand : 111:"Nokia"' +# - 'OperatingSystemClass : 150:"Mobile"' +# - 'OperatingSystemName : 150:"SymbianOS"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -3096,8 +3242,8 @@ config: - 'DeviceClass : 111:"Phone"' - 'DeviceName : 111:"Symbian Phone"' - 'DeviceBrand : 111:"Nokia"' - - 'OperatingSystemClass : 150:"Mobile"' - - 'OperatingSystemName : 150:"SymbianOS"' + - 'OperatingSystemClass : 151:"Mobile"' + - 'OperatingSystemName : 151:"SymbianOS"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -3130,8 +3276,8 @@ config: - 'DeviceClass : 111:"Phone"' - 'DeviceName : 111:"Symbian Phone"' - 'DeviceBrand : 111:"Nokia"' - - 'OperatingSystemClass : 151:"Mobile"' - - 'OperatingSystemName : 151:"SymbianOS"' + - 'OperatingSystemClass : 152:"Mobile"' + - 'OperatingSystemName : 152:"SymbianOS"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -3141,22 +3287,25 @@ config: - 'DeviceClass : 112:"Phone"' - 'DeviceName : 112:"Symbian Phone"' - 'DeviceBrand : 112:"Nokia"' - - 'OperatingSystemClass : 152:"Mobile"' - - 'OperatingSystemName : 152:"SymbianOS"' + - 'OperatingSystemClass : 153:"Mobile"' + - 'OperatingSystemName : 153:"SymbianOS"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="PalmSource"' - extract: - - 'DeviceClass : 111:"Mobile"' - - 'DeviceName : 111:"PalmOS PDA"' - - 'DeviceBrand : 111:"Palm"' - - 'OperatingSystemClass : 150:"Mobile"' - - 'OperatingSystemName : 150:"PalmSource"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# PalmSource + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="PalmSource"' +# extract: +# - 'DeviceClass : 111:"Mobile"' +# - 'DeviceName : 111:"PalmOS PDA"' +# - 'DeviceBrand : 111:"Palm"' +# - 'OperatingSystemClass : 150:"Mobile"' +# - 'OperatingSystemName : 150:"PalmSource"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -3188,8 +3337,8 @@ config: - 'DeviceClass : 111:"Mobile"' - 'DeviceName : 111:"PalmOS PDA"' - 'DeviceBrand : 111:"Palm"' - - 'OperatingSystemClass : 150:"Mobile"' - - 'OperatingSystemName : 150:"PalmSource"' + - 'OperatingSystemClass : 151:"Mobile"' + - 'OperatingSystemName : 151:"PalmSource"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -3222,8 +3371,8 @@ config: - 'DeviceClass : 111:"Mobile"' - 'DeviceName : 111:"PalmOS PDA"' - 'DeviceBrand : 111:"Palm"' - - 'OperatingSystemClass : 151:"Mobile"' - - 'OperatingSystemName : 151:"PalmSource"' + - 'OperatingSystemClass : 152:"Mobile"' + - 'OperatingSystemName : 152:"PalmSource"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -3233,22 +3382,25 @@ config: - 'DeviceClass : 112:"Mobile"' - 'DeviceName : 112:"PalmOS PDA"' - 'DeviceBrand : 112:"Palm"' - - 'OperatingSystemClass : 152:"Mobile"' - - 'OperatingSystemName : 152:"PalmSource"' + - 'OperatingSystemClass : 153:"Mobile"' + - 'OperatingSystemName : 153:"PalmSource"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="DragonFly"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"DragonFly BSD Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"DragonFly BSD"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# DragonFly + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="DragonFly"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"DragonFly BSD Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"DragonFly BSD"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -3280,8 +3432,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"DragonFly BSD Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"DragonFly BSD"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"DragonFly BSD"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -3314,8 +3466,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"DragonFly BSD Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"DragonFly BSD"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"DragonFly BSD"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -3325,22 +3477,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"DragonFly BSD Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"DragonFly BSD"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"DragonFly BSD"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="FreeBSD"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"FreeBSD Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"FreeBSD"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# FreeBSD + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="FreeBSD"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"FreeBSD Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"FreeBSD"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -3372,8 +3527,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"FreeBSD Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"FreeBSD"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"FreeBSD"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -3406,8 +3561,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"FreeBSD Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"FreeBSD"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"FreeBSD"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -3417,22 +3572,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"FreeBSD Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"FreeBSD"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"FreeBSD"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="NetBSD"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"NetBSD Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"NetBSD"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# NetBSD + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="NetBSD"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"NetBSD Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"NetBSD"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -3464,8 +3622,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"NetBSD Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"NetBSD"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"NetBSD"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -3498,8 +3656,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"NetBSD Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"NetBSD"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"NetBSD"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -3509,22 +3667,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"NetBSD Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"NetBSD"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"NetBSD"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="OpenBSD"' - extract: - - 'DeviceClass : 111:"Desktop"' - - 'DeviceName : 111:"OpenBSD Desktop"' - - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"OpenBSD"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# OpenBSD + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="OpenBSD"' +# extract: +# - 'DeviceClass : 111:"Desktop"' +# - 'DeviceName : 111:"OpenBSD Desktop"' +# - 'DeviceBrand : 111:"Unknown"' +# - 'OperatingSystemClass : 150:"Desktop"' +# - 'OperatingSystemName : 150:"OpenBSD"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -3556,8 +3717,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"OpenBSD Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 150:"Desktop"' - - 'OperatingSystemName : 150:"OpenBSD"' + - 'OperatingSystemClass : 151:"Desktop"' + - 'OperatingSystemName : 151:"OpenBSD"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -3590,8 +3751,8 @@ config: - 'DeviceClass : 111:"Desktop"' - 'DeviceName : 111:"OpenBSD Desktop"' - 'DeviceBrand : 111:"Unknown"' - - 'OperatingSystemClass : 151:"Desktop"' - - 'OperatingSystemName : 151:"OpenBSD"' + - 'OperatingSystemClass : 152:"Desktop"' + - 'OperatingSystemName : 152:"OpenBSD"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -3601,22 +3762,25 @@ config: - 'DeviceClass : 112:"Desktop"' - 'DeviceName : 112:"OpenBSD Desktop"' - 'DeviceBrand : 112:"Unknown"' - - 'OperatingSystemClass : 152:"Desktop"' - - 'OperatingSystemName : 152:"OpenBSD"' + - 'OperatingSystemClass : 153:"Desktop"' + - 'OperatingSystemName : 153:"OpenBSD"' - 'OperatingSystemVersion: 149:"??"' -- matcher: - require: - - 'agent.(1)product.(1)comments.entry.text="hpwOS"' - extract: - - 'DeviceClass : 111:"Tablet"' - - 'DeviceName : 111:"HP WebOS Tablet"' - - 'DeviceBrand : 111:"HP"' - - 'OperatingSystemClass : 150:"Mobile"' - - 'OperatingSystemName : 150:"HP WebOS"' - - 'OperatingSystemVersion: 149:"??"' +# ======================================================================= +# hpwOS + +#- matcher: +# require: +# - 'agent.(1)product.(1)comments.entry.text="hpwOS"' +# extract: +# - 'DeviceClass : 111:"Tablet"' +# - 'DeviceName : 111:"HP WebOS Tablet"' +# - 'DeviceBrand : 111:"HP"' +# - 'OperatingSystemClass : 150:"Mobile"' +# - 'OperatingSystemName : 150:"HP WebOS"' +# - 'OperatingSystemVersion: 149:"??"' - matcher: extract: @@ -3648,8 +3812,8 @@ config: - 'DeviceClass : 111:"Tablet"' - 'DeviceName : 111:"HP WebOS Tablet"' - 'DeviceBrand : 111:"HP"' - - 'OperatingSystemClass : 150:"Mobile"' - - 'OperatingSystemName : 150:"HP WebOS"' + - 'OperatingSystemClass : 151:"Mobile"' + - 'OperatingSystemName : 151:"HP WebOS"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -3682,8 +3846,8 @@ config: - 'DeviceClass : 111:"Tablet"' - 'DeviceName : 111:"HP WebOS Tablet"' - 'DeviceBrand : 111:"HP"' - - 'OperatingSystemClass : 151:"Mobile"' - - 'OperatingSystemName : 151:"HP WebOS"' + - 'OperatingSystemClass : 152:"Mobile"' + - 'OperatingSystemName : 152:"HP WebOS"' - 'OperatingSystemVersion: 149:"??"' - matcher: @@ -3693,8 +3857,8 @@ config: - 'DeviceClass : 112:"Tablet"' - 'DeviceName : 112:"HP WebOS Tablet"' - 'DeviceBrand : 112:"HP"' - - 'OperatingSystemClass : 152:"Mobile"' - - 'OperatingSystemName : 152:"HP WebOS"' + - 'OperatingSystemClass : 153:"Mobile"' + - 'OperatingSystemName : 153:"HP WebOS"' - 'OperatingSystemVersion: 149:"??"' diff --git a/analyzer/src/main/resources/UserAgents/Ubuntu.yaml b/analyzer/src/main/resources/UserAgents/Ubuntu.yaml new file mode 100644 index 0000000000..59f9754f6b --- /dev/null +++ b/analyzer/src/main/resources/UserAgents/Ubuntu.yaml @@ -0,0 +1,952 @@ +# +# Yet Another UserAgent Analyzer +# Copyright (C) 2013-2018 Niels Basjes +# +# 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. +# + +config: + +- matcher: + variable: + - 'UbuntuName:agent.text[1]~"buntu"' + extract: + - 'DeviceClass : 1:"Desktop"' + - 'DeviceName : 1:"Linux Desktop"' + - 'OperatingSystemClass : 96:"Desktop"' + - 'OperatingSystemName : 96:@UbuntuName' + - 'OperatingSystemVersion : 96:"??"' + +- matcher: + variable: + - 'UbuntuName:agent.product.name[1]~"buntu"' + extract: + - 'DeviceClass : 1:"Desktop"' + - 'DeviceName : 1:"Linux Desktop"' + - 'OperatingSystemClass : 97:"Desktop"' + - 'OperatingSystemName : 97:@UbuntuName' + - 'OperatingSystemVersion : 97:"??"' + +- matcher: + variable: + - 'UbuntuName:agent.product.comments.entry[1]~"buntu"' + extract: + - 'DeviceClass : 1:"Desktop"' + - 'DeviceName : 1:"Linux Desktop"' + - 'OperatingSystemClass : 97:"Desktop"' + - 'OperatingSystemName : 97:@UbuntuName' + - 'OperatingSystemVersion : 97:"??"' + +- matcher: + variable: + - 'UbuntuName:agent.product.comments.entry[1]~"buntu"' + require: + - 'IsNull[@UbuntuName@[2]="package"]' + extract: + - 'DeviceClass : 1:"Desktop"' + - 'DeviceName : 1:"Linux Desktop"' + - 'OperatingSystemClass : 98:"Desktop"' + - 'OperatingSystemName : 98:@UbuntuName' + - 'OperatingSystemVersion : 98:@UbuntuName.product.version' + +- matcher: + variable: + - 'UbuntuName:agent.product.name[1]~"buntu"' + - 'UbuntuVersion:@UbuntuName^.version' + require: + - 'IsNull[@UbuntuName@[2]]' + - 'IsNull[@UbuntuVersion?UbuntuOSVersion]' + extract: + - 'DeviceClass : 1:"Desktop"' + - 'DeviceName : 1:"Linux Desktop"' + - 'OperatingSystemClass : 204:"Desktop"' + - 'OperatingSystemName : 204:@UbuntuName' + - 'OperatingSystemVersion : 204:@UbuntuName^.version' + +- matcher: + variable: + - 'UbuntuName:agent.product.name~"buntu"' + - 'UbuntuVersion:@UbuntuName^.version' + extract: + - 'DeviceClass : 1:"Desktop"' + - 'DeviceName : 1:"Linux Desktop"' + - 'OperatingSystemClass : 203:"Desktop"' + - 'OperatingSystemName : 203:@UbuntuName[1]' + - 'OperatingSystemVersion : 203:LookUp[UbuntuOSVersion;@UbuntuVersion]' + +- matcher: + variable: + - 'UbuntuName:agent.product.name~"buntu"' + - 'UbuntuVersion:@UbuntuName^.comments.entry' + extract: + - 'DeviceClass : 1:"Desktop"' + - 'DeviceName : 1:"Linux Desktop"' + - 'OperatingSystemClass : 202:"Desktop"' + - 'OperatingSystemName : 202:@UbuntuName[1]' + - 'OperatingSystemVersion : 202:LookUp[UbuntuOSVersion;@UbuntuVersion]' + +- matcher: + extract: + - 'DeviceClass : 1:"Desktop"' + - 'DeviceName : 1:"Linux Desktop"' + - 'OperatingSystemClass : 201:"Desktop"' + - 'OperatingSystemName : 201:"Ubuntu"' + - 'OperatingSystemVersion : 201:LookUp[UbuntuOSVersion;agent.product.comments.entry.text]' + + +# NOTE: Most useragents in this file have modified version numbers. +# This was done to find the examples of different patterns to test against. + +- test: + input: + user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Ubuntu/7.10 (gutsy) Firefox/8.8.8' + expected: + DeviceClass : 'Desktop' + DeviceName : 'Linux Desktop' + DeviceBrand : 'Unknown' + DeviceCpu : 'Intel i686' + DeviceCpuBits : '32' + OperatingSystemClass : 'Desktop' + OperatingSystemName : 'Ubuntu' + OperatingSystemVersion : '7.10' + OperatingSystemNameVersion : 'Ubuntu 7.10' + LayoutEngineClass : 'Browser' + LayoutEngineName : 'Gecko' + LayoutEngineVersion : '12.3' + LayoutEngineVersionMajor : '12' + LayoutEngineNameVersion : 'Gecko 12.3' + LayoutEngineNameVersionMajor : 'Gecko 12' + LayoutEngineBuild : '2000000000' + AgentClass : 'Browser' + AgentName : 'Firefox' + AgentVersion : '8.8.8' + AgentVersionMajor : '8' + AgentNameVersion : 'Firefox 8.8.8' + AgentNameVersionMajor : 'Firefox 8' + AgentLanguage : 'English' + AgentLanguageCode : 'en' + +- test: + input: + user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Firefox/8.8.8 (Ubuntu-feisty)' + expected: + DeviceClass : 'Desktop' + DeviceName : 'Linux Desktop' + DeviceBrand : 'Unknown' + DeviceCpu : 'Intel i686' + DeviceCpuBits : '32' + OperatingSystemClass : 'Desktop' + OperatingSystemName : 'Ubuntu' + OperatingSystemVersion : '7.04' + OperatingSystemNameVersion : 'Ubuntu 7.04' + LayoutEngineClass : 'Browser' + LayoutEngineName : 'Gecko' + LayoutEngineVersion : '12.3' + LayoutEngineVersionMajor : '12' + LayoutEngineNameVersion : 'Gecko 12.3' + LayoutEngineNameVersionMajor : 'Gecko 12' + LayoutEngineBuild : '2000000000' + AgentClass : 'Browser' + AgentName : 'Firefox' + AgentVersion : '8.8.8' + AgentVersionMajor : '8' + AgentNameVersion : 'Firefox 8.8.8' + AgentNameVersionMajor : 'Firefox 8' + AgentLanguage : 'English' + AgentLanguageCode : 'en' + +- test: + input: + user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Kubuntu/8.10 (intrepid) Minefield/3.2a1' + expected: + DeviceClass : 'Desktop' + DeviceName : 'Linux Desktop' + DeviceBrand : 'Unknown' + DeviceCpu : 'Intel i686' + DeviceCpuBits : '32' + OperatingSystemClass : 'Desktop' + OperatingSystemName : 'Kubuntu' + OperatingSystemVersion : '8.10' + OperatingSystemNameVersion : 'Kubuntu 8.10' + LayoutEngineClass : 'Browser' + LayoutEngineName : 'Gecko' + LayoutEngineVersion : '12.3' + LayoutEngineVersionMajor : '12' + LayoutEngineNameVersion : 'Gecko 12.3' + LayoutEngineNameVersionMajor : 'Gecko 12' + LayoutEngineBuild : '2000000000' + AgentClass : 'Browser' + AgentName : 'Minefield' + AgentVersion : '3.2a1' + AgentVersionMajor : '3' + AgentNameVersion : 'Minefield 3.2a1' + AgentNameVersionMajor : 'Minefield 3' + AgentLanguage : 'English' + AgentLanguageCode : 'en' + + +- test: + input: + user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Ubuntu/8.04 (hardy) Firefox/8.8.8' + expected: + DeviceClass : 'Desktop' + DeviceName : 'Linux Desktop' + DeviceBrand : 'Unknown' + DeviceCpu : 'Intel i686' + DeviceCpuBits : '32' + OperatingSystemClass : 'Desktop' + OperatingSystemName : 'Ubuntu' + OperatingSystemVersion : '8.04' + OperatingSystemNameVersion : 'Ubuntu 8.04' + LayoutEngineClass : 'Browser' + LayoutEngineName : 'Gecko' + LayoutEngineVersion : '12.3' + LayoutEngineVersionMajor : '12' + LayoutEngineNameVersion : 'Gecko 12.3' + LayoutEngineNameVersionMajor : 'Gecko 12' + LayoutEngineBuild : '2000000000' + AgentClass : 'Browser' + AgentName : 'Firefox' + AgentVersion : '8.8.8' + AgentVersionMajor : '8' + AgentNameVersion : 'Firefox 8.8.8' + AgentNameVersionMajor : 'Firefox 8' + AgentLanguage : 'English' + AgentLanguageCode : 'en' + + +- test: + input: + user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Ubuntu/8.10 (intrepid) Firefox/8.8.8' + expected: + DeviceClass : 'Desktop' + DeviceName : 'Linux Desktop' + DeviceBrand : 'Unknown' + DeviceCpu : 'Intel i686' + DeviceCpuBits : '32' + OperatingSystemClass : 'Desktop' + OperatingSystemName : 'Ubuntu' + OperatingSystemVersion : '8.10' + OperatingSystemNameVersion : 'Ubuntu 8.10' + LayoutEngineClass : 'Browser' + LayoutEngineName : 'Gecko' + LayoutEngineVersion : '12.3' + LayoutEngineVersionMajor : '12' + LayoutEngineNameVersion : 'Gecko 12.3' + LayoutEngineNameVersionMajor : 'Gecko 12' + LayoutEngineBuild : '2000000000' + AgentClass : 'Browser' + AgentName : 'Firefox' + AgentVersion : '8.8.8' + AgentVersionMajor : '8' + AgentNameVersion : 'Firefox 8.8.8' + AgentNameVersionMajor : 'Firefox 8' + AgentLanguage : 'English' + AgentLanguageCode : 'en' + +- test: + input: + user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Ubuntu (intrepid) Firefox/8.8.8' + expected: + DeviceClass : 'Desktop' + DeviceName : 'Linux Desktop' + DeviceBrand : 'Unknown' + DeviceCpu : 'Intel i686' + DeviceCpuBits : '32' + OperatingSystemClass : 'Desktop' + OperatingSystemName : 'Ubuntu' + OperatingSystemVersion : '8.10' + OperatingSystemNameVersion : 'Ubuntu 8.10' + LayoutEngineClass : 'Browser' + LayoutEngineName : 'Gecko' + LayoutEngineVersion : '12.3' + LayoutEngineVersionMajor : '12' + LayoutEngineNameVersion : 'Gecko 12.3' + LayoutEngineNameVersionMajor : 'Gecko 12' + LayoutEngineBuild : '2000000000' + AgentClass : 'Browser' + AgentName : 'Firefox' + AgentVersion : '8.8.8' + AgentVersionMajor : '8' + AgentNameVersion : 'Firefox 8.8.8' + AgentNameVersionMajor : 'Firefox 8' + AgentLanguage : 'English' + AgentLanguageCode : 'en' + +- test: + input: + user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Ubuntu/3.1415926 (intrepid) Firefox/8.8.8' + expected: + DeviceClass : 'Desktop' + DeviceName : 'Linux Desktop' + DeviceBrand : 'Unknown' + DeviceCpu : 'Intel i686' + DeviceCpuBits : '32' + OperatingSystemClass : 'Desktop' + OperatingSystemName : 'Ubuntu' + OperatingSystemVersion : '3.1415926' + OperatingSystemNameVersion : 'Ubuntu 3.1415926' + LayoutEngineClass : 'Browser' + LayoutEngineName : 'Gecko' + LayoutEngineVersion : '12.3' + LayoutEngineVersionMajor : '12' + LayoutEngineNameVersion : 'Gecko 12.3' + LayoutEngineNameVersionMajor : 'Gecko 12' + LayoutEngineBuild : '2000000000' + AgentClass : 'Browser' + AgentName : 'Firefox' + AgentVersion : '8.8.8' + AgentVersionMajor : '8' + AgentNameVersion : 'Firefox 8.8.8' + AgentNameVersionMajor : 'Firefox 8' + AgentLanguage : 'English' + AgentLanguageCode : 'en' + + +- test: + input: + user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Ubuntu/8.10 (intrepid) Namoroka/7.7.7' + expected: + DeviceClass : 'Desktop' + DeviceName : 'Linux Desktop' + DeviceBrand : 'Unknown' + DeviceCpu : 'Intel i686' + DeviceCpuBits : '32' + OperatingSystemClass : 'Desktop' + OperatingSystemName : 'Ubuntu' + OperatingSystemVersion : '8.10' + OperatingSystemNameVersion : 'Ubuntu 8.10' + LayoutEngineClass : 'Browser' + LayoutEngineName : 'Gecko' + LayoutEngineVersion : '12.3' + LayoutEngineVersionMajor : '12' + LayoutEngineNameVersion : 'Gecko 12.3' + LayoutEngineNameVersionMajor : 'Gecko 12' + LayoutEngineBuild : '2000000000' + AgentClass : 'Browser' + AgentName : 'Namoroka' + AgentVersion : '7.7.7' + AgentVersionMajor : '7' + AgentNameVersion : 'Namoroka 7.7.7' + AgentNameVersionMajor : 'Namoroka 7' + AgentLanguage : 'English' + AgentLanguageCode : 'en' + +- test: + input: + user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Ubuntu/8.04 (hardy) Firefox/8.8.8 MEGAUPLOAD 1.0' + expected: + DeviceClass : 'Desktop' + DeviceName : 'Linux Desktop' + DeviceBrand : 'Unknown' + DeviceCpu : 'Intel i686' + DeviceCpuBits : '32' + OperatingSystemClass : 'Desktop' + OperatingSystemName : 'Ubuntu' + OperatingSystemVersion : '8.04' + OperatingSystemNameVersion : 'Ubuntu 8.04' + LayoutEngineClass : 'Browser' + LayoutEngineName : 'Gecko' + LayoutEngineVersion : '12.3' + LayoutEngineVersionMajor : '12' + LayoutEngineNameVersion : 'Gecko 12.3' + LayoutEngineNameVersionMajor : 'Gecko 12' + LayoutEngineBuild : '2000000000' + AgentClass : 'Browser' + AgentName : 'Firefox' + AgentVersion : '8.8.8' + AgentVersionMajor : '8' + AgentNameVersion : 'Firefox 8.8.8' + AgentNameVersionMajor : 'Firefox 8' + AgentLanguage : 'English' + AgentLanguageCode : 'en' + +- test: + input: + user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Ubuntu/8.10 (intrepid) Firefox/8.8.8 FirePHP/0.2.4' + expected: + DeviceClass : 'Desktop' + DeviceName : 'Linux Desktop' + DeviceBrand : 'Unknown' + DeviceCpu : 'Intel i686' + DeviceCpuBits : '32' + OperatingSystemClass : 'Desktop' + OperatingSystemName : 'Ubuntu' + OperatingSystemVersion : '8.10' + OperatingSystemNameVersion : 'Ubuntu 8.10' + LayoutEngineClass : 'Browser' + LayoutEngineName : 'Gecko' + LayoutEngineVersion : '12.3' + LayoutEngineVersionMajor : '12' + LayoutEngineNameVersion : 'Gecko 12.3' + LayoutEngineNameVersionMajor : 'Gecko 12' + LayoutEngineBuild : '2000000000' + AgentClass : 'Browser' + AgentName : 'Firefox' + AgentVersion : '8.8.8' + AgentVersionMajor : '8' + AgentNameVersion : 'Firefox 8.8.8' + AgentNameVersionMajor : 'Firefox 8' + AgentLanguage : 'English' + AgentLanguageCode : 'en' + +- test: + input: + user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Ubuntu/8.10 (intrepid) Firefox/8.8.8 GTB5' + expected: + DeviceClass : 'Desktop' + DeviceName : 'Linux Desktop' + DeviceBrand : 'Unknown' + DeviceCpu : 'Intel i686' + DeviceCpuBits : '32' + OperatingSystemClass : 'Desktop' + OperatingSystemName : 'Ubuntu' + OperatingSystemVersion : '8.10' + OperatingSystemNameVersion : 'Ubuntu 8.10' + LayoutEngineClass : 'Browser' + LayoutEngineName : 'Gecko' + LayoutEngineVersion : '12.3' + LayoutEngineVersionMajor : '12' + LayoutEngineNameVersion : 'Gecko 12.3' + LayoutEngineNameVersionMajor : 'Gecko 12' + LayoutEngineBuild : '2000000000' + AgentClass : 'Browser' + AgentName : 'Firefox' + AgentVersion : '8.8.8' + AgentVersionMajor : '8' + AgentNameVersion : 'Firefox 8.8.8' + AgentNameVersionMajor : 'Firefox 8' + AgentLanguage : 'English' + AgentLanguageCode : 'en' + +- test: + input: + user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Ubuntu/7.10 (gutsy) Firefox/8.8.8 (Linux Mint)' + expected: + DeviceClass : 'Desktop' + DeviceName : 'Linux Desktop' + DeviceBrand : 'Unknown' + DeviceCpu : 'Intel i686' + DeviceCpuBits : '32' + OperatingSystemClass : 'Desktop' + OperatingSystemName : 'Ubuntu' + OperatingSystemVersion : '7.10' + OperatingSystemNameVersion : 'Ubuntu 7.10' + LayoutEngineClass : 'Browser' + LayoutEngineName : 'Gecko' + LayoutEngineVersion : '12.3' + LayoutEngineVersionMajor : '12' + LayoutEngineNameVersion : 'Gecko 12.3' + LayoutEngineNameVersionMajor : 'Gecko 12' + LayoutEngineBuild : '2000000000' + AgentClass : 'Browser' + AgentName : 'Firefox' + AgentVersion : '8.8.8' + AgentVersionMajor : '8' + AgentNameVersion : 'Firefox 8.8.8' + AgentNameVersionMajor : 'Firefox 8' + AgentLanguage : 'English' + AgentLanguageCode : 'en' + + +- test: + input: + user_agent_string: 'Mozilla/5.001 (X11; Linux i686; rv:12.3; de-ch) Gecko/2000000000 (ubuntu-feisty)' + expected: + DeviceClass : 'Desktop' + DeviceName : 'Linux Desktop' + DeviceBrand : 'Unknown' + DeviceCpu : 'Intel i686' + DeviceCpuBits : '32' + OperatingSystemClass : 'Desktop' + OperatingSystemName : 'Ubuntu' + OperatingSystemVersion : '7.04' + OperatingSystemNameVersion : 'Ubuntu 7.04' + LayoutEngineClass : 'Browser' + LayoutEngineName : 'Gecko' + LayoutEngineVersion : '12.3' + LayoutEngineVersionMajor : '12' + LayoutEngineNameVersion : 'Gecko 12.3' + LayoutEngineNameVersionMajor : 'Gecko 12' + LayoutEngineBuild : '2000000000' + AgentClass : 'Browser' + AgentName : 'Gecko' + AgentVersion : '12.3' + AgentVersionMajor : '12' + AgentNameVersion : 'Gecko 12.3' + AgentNameVersionMajor : 'Gecko 12' + AgentLanguage : 'German (Switzerland)' + AgentLanguageCode : 'de-ch' + + +- test: + input: + user_agent_string: 'Mozilla/5.0 (compatible; Konqueror/3.4; Linux) KHTML/3.4.3 (like Gecko) (Kubuntu package 4:3.4.3-0ubuntu1)' + expected: + DeviceClass : 'Desktop' + DeviceName : 'Linux Desktop' + DeviceBrand : 'Unknown' + OperatingSystemClass : 'Desktop' + OperatingSystemName : 'Kubuntu' + OperatingSystemVersion : '??' + OperatingSystemNameVersion : 'Kubuntu ??' + LayoutEngineClass : 'Browser' + LayoutEngineName : 'KHTML' + LayoutEngineVersion : '3.4' + LayoutEngineVersionMajor : '3' + LayoutEngineNameVersion : 'KHTML 3.4' + LayoutEngineNameVersionMajor : 'KHTML 3' + AgentClass : 'Browser' + AgentName : 'Konqueror' + AgentVersion : '3.4' + AgentVersionMajor : '3' + AgentNameVersion : 'Konqueror 3.4' + AgentNameVersionMajor : 'Konqueror 3' + + +- test: + input: + user_agent_string: 'Mozilla/5.0 (compatible; Konqueror/3.5; Linux; en_US) KHTML/3.5.6 (like Gecko) (Kubuntu)' + expected: + DeviceClass : 'Desktop' + DeviceName : 'Linux Desktop' + DeviceBrand : 'Unknown' + OperatingSystemClass : 'Desktop' + OperatingSystemName : 'Kubuntu' + OperatingSystemVersion : '??' + OperatingSystemNameVersion : 'Kubuntu ??' + LayoutEngineClass : 'Browser' + LayoutEngineName : 'KHTML' + LayoutEngineVersion : '3.5' + LayoutEngineVersionMajor : '3' + LayoutEngineNameVersion : 'KHTML 3.5' + LayoutEngineNameVersionMajor : 'KHTML 3' + AgentClass : 'Browser' + AgentName : 'Konqueror' + AgentVersion : '3.5' + AgentVersionMajor : '3' + AgentNameVersion : 'Konqueror 3.5' + AgentNameVersionMajor : 'Konqueror 3' + AgentLanguage : 'English (United States)' + AgentLanguageCode : 'en-us' + + +- test: + input: + user_agent_string: 'Mozilla/5.0 (compatible; Konqueror/3.5; Linux; X11) KHTML/3.5.3 (like Gecko) Kubuntu 6.06 Dapper' + expected: + DeviceClass : 'Desktop' + DeviceName : 'Linux Desktop' + DeviceBrand : 'Unknown' + OperatingSystemClass : 'Desktop' + OperatingSystemName : 'Kubuntu' + OperatingSystemVersion : '6.06' + OperatingSystemNameVersion : 'Kubuntu 6.06' + LayoutEngineClass : 'Browser' + LayoutEngineName : 'KHTML' + LayoutEngineVersion : '3.5' + LayoutEngineVersionMajor : '3' + LayoutEngineNameVersion : 'KHTML 3.5' + LayoutEngineNameVersionMajor : 'KHTML 3' + AgentClass : 'Browser' + AgentName : 'Konqueror' + AgentVersion : '3.5' + AgentVersionMajor : '3' + AgentNameVersion : 'Konqueror 3.5' + AgentNameVersionMajor : 'Konqueror 3' + + +- test: + input: + user_agent_string: 'Mozilla/5.0 (compatible; Konqueror/4.4; Linux 2.6.32-22-generic; X11; en_US) KHTML/4.4.3 (like Gecko) Kubuntu' + expected: + DeviceClass : 'Desktop' + DeviceName : 'Linux Desktop' + DeviceBrand : 'Unknown' + OperatingSystemClass : 'Desktop' + OperatingSystemName : 'Kubuntu' + OperatingSystemVersion : '??' + OperatingSystemNameVersion : 'Kubuntu ??' + LayoutEngineClass : 'Browser' + LayoutEngineName : 'KHTML' + LayoutEngineVersion : '4.4' + LayoutEngineVersionMajor : '4' + LayoutEngineNameVersion : 'KHTML 4.4' + LayoutEngineNameVersionMajor : 'KHTML 4' + AgentClass : 'Browser' + AgentName : 'Konqueror' + AgentVersion : '4.4' + AgentVersionMajor : '4' + AgentNameVersion : 'Konqueror 4.4' + AgentNameVersionMajor : 'Konqueror 4' + AgentLanguage : 'English (United States)' + AgentLanguageCode : 'en-us' + + +- test: + input: + user_agent_string: 'Mozilla/5.0 (Linux; Ubuntu 15.04) AppleWebKit/1.1.1 Chromium/2.2.2 Safari/5.5.5' + expected: + DeviceClass : 'Desktop' + DeviceName : 'Linux Desktop' + DeviceBrand : 'Unknown' + OperatingSystemClass : 'Desktop' + OperatingSystemName : 'Ubuntu' + OperatingSystemVersion : '15.04' + OperatingSystemNameVersion : 'Ubuntu 15.04' + LayoutEngineClass : 'Browser' + LayoutEngineName : 'AppleWebKit' + LayoutEngineVersion : '1.1.1' + LayoutEngineVersionMajor : '1' + LayoutEngineNameVersion : 'AppleWebKit 1.1.1' + LayoutEngineNameVersionMajor : 'AppleWebKit 1' + AgentClass : 'Browser' + AgentName : 'Chromium' + AgentVersion : '2.2.2' + AgentVersionMajor : '2' + AgentNameVersion : 'Chromium 2.2.2' + AgentNameVersionMajor : 'Chromium 2' + + +- test: + input: + user_agent_string: 'Mozilla/5.0 (Linux; Ubuntu 15.04 like Android 4.4) AppleWebKit/1.1.1 Chromium/2.2.2 Mobile Safari/5.5.5' + expected: + DeviceClass : 'Phone' + DeviceName : 'Linux Mobile' + DeviceBrand : 'Unknown' + OperatingSystemClass : 'Mobile' + OperatingSystemName : 'Ubuntu Touch' + OperatingSystemVersion : '15.04' + OperatingSystemNameVersion : 'Ubuntu Touch 15.04' + LayoutEngineClass : 'Browser' + LayoutEngineName : 'AppleWebKit' + LayoutEngineVersion : '1.1.1' + LayoutEngineVersionMajor : '1' + LayoutEngineNameVersion : 'AppleWebKit 1.1.1' + LayoutEngineNameVersionMajor : 'AppleWebKit 1' + AgentClass : 'Browser' + AgentName : 'Chromium' + AgentVersion : '2.2.2' + AgentVersionMajor : '2' + AgentNameVersion : 'Chromium 2.2.2' + AgentNameVersionMajor : 'Chromium 2' + + +- test: + input: + user_agent_string: 'Mozilla/5.0 (Linux; Ubuntu 16.04) AppleWebKit/1.1.1 Chromium/2.2.2 Safari/5.5.5' + expected: + DeviceClass : 'Desktop' + DeviceName : 'Linux Desktop' + DeviceBrand : 'Unknown' + OperatingSystemClass : 'Desktop' + OperatingSystemName : 'Ubuntu' + OperatingSystemVersion : '16.04' + OperatingSystemNameVersion : 'Ubuntu 16.04' + LayoutEngineClass : 'Browser' + LayoutEngineName : 'AppleWebKit' + LayoutEngineVersion : '1.1.1' + LayoutEngineVersionMajor : '1' + LayoutEngineNameVersion : 'AppleWebKit 1.1.1' + LayoutEngineNameVersionMajor : 'AppleWebKit 1' + AgentClass : 'Browser' + AgentName : 'Chromium' + AgentVersion : '2.2.2' + AgentVersionMajor : '2' + AgentNameVersion : 'Chromium 2.2.2' + AgentNameVersionMajor : 'Chromium 2' + +- test: + input: + user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Epiphany/4.4.4 Firefox/8.8.8 (Ubuntu-feisty)' + expected: + DeviceClass : 'Desktop' + DeviceName : 'Linux Desktop' + DeviceBrand : 'Unknown' + DeviceCpu : 'Intel i686' + DeviceCpuBits : '32' + OperatingSystemClass : 'Desktop' + OperatingSystemName : 'Ubuntu' + OperatingSystemVersion : '7.04' + OperatingSystemNameVersion : 'Ubuntu 7.04' + LayoutEngineClass : 'Browser' + LayoutEngineName : 'Gecko' + LayoutEngineVersion : '12.3' + LayoutEngineVersionMajor : '12' + LayoutEngineNameVersion : 'Gecko 12.3' + LayoutEngineNameVersionMajor : 'Gecko 12' + LayoutEngineBuild : '2000000000' + AgentClass : 'Browser' + AgentName : 'Epiphany' + AgentVersion : '4.4.4' + AgentVersionMajor : '4' + AgentNameVersion : 'Epiphany 4.4.4' + AgentNameVersionMajor : 'Epiphany 4' + AgentLanguage : 'English' + AgentLanguageCode : 'en' + + +#- test: +# input: +# user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Epiphany/4.4.4 (Ubuntu)' +# +# +#- test: +# input: +# user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Epiphany/4.4.4 (Ubuntu) (Ubuntu package 1.0.7)' +# +# +#- test: +# input: +# user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Firefox/8.8.8 (Kubuntu)' +# +# +#- test: +# input: +# user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Firefox/8.8.8 Ubuntu' +# +# +#- test: +# input: +# user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Firefox/8.8.8 (Ubuntu-edgy)' +# +# +#- test: +# input: +# user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Firefox/8.8.8 (Ubuntu-feisty)' +# +# +#- test: +# input: +# user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Firefox/8.8.8 (Ubuntu package 1.0.2)' +# +# +#- test: +# input: +# user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Galeon/2.0.1 (Ubuntu package 2.0.1-1ubuntu2) Firefox/8.8.8' +# +# +#- test: +# input: +# user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Iceape/1.1.5 (Ubuntu-1.1.5-1ubuntu0.7.10)' +# +# +#- test: +# input: +# user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Kubuntu/8.10 (intrepid) Firefox/8.8.8' +# +# +#- test: +# input: +# user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Kubuntu/8.10 (intrepid) Minefield/3.2a1' +# +# +#- test: +# input: +# user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 MEGAUPLOAD 1.0 (Ubuntu-feisty)' +# +# +#- test: +# input: +# user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 SeaMonkey/1.1.9 (Ubuntu-1.1.9+nobinonly-0ubuntu1)' +# +# +#- test: +# input: +# user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Ubuntu/10.04 (lucid) Firefox/8.8.8' +# +# +#- test: +# input: +# user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Ubuntu/10.04 (lucid) Namoroka/7.7.7' +# +# +#- test: +# input: +# user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Ubuntu/1.4.0 (hardy) Firefox/8.8.8' +# +# +#- test: +# input: +# user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Ubuntu/1.5.dfsg-4ubuntu6 Firefox/8.8.8' +# +# +#- test: +# input: +# user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Ubuntu/8.10 (intrepid) Shiretoko/3.3.3' +# +# +#- test: +# input: +# user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Ubuntu/9.04 (jaunty) Iceweasel/3.0.2' +# +# +#- test: +# input: +# user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Ubuntu/9.04 (jaunty) Minefield/3.2a1' +# +# +#- test: +# input: +# user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Ubuntu/9.04 (jaunty) Namoroka/7.7.7' +# +# +#- test: +# input: +# user_agent_string: 'Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Ubuntu/9.25 (jaunty) Firefox/8.8.8' + + +# + + +# TODO: Make selection and implement some of these testcases. + +#Guzzle/5.3.1 curl/7.47.0 PHP/7.1.11-1+ubuntu16.04.1+deb.sury.org+1 +#GuzzleHttp/6.2.0 curl/7.35.0 PHP/7.1.16-1+ubuntu14.04.1+deb.sury.org+1 +#GuzzleHttp/6.2.1 curl/7.47.0 PHP/7.1.16-1+ubuntu16.04.1+deb.sury.org+1 +#Kodi/17.6 (X11; Linux x86_64) Ubuntu/16.04 App_Bitness/64 Version/17.6-Git:20171114-a9a7a20 +#Mozilla/5.0 (Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:12.3) Gecko/2000000000 Firefox/8.8.8; Ubuntu; Linux x86_64; rv:12.3) Gecko/2000000000 Firefox/8.8.8 +#Mozilla/5.0 (Ubuntu; X11; Linux i686; rv:12.3) Gecko/2000000000 Firefox/8.8.8 +#Mozilla/5.0 (X11; Linux aarch64) AppleWebKit/1.1.1 (KHTML, like Gecko) Ubuntu Chromium/2.2.2 Chrome/6.6.6 Safari/5.5.5 +#Mozilla/5.0 (X11; Linux AMD64; en; rv:12.3) Gecko/2000000000 Ubuntu/10.10 (maverick) Firefox/8.8.8 +#Mozilla/5.0 (X11; Linux armv7l) AppleWebKit/1.1.1 (KHTML, like Gecko) Ubuntu Chromium/2.2.2 Chrome/6.6.6 Safari/5.5.5 +#Mozilla/5.0 (X11; Linux i586; en; rv:12.3) Gecko/2000000000 Epiphany/4.4.4 (Ubuntu) +#Mozilla/5.0 (X11; Linux i686) AppleWebKit/1.1.1 (KHTML, like Gecko) Ubuntu/11.10 Chromium/2.2.2 Chrome/6.6.6 Safari/5.5.5 +#Mozilla/5.0 (X11; Linux i686) AppleWebKit/1.1.1 (KHTML, like Gecko) Ubuntu/12.10 Chromium/2.2.2 Chrome/6.6.6 Safari/5.5.5 +#Mozilla/5.0 (X11; Linux i686) AppleWebKit/1.1.1 (KHTML like Gecko) Ubuntu Chromium/2.2.2 Chrome/6.6.6 Safari/5.5.5 +#Mozilla/5.0 (X11; Linux i686) AppleWebKit/1.1.1 (KHTML, like Gecko) Ubuntu Chromium/2.2.2 Chrome/6.6.6 Safari/5.5.5 +#Mozilla/5.0 (X11; Linux i686) AppleWebKit/1.1.1 (KHTML, like Gecko) Version/11.0 Safari/5.5.5 Ubuntu/17.10 (3.26.1-1ubuntu1) Epiphany/4.4.4 +#Mozilla/5.0 (X11; Linux i686) AppleWebKit/1.1.1 (KHTML, like Gecko) Version/8.0 Safari/5.5.5 Ubuntu/14.10 (3.10.3-0ubuntu3) Epiphany/4.4.4 +#Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Debian/1.5.dfsg-4ubuntu3 Firefox/8.8.8 +#Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Debian/1.7.13-0ubuntu05.04 +#Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 (Debian-1.8.1.4-2ubuntu5) +#Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Ubuntu/dapper Epiphany/4.4.4 Firefox/8.8.8 +#Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Ubuntu/dapper Firefox/8.8.8 +#Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Ubuntu/dapper-security Epiphany/4.4.4 Firefox/8.8.8 +#Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Ubuntu/dapper-security Firefox/8.8.8 +#Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko/2000000000 Ubuntu/dapper-security Firefox/8.8.8 Mnenhy/0.7.4.666 +#Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko Galeon/2.0.6 (Ubuntu 2.0.6-2) +#Mozilla/5.0 (X11; Linux i686; en; rv:12.3) Gecko Kazehakase/0.5.4 Debian/0.5.4-2.1ubuntu3 +#Mozilla/5.0 (X11; Linux i686; en-US) AppleWebKit/1.1.1 (KHTML, like Gecko) Ubuntu/9.10 Chromium/2.2.2 Chrome/6.6.6 Safari/5.5.5 +#Mozilla/5.0 (X11; Linux i686; Ubuntu 7.04; en; rv:12.3) Gecko/2000000000 Firefox/8.8.8 +#Mozilla/5.0 (X11; Linux i686; U;) Gecko/2000000000 Kazehakase/0.4.3 Debian/0.4.3-1ubuntu1 +#Mozilla/5.0 (X11; Linux i686 (x86_64)) AppleWebKit/1.1.1 (KHTML, like Gecko) Ubuntu/10.04 Chromium/2.2.2 Chrome/6.6.6 Safari/5.5.5 +#Mozilla/5.0 (X11; Linux i686 (x86_64)) AppleWebKit/1.1.1 (KHTML, like Gecko) Ubuntu Chromium/2.2.2 Chrome/6.6.6 Safari/5.5.5 +#Mozilla/5.0 (X11; Linux i686 (x86_64); en; rv:12.3) Gecko/2000000000 Debian/1.7.12-0ubuntu2 +#Mozilla/5.0 (X11; Linux i686 (x86_64); en; rv:12.3) Gecko/2000000000 Ubuntu/dapper-security Firefox/8.8.8 +#Mozilla/5.0 (X11; Linux ia64; en; rv:12.3) Gecko/2000000000 Ubuntu/8.04 (hardy) Firefox/8.8.8 +#Mozilla/5.0 (X11; Linux ppc64; en; rv:12.3) Gecko/2000000000 Ubuntu/7.10 (gutsy) Firefox/8.8.8 +#Mozilla/5.0 (X11; Linux ppc; en; rv:12.3) Gecko/2000000000 Firefox/8.8.8 (Ubuntu package 1.0.7) +#Mozilla/5.0 (X11; Linux ppc; en; rv:12.3) Gecko/2000000000 Ubuntu/10.10 (maverick) Firefox/8.8.8 +#Mozilla/5.0 (X11; Linux ppc; en; rv:12.3) Gecko/2000000000 Ubuntu/8.04 (hardy) Firefox/8.8.8 +#Mozilla/5.0 (X11; Linux ppc; en; rv:12.3) Gecko/2000000000 Ubuntu/8.10 (intrepid) Firefox/8.8.8 +#Mozilla/5.0 (X11; Linux x64_64; en; rv:12.3) Gecko/2000000000 Ubuntu/8.10 (intrepid) Firefox/8.8.8 +#Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/1.1.1 (KHTML, like Gecko) Ubuntu +#Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/1.1.1 (KHTML, like Gecko) Ubuntu/12.04 Chromium/2.2.2 Chrome/6.6.6 Safari/5.5.5 +#Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/1.1.1 (KHTML, like Gecko) Ubuntu/16.04.3 Chrome/6.6.6 Safari/5.5.5 +#Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/1.1.1 (KHTML, like Gecko) Ubuntu Chromium/2.2.2 Chrome/6.6.6 Safari/5.5.5 +#Mozilla/5.0 (X11; Linux x8664) AppleWebKit/1.1.1 (KHTML like Gecko) Ubuntu Chromium/2.2.2 Chrome/6.6.6 Safari/5.5.5 +#Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/1.1.1 (KHTML, like Gecko) Ubuntu Chromium/2.2.2 Chrome/6.6.6 Safari/5.5.5 FirePHP/4Chrome +#Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/1.1.1 (KHTML, like Gecko) Ubuntu Chromium/2.2.2 Chrome/6.6.6 Safari/5.5.5,gzip(gfe) +#Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/1.1.1 (KHTML, like Gecko) Ubuntu Chromium/2.2.2 Chrome/6.6.6 Safari/5.5.5 PingdomPageSpeed/1.0 (pingbot/2.0; +http://www.pingdom.com/) +#Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/1.1.1 (KHTML, like Gecko) Ubuntu Chromium/2.2.2 HeadlessChrome/6.6.6 Safari/5.5.5 +#Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/1.1.1 (KHTML, like Gecko) Ubuntu Chromium/2.2.2 Iridium/2017.10 Safari/5.5.5 Chrome/6.6.6 +#Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/1.1.1 (KHTML, like Gecko) Version/11.0 Safari/5.5.5 Ubuntu/16.04 (3.18.11-0ubuntu1) Epiphany/4.4.4 +#Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/1.1.1 (KHTML, like Gecko) Version/8.0 Safari/5.5.5 Ubuntu/14.10 (3.10.3-0ubuntu3) Epiphany/4.4.4 +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 BonEcho/2.0b1 (Ubuntu-edgy) +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Epiphany/4.4.4 Firefox/8.8.8 (Ubuntu-feisty) +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Epiphany/4.4.4 (Ubuntu) (Ubuntu package 1.0.7) +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Firefox/8.8.8 (Ubuntu-feisty) +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Firefox/8.8.8 (Ubuntu package 1.0.2) +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Firefox/8.8.8 (Ubuntu package 1.0.7) +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Kubuntu/8.04 (hardy) Firefox/8.8.8 +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 SeaMonkey/1.1.12 (Ubuntu-1.1.12+nobinonly-0ubuntu1) +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 SeaMonkey/1.1.9 (Ubuntu-1.1.9+nobinonly-0ubuntu1) +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/10.04 (lucid) Firefox/8.8.8 +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/10.04 (lucid) Firefox/8.8.8 GTB7.0 +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/10.04 (lucid) Firefox/8.8.8 GTB7.1 +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/10.04 (lucid) Firefox/8.8.8 (.NET CLR 3.5.30729) +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/10.04 (lucid) Namoroka/7.7.7 +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/10.04 (lucid) Namoroka/7.7.7 GTB7.0 +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/10.10 (maverick) Firefox/8.8.8 +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/10.10 (maverick) Firefox/8.8.8 GTB7.1 +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/10.10 (maverick) Namoroka/7.7.7 +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/7.10 (gutsy) Firefox/8.8.8 +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/8.04 (hardy) Firefox/8.8.8 +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/8.04 (hardy) Firefox/8.8.8 GTB5 +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/8.04 (hardy) Firefox/8.8.8 (Linux Mint) +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/8.04 (hardy) Namoroka/7.7.7 +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/8.10 (intrepid) Firefox/8.8.8 +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/8.10 (intrepid) Firefox/8.8.8 FirePHP/0.2.4 +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/8.10 (intrepid) Minefield/3.0 MEGAUPLOAD 2.0 +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/8.10 (intrepid) Mozilla/4.0 (compatible; MSIE 6.0; MSIE 5.5; Windows NT 5.1) Opera 7.03 [de] +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/9.04 (jaunty) Firefox/8.8.8 +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/9.04 (jaunty) Firefox/8.8.8 FirePHP/0.3 +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/9.04 (jaunty) Firefox/8.8.8 GTB5 +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/9.04 (jaunty) Firefox/8.8.8 (.NET CLR 3.5.30729) +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/9.04 (jaunty) Namoroka/7.7.7 +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/9.04 (jaunty) Namoroka/7.7.7 GTB5 (.NET CLR 3.5.30729) +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/9.04 (jaunty) Shiretoko/3.3.3 +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/9.10 (karmic) Epiphany/4.4.4 Firefox/8.8.8 +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/9.10 (karmic) Firefox/8.8.8 +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/9.10 (karmic) Firefox/8.8.8 (.NET CLR 3.5.30729) +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/9.10 (karmic) Namoroka/7.7.7 +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/dapper Firefox/8.8.8 +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/dapper-security Firefox/8.8.8 +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu (hardy) Firefox/8.8.8 +#Mozilla/5.0 (X11; Linux x86_64; en; rv:12.3) Gecko/2000000000 Ubuntu/hardy Firefox/8.8.8 +#Mozilla/5.0 (X11; Linux x86_64; en-US) AppleWebKit/1.1.1 (KHTML, like Gecko) Ubuntu/10.04 Chromium/2.2.2 Chrome/6.6.6 Safari/5.5.5 +#Mozilla/5.0 (X11; Linux x86_64; en-US) AppleWebKit/1.1.1 (KHTML, like Gecko) Ubuntu/10.10 Chrome/6.6.6 Safari/5.5.5 +#Mozilla/5.0 (X11; Linux x86_64; en-US) AppleWebKit/1.1.1 (KHTML, like Gecko) Ubuntu/10.10 Chromium/2.2.2 Chrome/6.6.6 Safari/5.5.5 +#Mozilla/5.0 (X11; Linux x86_64; it-it) AppleWebKit/1.1.1+ (KHTML, like Gecko) Ubuntu/11.04 Epiphany/4.4.4 +#Mozilla/5.0 (X11; Linux x86; en; rv:12.3) Gecko/2000000000 Firefox/8.8.8 (Ubuntu-feisty) +#Mozilla/5.0 (X11; Linux x86; en; rv:12.3) Gecko/2000000000 Ubuntu/8.04 (hardy) Firefox/8.8.8 +#Mozilla/5.0 (X11; Ubuntu; Linux amd64; rv:12.3) Gecko/2000000000 Firefox/8.8.8 +#Mozilla/5.0 (X11; Ubuntu; Linux armv7l; rv:12.3) Gecko/2000000000 Firefox/8.8.8 +#Mozilla/5.0 (X11; Ubuntu; Linux i386; rv:12.3) Gecko/2000000000 Firefox/8.8.8 +#Mozilla/5.0 (X11; Ubuntu; Linux i686) AppleWebKit/1.1.1 (KHTML, like Gecko) Chrome/6.6.6 Safari/5.5.5 +#Mozilla/5.0 (X11; Ubuntu; Linux i686) AppleWebKit/1.1.1 (KHTML, like Gecko) Version/11.0 Safari/5.5.5 Epiphany/4.4.4 +#Mozilla/5.0 (X11; Ubuntu; Linux i686) Gecko/2000000000 Firefox/8.8.8 +#Mozilla/5.0 (X11; Ubuntu; Linux i686 on x86_64; rv:12.3) Gecko/2000000000 Firefox/8.8.8 +#Mozilla/5.0 (X11; Ubuntu; Linux i686; rv:12.3) Gecko/2000000000 Firefox/8.8.8 +#Mozilla/5.0 (X11; Ubuntu; Linux i686; rv:12.3) Gecko/2000000000 Firefox/8.8.8,gzip(gfe) +#Mozilla/5.0 (X11; Ubuntu; Linux i686; rv:12.3; ips-agent) Gecko/2000000000 Firefox/8.8.8 +#Mozilla/5.0 (X11; Ubuntu; Linux i686; Trident/7.0; rv:12.3) like Gecko +#Mozilla/5.0 (X11; Ubuntu; Linux ppc64; rv:12.3) Gecko/2000000000 Firefox/8.8.8 +#Mozilla/5.0 (X11; Ubuntu; Linux; rv:12.3) Gecko/2000000000 Firefox/8.8.8 +#Mozilla/5.0 (X11; Ubuntu; Linux x86_64) AppleWebKit/1.1.1 (KHTML, like Gecko) Chrome/6.6.6 Safari/5.5.5 +#Mozilla/5.0 (X11; Ubuntu; Linux x86_64) AppleWebKit/1.1.1 (KHTML, like Gecko) Version/11.0 Safari/5.5.5 Epiphany/4.4.4 +#Mozilla/5.0 (X11; Ubuntu; Linux x86_64) AppleWebKit/1.1.1 (KHTML, like Gecko) Version/11.0 Safari/5.5.5 Epiphany/4.4.4 (Web App) +#Mozilla/5.0 (X11; Ubuntu; Linux x86_64) AppleWebKit/1.1.1 (KHTML, like Gecko) Version/11.0 Safari/5.5.5 Ubuntu/17.10 (3.26.1-1ubuntu1) Epiphany/4.4.4 +#Mozilla/5.0 (X11; Ubuntu; Linux x86_64) Gecko/2000000000 Firefox/8.8.8 +#Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:12.3) +#Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:12.3) adbeat.com/policy Gecko/2000000000 Firefox/8.8.8 +#Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:12.3) Gecko/2000000000 Firefox/8.8.8 +#Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:12.3) Gecko/2000000000 Firefox/8.8.8, */* +#Mozilla/5.0 (X11; Ubuntu; Linux x8664; rv:12.3) Gecko/2000000000 Firefox/8.8.8 +#Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:12.3) Gecko/2000000000 Firefox/8.8.8, 165 +#Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:12.3) Gecko/2000000000 Firefox/8.8.8, application/json +#Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:12.3) Gecko/2000000000 Firefox/8.8.8.Firefox/8.8.8 Zotero/5.0 +#Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:12.3) Gecko/2000000000 Firefox/8.8.8 / GnowitNewsbot / Contact information at http://www.gnowit.com +#Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:12.3) Gecko/2000000000 Firefox/8.8.8,gzip(gfe) +#Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:12.3) Gecko/2000000000 Firefox/8.8.8 PTST/SpeedCurve/180430.170403 +#Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:12.3) Gecko/2000000000 Firefox/8.8.8 PTST/SpeedCurve/180509.150501 +#Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:12.3) Gecko/2000000000 Firefox/8.8.8 (via de.motortalk.utils.HttpUtils) +#Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:12.3) Gecko/2000000000 Firefox/8.8.8 Yandex.Translate +#Mozilla/5.0 (X11; Ubuntu; Linux x86_64; Trident/6.0; rv:12.3) like Gecko +#Mozilla/5.0 (X11; Ubuntu; Linux x86_64; Trident/7.0; rv:12.3) like Gecko +#Opera/9.10 (X11; Linux i686; kubuntu;pl) +#Opera/9.80 (X11; Linux i686; Ubuntu/14.10) Presto/1.1.1 Version/12.16 +#Opera/9.80 (X11; Linux i686; Ubuntu/14.10) Presto/1.1.1 Version/12.16 5af45f95103b5/57b713af-e2d1-4c33-b4c1-0e511a471a7d +#Opera/9.80 (X11; Linux x86_64; Ubuntu/10.10 (maverick); pl) Presto/1.1.1 Version/11.01 diff --git a/analyzer/src/main/resources/UserAgents/UbuntuVersionLookups.yaml b/analyzer/src/main/resources/UserAgents/UbuntuVersionLookups.yaml new file mode 100644 index 0000000000..16ecaf7a09 --- /dev/null +++ b/analyzer/src/main/resources/UserAgents/UbuntuVersionLookups.yaml @@ -0,0 +1,200 @@ +# ============================================= +# THIS FILE WAS GENERATED; DO NOT EDIT MANUALLY +# ============================================= +# +# Yet Another UserAgent Analyzer +# Copyright (C) 2013-2018 Niels Basjes +# +# 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. +# +config: +- lookup: + name: 'UbuntuOSName' + map: + "Warty" : "Ubuntu" + "Warty Warthog" : "Ubuntu" + "ubuntu-Warty" : "Ubuntu" + "Hoary" : "Ubuntu" + "Hoary Hedgehog" : "Ubuntu" + "ubuntu-Hoary" : "Ubuntu" + "Breezy" : "Ubuntu" + "Breezy Badger" : "Ubuntu" + "ubuntu-Breezy" : "Ubuntu" + "Dapper" : "Ubuntu" + "Dapper Drake" : "Ubuntu" + "ubuntu-Dapper" : "Ubuntu" + "Edgy" : "Ubuntu" + "Edgy Eft" : "Ubuntu" + "ubuntu-Edgy" : "Ubuntu" + "Feisty" : "Ubuntu" + "Feisty Fawn" : "Ubuntu" + "ubuntu-Feisty" : "Ubuntu" + "Gutsy" : "Ubuntu" + "Gutsy Gibbon" : "Ubuntu" + "ubuntu-Gutsy" : "Ubuntu" + "Hardy" : "Ubuntu" + "Hardy Heron" : "Ubuntu" + "ubuntu-Hardy" : "Ubuntu" + "Intrepid" : "Ubuntu" + "Intrepid Ibex" : "Ubuntu" + "ubuntu-Intrepid" : "Ubuntu" + "Jaunty" : "Ubuntu" + "Jaunty Jackalope" : "Ubuntu" + "ubuntu-Jaunty" : "Ubuntu" + "Karmic" : "Ubuntu" + "Karmic Koala" : "Ubuntu" + "ubuntu-Karmic" : "Ubuntu" + "Lucid" : "Ubuntu" + "Lucid Lynx" : "Ubuntu" + "ubuntu-Lucid" : "Ubuntu" + "Maverick" : "Ubuntu" + "Maverick Meerkat" : "Ubuntu" + "ubuntu-Maverick" : "Ubuntu" + "Natty" : "Ubuntu" + "Natty Narwhal" : "Ubuntu" + "ubuntu-Natty" : "Ubuntu" + "Oneiric" : "Ubuntu" + "Oneiric Ocelot" : "Ubuntu" + "ubuntu-Oneiric" : "Ubuntu" + "Precise" : "Ubuntu" + "Precise Pangolin" : "Ubuntu" + "ubuntu-Precise" : "Ubuntu" + "Quantal" : "Ubuntu" + "Quantal Quetzal" : "Ubuntu" + "ubuntu-Quantal" : "Ubuntu" + "Raring" : "Ubuntu" + "Raring Ringtail" : "Ubuntu" + "ubuntu-Raring" : "Ubuntu" + "Saucy" : "Ubuntu" + "Saucy Salamander" : "Ubuntu" + "ubuntu-Saucy" : "Ubuntu" + "Trusty" : "Ubuntu" + "Trusty Tahr" : "Ubuntu" + "ubuntu-Trusty" : "Ubuntu" + "Utopic" : "Ubuntu" + "Utopic Unicorn" : "Ubuntu" + "ubuntu-Utopic" : "Ubuntu" + "Vivid" : "Ubuntu" + "Vivid Vervet" : "Ubuntu" + "ubuntu-Vivid" : "Ubuntu" + "Wily" : "Ubuntu" + "Wily Werewolf" : "Ubuntu" + "ubuntu-Wily" : "Ubuntu" + "Xenial" : "Ubuntu" + "Xenial Xerus" : "Ubuntu" + "ubuntu-Xenial" : "Ubuntu" + "Yakkety" : "Ubuntu" + "Yakkety Yak" : "Ubuntu" + "ubuntu-Yakkety" : "Ubuntu" + "Zesty" : "Ubuntu" + "Zesty Zapus" : "Ubuntu" + "ubuntu-Zesty" : "Ubuntu" + "Artful" : "Ubuntu" + "Artful Aardvark" : "Ubuntu" + "ubuntu-Artful" : "Ubuntu" + "Bionic" : "Ubuntu" + "Bionic Beaver" : "Ubuntu" + "ubuntu-Bionic" : "Ubuntu" + "Cosmic" : "Ubuntu" + "Cosmic Cuttlefish" : "Ubuntu" + "ubuntu-Cosmic" : "Ubuntu" +- lookup: + name: 'UbuntuOSVersion' + map: + "Warty" : "4.10" + "Warty Warthog" : "4.10" + "ubuntu-Warty" : "4.10" + "Hoary" : "5.04" + "Hoary Hedgehog" : "5.04" + "ubuntu-Hoary" : "5.04" + "Breezy" : "5.10" + "Breezy Badger" : "5.10" + "ubuntu-Breezy" : "5.10" + "Dapper" : "6.06" + "Dapper Drake" : "6.06" + "ubuntu-Dapper" : "6.06" + "Edgy" : "6.10" + "Edgy Eft" : "6.10" + "ubuntu-Edgy" : "6.10" + "Feisty" : "7.04" + "Feisty Fawn" : "7.04" + "ubuntu-Feisty" : "7.04" + "Gutsy" : "7.10" + "Gutsy Gibbon" : "7.10" + "ubuntu-Gutsy" : "7.10" + "Hardy" : "8.04" + "Hardy Heron" : "8.04" + "ubuntu-Hardy" : "8.04" + "Intrepid" : "8.10" + "Intrepid Ibex" : "8.10" + "ubuntu-Intrepid" : "8.10" + "Jaunty" : "9.04" + "Jaunty Jackalope" : "9.04" + "ubuntu-Jaunty" : "9.04" + "Karmic" : "9.10" + "Karmic Koala" : "9.10" + "ubuntu-Karmic" : "9.10" + "Lucid" : "10.04" + "Lucid Lynx" : "10.04" + "ubuntu-Lucid" : "10.04" + "Maverick" : "10.10" + "Maverick Meerkat" : "10.10" + "ubuntu-Maverick" : "10.10" + "Natty" : "11.04" + "Natty Narwhal" : "11.04" + "ubuntu-Natty" : "11.04" + "Oneiric" : "11.10" + "Oneiric Ocelot" : "11.10" + "ubuntu-Oneiric" : "11.10" + "Precise" : "12.04" + "Precise Pangolin" : "12.04" + "ubuntu-Precise" : "12.04" + "Quantal" : "12.10" + "Quantal Quetzal" : "12.10" + "ubuntu-Quantal" : "12.10" + "Raring" : "13.04" + "Raring Ringtail" : "13.04" + "ubuntu-Raring" : "13.04" + "Saucy" : "13.10" + "Saucy Salamander" : "13.10" + "ubuntu-Saucy" : "13.10" + "Trusty" : "14.04" + "Trusty Tahr" : "14.04" + "ubuntu-Trusty" : "14.04" + "Utopic" : "14.10" + "Utopic Unicorn" : "14.10" + "ubuntu-Utopic" : "14.10" + "Vivid" : "15.04" + "Vivid Vervet" : "15.04" + "ubuntu-Vivid" : "15.04" + "Wily" : "15.10" + "Wily Werewolf" : "15.10" + "ubuntu-Wily" : "15.10" + "Xenial" : "16.04" + "Xenial Xerus" : "16.04" + "ubuntu-Xenial" : "16.04" + "Yakkety" : "16.10" + "Yakkety Yak" : "16.10" + "ubuntu-Yakkety" : "16.10" + "Zesty" : "17.04" + "Zesty Zapus" : "17.04" + "ubuntu-Zesty" : "17.04" + "Artful" : "17.10" + "Artful Aardvark" : "17.10" + "ubuntu-Artful" : "17.10" + "Bionic" : "18.04" + "Bionic Beaver" : "18.04" + "ubuntu-Bionic" : "18.04" + "Cosmic" : "18.10" + "Cosmic Cuttlefish" : "18.10" + "ubuntu-Cosmic" : "18.10" diff --git a/analyzer/src/main/resources/UserAgents/UbuntuVersions/Generate.sh b/analyzer/src/main/resources/UserAgents/UbuntuVersions/Generate.sh new file mode 100755 index 0000000000..b8992b0fb1 --- /dev/null +++ b/analyzer/src/main/resources/UserAgents/UbuntuVersions/Generate.sh @@ -0,0 +1,77 @@ +#!/bin/bash +# Yet Another UserAgent Analyzer +# Copyright (C) 2013-2018 Niels Basjes +# +# 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. + +INPUT=UbuntuVersions.csv +OUTPUT=../UbuntuVersionLookups.yaml + +if [ "Generate.sh" -ot "${OUTPUT}" ]; then + if [ "${INPUT}" -ot "${OUTPUT}" ]; then + echo "${OUTPUT} is up to date"; + exit; + fi +fi + +echo "Generating ${OUTPUT}"; + +( +echo "# =============================================" +echo "# THIS FILE WAS GENERATED; DO NOT EDIT MANUALLY" +echo "# =============================================" +echo "#" +echo "# Yet Another UserAgent Analyzer" +echo "# Copyright (C) 2013-2018 Niels Basjes" +echo "#" +echo "# Licensed under the Apache License, Version 2.0 (the \"License\");" +echo "# you may not use this file except in compliance with the License." +echo "# You may obtain a copy of the License at" +echo "#" +echo "# http://www.apache.org/licenses/LICENSE-2.0" +echo "#" +echo "# Unless required by applicable law or agreed to in writing, software" +echo "# distributed under the License is distributed on an \"AS IS\" BASIS," +echo "# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied." +echo "# See the License for the specific language governing permissions and" +echo "# limitations under the License." +echo "#" +echo "config:" + +echo "- lookup:" +echo " name: 'UbuntuOSName'" +echo " map:" +fgrep -v '#' "${INPUT}" | grep . | while read line +do + firstname=$( echo "${line}" | sed 's@ *| *@|@g' | cut -d'|' -f1 | cut -d' ' -f1) + name=$( echo "${line}" | sed 's@ *| *@|@g' | cut -d'|' -f1) + version=$( echo "${line}" | sed 's@ *| *@|@g' | cut -d'|' -f2) + echo " \"${firstname}\" : \"Ubuntu\"" + echo " \"${name}\" : \"Ubuntu\"" + echo " \"ubuntu-${firstname}\" : \"Ubuntu\"" +done + +echo "- lookup:" +echo " name: 'UbuntuOSVersion'" +echo " map:" +fgrep -v '#' "${INPUT}" | grep . | while read line +do + firstname=$( echo "${line}" | sed 's@ *| *@|@g' | cut -d'|' -f1 | cut -d' ' -f1) + name=$( echo "${line}" | sed 's@ *| *@|@g' | cut -d'|' -f1) + version=$( echo "${line}" | sed 's@ *| *@|@g' | cut -d'|' -f2) + echo " \"${firstname}\" : \"${version}\"" + echo " \"${name}\" : \"${version}\"" + echo " \"ubuntu-${firstname}\" : \"${version}\"" +done + +) > ${OUTPUT} diff --git a/analyzer/src/main/resources/UserAgents/UbuntuVersions/UbuntuVersions.csv b/analyzer/src/main/resources/UserAgents/UbuntuVersions/UbuntuVersions.csv new file mode 100644 index 0000000000..e35ec3608b --- /dev/null +++ b/analyzer/src/main/resources/UserAgents/UbuntuVersions/UbuntuVersions.csv @@ -0,0 +1,47 @@ +# +# Yet Another UserAgent Analyzer +# Copyright (C) 2013-2018 Niels Basjes +# +# 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. + +# Name | Version +Warty Warthog | 4.10 +Hoary Hedgehog | 5.04 +Breezy Badger | 5.10 +Dapper Drake | 6.06 +Edgy Eft | 6.10 +Feisty Fawn | 7.04 +Gutsy Gibbon | 7.10 +Hardy Heron | 8.04 +Intrepid Ibex | 8.10 +Jaunty Jackalope | 9.04 +Karmic Koala | 9.10 +Lucid Lynx | 10.04 +Maverick Meerkat | 10.10 +Natty Narwhal | 11.04 +Oneiric Ocelot | 11.10 +Precise Pangolin | 12.04 +Quantal Quetzal | 12.10 +Raring Ringtail | 13.04 +Saucy Salamander | 13.10 +Trusty Tahr | 14.04 +Utopic Unicorn | 14.10 +Vivid Vervet | 15.04 +Wily Werewolf | 15.10 +Xenial Xerus | 16.04 +Yakkety Yak | 16.10 +Zesty Zapus | 17.04 +Artful Aardvark | 17.10 +Bionic Beaver | 18.04 +Cosmic Cuttlefish | 18.10 + diff --git a/analyzer/src/main/resources/UserAgents/reindent.sh b/analyzer/src/main/resources/UserAgents/reindent.sh index 295382d5f1..1bfd802ab4 100755 --- a/analyzer/src/main/resources/UserAgents/reindent.sh +++ b/analyzer/src/main/resources/UserAgents/reindent.sh @@ -21,6 +21,7 @@ s@^ *\([\"a-zA-Z_]\)@ \1@ s@^ *config:@config:@ s@^ *\(- '\)@ \1@ s@^ *\(- [a-z]\)@\1@ +s@^ *variable:@ variable:@ s@^ *require:@ require:@ s@^ *extract:@ extract:@ s@^ *options:@ options:@