Apache Qpid C++ 0.27 Installation Notes

Apache Qpid C++ 0.29 Installation Notes

Thank you for installing Apache Qpid version 0.27 for Windows. +

Thank you for installing Apache Qpid version 0.29 for Windows. If the requisite features were installed, you can now run a broker, use the example programs, and design your own messaging programs while reading the Qpid C++ API reference documentation.

--load-module

-cd "C:\Program Files\Apache\qpidc-0.27" +cd "C:\Program Files\Apache\qpidc-0.29" qpidd.exe --load-module plugins\broker\store.dll --load-module plugins\broker\msclfs_store.dll

--load-module

$(MSBuildProjectDirectory)\..\..

$(MSBuildProjectDirectory)\stage

0.27

0.29

qpidc

Package

C:\Program Files (x86)\Windows Installer XML v3.5\bin

Date: Thu, 20 Mar 2014 20:58:51 +0000 Subject: QPID-5631: Adjust for changes to Qpid CMake detection of Proton. Buried deep in cpp\bindings\qpid\dotnet is a script configure-windows.ps1. This script originally came into being to support the .NET binding, which is a .NET project that has no support from CMake. The script gathers the facts of where cmake runs and where boost comes from and embeds the environment into launch scripts used to start the .NET binding solution(s). Then the .NET solution can link naturally to the rest of the cmake project environment. Before this commit the script was very liberal about where one could root a build (run cmake). This patch forces some order onto the build and install directories to ease integration with proton. I use a couple of conventions and it makes life much easier. 1. Map some drives. Drive P: maps to the root of a proton checkout Drive Q: maps to the root of a qpid checkout Strictly speaking this is not necessary and if you use this scheme then you must be careful about the drive mappings. If you get them wrong then your builds will be confused. 2. Use fixed names for the studio/platform builds and installs. Builds go to: P:\build_2008_x86 Q:\build_2008_x86 P:\build_2008_x64 Q:\build_2008_x64 P:\build_2010_x86 Q:\build_2010_x86 P:\build_2010_x64 Q:\build_2010_x64 Installs go to: Q:\install_2008_x86 Q:\install_2008_x64 Q:\install_2010_x86 Q:\install_2010_x64 That is, cmake for a VS2010 32-bit build is run in P:\build_2010_x86 and Q:\build_2010_x86 But both of these builds use -DCMAKE_INSTALL_PREFIX=Q:\install_2010_x86 to install into the same place. 3. To build qpid with proton support: build and install proton first and then build and install qpid. To build qpid with no proton support: just build and optionally install qpid. Other fixes to this script are: * Adds --help option * It does only one studio/platform at a time. It doesn't mix 32- and 64-bit builds together. * It is callable from the command line: > cd cpp\bindings\qpid\dotnet > powershell -ExecutionPolicy unrestricted .\configure-windows.ps1 2010-x86 c:\boost-win-1.47-32bit-vs2010 It will create the canonical build directory and run cmake in it. * A new batch file is emitted that has the exact cmake command used. You can use this to rerun cmake without rerunning any powershell. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1579734 13f79535-47bb-0310-9956-ffa450edef68 --- .../cpp/bindings/qpid/dotnet/configure-windows.ps1 | 661 +++++++++------------ 1 file changed, 286 insertions(+), 375 deletions(-) diff --git a/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1 b/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1 index 50d9741e95..5fef45ed87 100644 --- a/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1 +++ b/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1 @@ -17,51 +17,49 @@ # under the License. # -# -# configure-windows.ps1 -# ===================== +Set-PSDebug -Trace 0 +Set-PSDebug -strict +$ErrorActionPreference='Stop' + +$global:usageText = @("# +# configure-windows.ps1 [studio-and-architecture [boost-root-directory]] # # This script configures a qpid\cpp developer build environment under Windows # to enable working with cpp\bindings\qpid\dotnet binding source code. # -# * Supports multiple versions of Visual Studio (VS2008, VS2010, VS2012) -# as CMake generator. -# -# * Supports 32-bit and/or 64-bit development platforms. -# -# * User chooses in-source or out-of-source build directories. -# -# - 'In-source' builds happen when CMake is run from directory qpid\cpp. -# Hundreds of CMake-generated output files are placed in qpid\cpp\src. -# These files go right on top of files that are part of the source tree -# in qpid\cpp\src. -# In-source builds support only one platform. -# Choose only a 32-bit or a 64-bit platform but not both. -# -# - Out-of-source builds happen when the user chooses another directory -# under qpid in which to run CMake. Out-of-source builds are required -# in order to build both x86 and x64 targets using the same source tree. -# For each build platform (32-bit x86 or Win32, or 64-bit x64) the user -# specifies a build directory and a specific version of Boost. -# Many platform/Boost-version directories may reside side by side. -# -# * User chooses to run CMake or not. -# -# - When a new build directory is created then the user is given the -# option of running CMake in that directory. Running CMake is a -# necessary step as CMake creates important source, solution, and -# project files. -# -# - If a directory "looks like" is has already had CMake run in it -# then this script skips running CMake again. -# -# * User chooses to include Proton or not. -# -# - Proton is included by having variable PROTON_ROOT reference the -# directory where proton was installed. +# ARG PROCESSING +# ============== +# All arguments may be specified on the command line. If not then this +# script will prompt the user for choices. +# +# * studio-and-architecture +# User chooses a version of Visual Studio and a target platform: +# 2012-x86 +# 2012-x64 +# 2010-x86 +# 2010-x64 +# 2008-x86 +# 2008-x64 +# +# * boost-root-directory +# The path to the version of boost to be used in this build +# +# CONFIGURATION OUTPUT +# ==================== +# This script uses these build and install directories for the build: +# build_2008_x86 install_2008_x86 +# build_2010_x86 install_2010_x86 +# build_2008_x64 install_2008_x64 +# build_2010_x64 install_2010_x64 +# +# +# PROTON AMQP 1.0 +# =============== +# Proton is included automatically by having previously executed proton's +# ""make install"" to the install_xx_xxxx directory that qpid is about to use. # # Prerequisites -# +# ============= # 1. Powershell must be installed. # 2. 32-bit and/or 64-bit Boost libraries must be installed in separate # directories. A user system may have any number of Boost library @@ -70,7 +68,7 @@ # 3. CMake 2.8 (or later) must be installed. The cmake\bin directory # must be in the user's path. # 4. Boost library specifications may or may not be in the user's path. -# The script author recommeds not to have Boost in the path and only +# The script author recommends not to have Boost in the path and only # allow the Boost path to be specified by generated command procedures. # 5. Visual Studio build environment must be installed. # @@ -78,88 +76,71 @@ # Use case: Create a new build environment # ======================================== # -# Required Boost: +# Required VS2010 Boost: # 32-bit library - C:\Boost # 64-bit library - D:\Boost_64 # # Required Qpid checkout tree # C:\svn\qpid\... # -# Run this script. It will ask for four directories: -# -# Needed info User clicks on or adds new -# ---------------- -------------------------- -# 32-bit Boost C:\boost -# 32-bit build dir C:\svn\qpid\build32 -# 64-bit Boost D:\Boost_64 -# 64-bit build dir C:\svn\qpid\build64 -# -# In this example the build dirs are new. The script will prompt -# asking if CMake is to run in the build directories. User chooses Yes. -# -# Now this script runs CMake twice, once each with the 32-bit and 64-bit -# generators. -# * This step creates qpid-cpp.sln and related project files. -# C:\svn\qpid\build32\qpid-cpp.sln -# C:\svn\qpid\build64\qpid-cpp.sln +# Run this script, select VS2010 compiler, x86 platform: # -# This script generates other scripts as follows: +# configure-windows.ps1 2010-x86 C:\Boost # -# C:\svn\qpid\build32\start-devenv-messaging-x86-32bit.ps1 -# C:\svn\qpid\build32\start-devenv-messaging-x86-32bit.bat -# C:\svn\qpid\build32\setenv-messaging-x86-32bit.bat +# This script will automatically create build directory +# C:\svn\qpid\build_2010_x86 # -# C:\svn\qpid\build64\start-devenv-messaging-x64-64bit.ps1 -# C:\svn\qpid\build64\start-devenv-messaging-x64-64bit.bat -# C:\svn\qpid\build64\setenv-messaging-x64-64bit.bat +# Next this script runs CMake. # -# Next the user compiles solution qpid\build32\qpid-cpp.sln. -# -# Using the generated scripts: -# -# Case 1. Run an executable in 32-bit mode. -# 1. Open a command prompt. -# 2. > CD c:\svn\qpid\build32 -# 3. > CALL setenv-messaging-x86-32bit.bat -# 4. > CD src\debug -# 5. > run the chosen program -# -# Note: Step #3 adds Boost to the user's path. This script selects the -# version of Boost to match the executables in src\debug. -# -# Case 2. Launch Visual Studio org.apache.qpid.messaging.sln in 64-bit mode. -# 1. > CD c:\svn\qpid\build64 -# 2. > powershell start-devenv-messaging-x64-64bit.ps1 -# or -# 1. Double-click c:\svn\qpid\build64\start-devenv-messaging-x64-64bit.bat +# * This step creates qpid-cpp.sln and related project files. +# C:\svn\qpid\build_2010_x86\qpid-cpp.sln # -# Note: In this case the scripts set QPID_BUILD_ROOT to point to the out-of- -# source directory used by qpid-cpp.sln. Also the scripts put Boost in -# the path so that executables may run directly from Visual Studio. +# This script generates several other helper scripts: # - -Set-PSDebug -Trace 0 -Set-PSDebug -strict -$ErrorActionPreference='Stop' +# C:\svn\qpid\build_2010_x86\start-devenv-messaging-x86-32bit.ps1 +# C:\svn\qpid\build_2010_x86\start-devenv-messaging-x86-32bit.bat +# C:\svn\qpid\build_2010_x86\setenv-messaging-x86-32bit.bat +# C:\svn\qpid\build_2010_x86\run-cmake.bat +# C:\svn\qpid\build_2010_x86\run-qpid-devenv-debug.bat +") ############################# # global strings to be written to script files # $global:txtPath = '$env:PATH' $global:txtQR = '$env:QPID_BUILD_ROOT' -$global:txtPR = '$env:PROTON_ROOT' $global:txtWH = 'Write-Host' ############################# # Visual Studio version selection dialog items and choice # -[array]$global:VsVersionCmakeChoiceList = "Visual Studio 2012", "Visual Studio 2010", "Visual Studio 2008" -$global:vsVersion = '' -$global:cmakeGenerator = '' -$global:vsSubdir = '' -$global:cmakeCompiler = '' -$global:cmakeCommandLine32 = '' -$global:cmakeCommandLine64 = '' +[array]$global:VsVersionCmakeChoiceList = ` + "Visual Studio 2012 - x86", ` + "Visual Studio 2012 - x64", ` + "Visual Studio 2010 - x86", ` + "Visual Studio 2010 - x64", ` + "Visual Studio 2008 - x86", ` + "Visual Studio 2008 - x64" +$global:vsSelectedOption = '' +$global:vsVersion = '' # "Visual Studio 2010" +$global:vsShortName = '' # "2010" +$global:cmakeGenerator = '' # "Visual Studio 10" +$global:vsSubdir = '' # "msvc10" +$global:cmakeCompiler = '' # "-vc100" +$global:build32or64 = '' # "32" or "64" +$global:buildPathSizeId = '' # "x86" or "x64" + +$global:cmakeCommandLine = '' + +$global:boostRootPath = '' + +############################# +# Usage +# +function Usage +{ + Write-Host $global:usageText +} ############################# # Select-Folder @@ -198,7 +179,7 @@ function AskYesOrNo ($Question="No question?", $Title="No Title?") # function SanityCheckBoostPath ($path=0) { - $result = $true + $result = 1 $displayPath = "" if ($path -ne $null) { @@ -208,11 +189,11 @@ function SanityCheckBoostPath ($path=0) foreach ($pattern in $toTest) { $target = Join-Path $path $pattern if (!(Test-Path -path $target)) { - $result = $false + $result = 0 } } } else { - $result = $false + $result = 0 } if (! $result) { @@ -222,37 +203,6 @@ function SanityCheckBoostPath ($path=0) } -############################# -# SanityCheckProtonInstallPath -# A path is a "proton install path" if it contains -# both bin and include subdirectories. -# -function SanityCheckProtonInstallPath ($path=0) -{ - $result = $true - $displayPath = "" - - if ($path -ne $null) { - $displayPath = $path - - $toTest = ('include', 'bin') - foreach ($pattern in $toTest) { - $target = Join-Path $path $pattern - if (!(Test-Path -path $target)) { - $result = $false - } - } - } else { - $result = $false - } - - if (! $result) { - Write-Host "The path ""$displayPath"" does not appear to be a Proton install root path." - } - $result -} - - ############################# # SanityCheckBuildPath # A path is a "build path" if it contains @@ -260,7 +210,7 @@ function SanityCheckProtonInstallPath ($path=0) # function SanityCheckBuildPath ($path=0) { - $result = $true + $result = 1 $displayPath = "" if ($path -ne $null) { $displayPath = $path @@ -270,11 +220,11 @@ function SanityCheckBuildPath ($path=0) foreach ($pattern in $toTest) { $target = Join-Path $path $pattern if (!(Test-Path -path $target)) { - $result = $false + $result = 0 } } } else { - $result = $false + $result = 0 } if (! $result) { Write-Host "The path ""$displayPath"" does not appear to be a Qpid C++ build root path." @@ -300,16 +250,14 @@ function WriteDotnetBindingSlnLauncherPs1 [string] $nBits, [string] $outfileName, [string] $studioVersion, - [string] $studioSubdir, - [string] $protonRoot + [string] $studioSubdir ) $out = @("# # Launch $slnName in $studioVersion $vsPlatform ($nBits-bit) environment # -$global:txtPath = ""$protonRoot\bin;$boostRoot\lib;$global:txtPath"" +$global:txtPath = ""$boostRoot\lib;$global:txtPath"" $global:txtQR = ""$buildRoot"" -$global:txtPR = ""$protonRoot"" $global:txtWH ""Launch $slnName in $studioVersion $vsPlatform ($nBits-bit) environment."" $cppDir\bindings\qpid\dotnet\$vsSubdir\$slnName ") @@ -366,8 +314,7 @@ function WriteDotnetBindingEnvSetupBat [string] $outfileName, [string] $studioVersion, [string] $studioSubdir, - [string] $cmakeLine, - [string] $protonRoot + [string] $cmakeLine ) $out = @("@ECHO OFF @@ -383,9 +330,8 @@ REM The solution was generated with cmake command line: REM $cmakeLine ECHO %PATH% | FINDSTR /I boost > NUL IF %ERRORLEVEL% EQU 0 ECHO WARNING: Boost is defined in your path multiple times! -SET PATH=$protonRoot\bin;$boostRoot\lib;%PATH% +SET PATH=$boostRoot\lib;%PATH% SET QPID_BUILD_ROOT=$buildRoot -SET PROTON_ROOT=$protonRoot ECHO Environment set for $slnName $studioVersion $vsPlatform $nBits-bit development. ") Write-Host " $buildRoot\$outfileName" @@ -393,32 +339,96 @@ ECHO Environment set for $slnName $studioVersion $vsPlatform $nBits-bit developm } ############################# -# Return the SelectedItem from the dropdown list and close the form. +# WriteCmakeRerunnerBat +# Write a batch file that runs cmake again # -function Return-DropDown { +function WriteCmakeRerunnerBat +{ + param + ( + [string] $slnName, + [string] $boostRoot, + [string] $buildRoot, + [string] $vsPlatform, + [string] $nBits, + [string] $outfileName, + [string] $studioVersion, + [string] $studioSubdir, + [string] $cmakeLine + ) + + $out = @("@ECHO OFF +REM +REM Call this command procedure from a command prompt to rerun cmake +REM $studioVersion $vsPlatform ($nBits-bit) +REM +$cmakeLine +") + Write-Host " $buildRoot\$outfileName" + $out | Out-File "$buildRoot\$outfileName" -encoding ASCII +} + +############################# +# Given a visual studio selection from command line or selection list +# Return the visual studio and architecture settings or exit +# +function ParseStudioSelection +{ + param + ( + [string] $vsSelection + ) + Write-Host "Checking studio version: $vsSelection" + if ($vsSelection.Contains("2012")) { + $global:vsVersion = "Visual Studio 2012" + $global:cmakeGenerator = "Visual Studio 11" + $global:vsSubdir = "msvc11" + $global:cmakeCompiler = "-vc110" + $global:vsShortName = "2012" + } elseif ($vsSelection.Contains("2010")) { + $global:vsVersion = "Visual Studio 2010" + $global:cmakeGenerator = "Visual Studio 10" + $global:vsSubdir = "msvc10" + $global:cmakeCompiler = "-vc100" + $global:vsShortName = "2010" + } elseif ($vsSelection.Contains("2008")) { + $global:vsVersion = "Visual Studio 2008" + $global:cmakeGenerator = "Visual Studio 9 2008" + $global:vsSubdir = "msvc9" + $global:cmakeCompiler = "-vc90" + $global:vsShortName = "2008" + } else { + Write-Host "Visual Studio must be 2008, 2010, or 2012" + exit + } + $global:vsSelectedOption = $vsSelection + + if ($vsSelection.Contains("x86")) { + $global:buildPathSizeId = "x86" + $global:build32or64 = "32" + } elseif ($vsSelection.Contains("x64")) { + $global:buildPathSizeId = "x64" + $global:build32or64 = "64" + # Promote CMAKE generator to 64 bit variant + $global:cmakeGenerator += " Win64" + } else { + Write-Host "Studio selection must contain x86 or x64" + exit + } +} + +############################# +# When the user presses 'select' then this function handles it. +# Return the visual studio and architecture. +# Close the form. +# +function SelectVisualStudio { if ($DropDown.SelectedItem -ne $null) { - $global:vsVersion = $DropDown.SelectedItem.ToString() - if ($global:vsVersion -eq 'Visual Studio 2012') { - $global:cmakeGenerator = "Visual Studio 11" - $global:vsSubdir = "msvc11" - $global:cmakeCompiler = "-vc110" - } else { - if ($global:vsVersion -eq 'Visual Studio 2010') { - $global:cmakeGenerator = "Visual Studio 10" - $global:vsSubdir = "msvc10" - $global:cmakeCompiler = "-vc100" - } else { - if ($global:vsVersion -eq 'Visual Studio 2008') { - $global:cmakeGenerator = "Visual Studio 9 2008" - $global:vsSubdir = "msvc9" - $global:cmakeCompiler = "-vc90" - } else { - Write-Host "Visual Studio must be 2008, 2010, or 2012" - exit - } - } - } - $Form.Close() + $vsVersion = $DropDown.SelectedItem.ToString() + + ParseStudioSelection $vsVersion + + $Form.Close() 2> $null Write-Host "Selected generator: $global:cmakeGenerator" } } @@ -432,29 +442,24 @@ function SelectVisualStudioVersion { $Form.width = 350 $Form.height = 150 - $Form.Text = "Select Visual Studio Version" + $Form.Text = "Select Visual Studio Version and platform" $DropDown = new-object System.Windows.Forms.ComboBox $DropDown.Location = new-object System.Drawing.Size(120,10) $DropDown.Size = new-object System.Drawing.Size(150,30) ForEach ($Item in $global:VsVersionCmakeChoiceList) { - $DropDown.Items.Add($Item) + [void] $DropDown.Items.Add($Item) } $DropDown.SelectedIndex = 0 $Form.Controls.Add($DropDown) -# $DropDownLabel.Location = new-object System.Drawing.Size(10,10) -# $DropDownLabel.size = new-object System.Drawing.Size(100,20) -# $DropDownLabel.Text = "" -# $Form.Controls.Add($DropDownLabel) - $Button = new-object System.Windows.Forms.Button $Button.Location = new-object System.Drawing.Size(120,50) $Button.Size = new-object System.Drawing.Size(120,20) $Button.Text = "Select" - $Button.Add_Click({Return-DropDown}) + $Button.Add_Click({SelectVisualStudio}) $form.Controls.Add($Button) $Form.Add_Shown({$Form.Activate()}) @@ -476,237 +481,143 @@ function SelectVisualStudioVersion { [System.Reflection.Assembly]::LoadWithPartialName("System.Drawing") | Out-Null ############################# -# User dialog to select a version of Visual Studio as CMake generator +# Get command line args # -SelectVisualStudioVersion - -############################# -# User dialog to get optional 32-bit boost, proton, and build paths -# -$boost32 = Select-Folder -message "Select 32-bit BOOST_ROOT folder for $global:vsVersion build. Press CANCEL to skip 32-bit processing." - -$defined32 = ($boost32 -ne $null) -and ($boost32 -ne '') -if ($defined32) { - $found = SanityCheckBoostPath $boost32 - if (! $found) { +if ($args.Length -ge 1) { + if (($args[0].Contains("help")) -or ($args[0].Contains("-h"))) { + Usage exit } + + $vsVer = $args[0] + ParseStudioSelection $vsVer } -$make32 = $false -if ($defined32) { - - $proton32folder = Select-Folder -message "Select 32-bit Proton install folder for $global:vsVersion build." - - $found = ($proton32folder -ne $null) -and ($proton32folder -ne '') - if ($found) { - $found = SanityCheckProtonInstallPath $proton32folder - } - if ($found) { - $proton32cmake = """-DPROTON_ROOT=$proton32folder""" - } else { - $proton32cmake = "" - } - - $build32 = Select-Folder -message "Select 32-bit QPID_BUILD_ROOT folder for $global:vsVersion build." -path $projRoot - - $found = ($build32 -ne $null) -and ($build32 -ne '') - if (! $found) { - Write-Host "You must select a build root folder for 32-bit builds" - exit - } - $found = SanityCheckBuildPath $build32 - if ($found) { - Write-Host "Directory ""$build32"" is already set by CMake. CMake will not be re-run." - } else { - $make32 = AskYesOrNo "Run CMake in $build32 ?" "32-Bit Builds - Choose CMake run or not" - } +if ($args.Length -ge 2) { + $global:boostRootPath = $args[1] } ############################# -# User dialog to get optional 64-bit boost, proton, and build paths +# User dialog to select a version of Visual Studio as CMake generator # -$boost64 = Select-Folder -message "Select 64-bit BOOST_ROOT folder for $global:vsVersion build. Press CANCEL to skip 64-bit processing." - -$defined64 = ($boost64 -ne $null) -and ($boost64 -ne '') -if ($defined64) { - $found = SanityCheckBoostPath $boost64 - if (! $found) { - exit - } +if ($global:vsVersion -eq '') { + SelectVisualStudioVersion } -$make64 = $false -if ($defined64) { - $proton64folder = Select-Folder -message "Select 64-bit Proton install folder for $global:vsVersion build." - - $found = ($proton64folder -ne $null) -and ($proton64folder -ne '') - if ($found) { - $found = SanityCheckProtonInstallPath $proton64folder - } - if ($found) { - $proton64cmake = """-DPROTON_ROOT=$proton64folder""" - } else { - $proton64cmake = "" - } - - $build64 = Select-Folder -message "Select 64-bit QPID_BUILD_ROOT folder for $global:vsVersion build." -path $projRoot +############################# +# User dialog to get boost paths +# +if ($global:boostRootPath -eq '') { + $global:boostRootPath = Select-Folder -message "Select BOOST_ROOT folder for $global:vsSelectedOption build. Press CANCEL to quit" +} - $found = ($build64 -ne $null) -and ($build64 -ne '') +############################# +# Decide to run cmake or not. +# If the build directory is absent the run cmake +# If the build directory already exists then it's the user's choice +# +$make = 0 +$defined = ($global:boostRootPath -ne $null) -and ($global:boostRootPath -ne '') +if ($defined) { + $found = SanityCheckBoostPath $global:boostRootPath if (! $found) { - Write-Host "You must select a build root folder for 64-bit builds" exit } - $found = SanityCheckBuildPath $build64 + + $build = Join-Path $projRoot "build_${global:vsShortName}_${global:buildPathSizeId}" + $install = Join-Path $projRoot "install_${global:vsShortName}_${global:buildPathSizeId}" + + $found = SanityCheckBuildPath $build if ($found) { - Write-Host "Directory ""$build64"" is already set by CMake. CMake will not be re-run." + $make = AskYesOrNo "build directory ""$build"" appears to have run cmake already. Run cmake again?" } else { - $make64 = AskYesOrNo "Run CMake in $build64 ?" "64-Bit Builds - Choose CMake run or not" + $make = 1 } } -############################# -# Conditionally run CMake -# -# 32-bit X86 -# -if ($make32) { - cd "$build32" - $global:cmakeCommandLine32 = "CMake -G ""$global:cmakeGenerator"" ""-DBUILD_DOCS=No"" ""-DCMAKE_INSTALL_PREFIX=$build32/install"" ""-DBoost_COMPILER=$global:cmakeCompiler"" ""-DBOOST_ROOT=$boost32"" $proton32cmake $cppDir" - Write-Host "Running 32-bit CMake in $build32 : $global:cmakeCommandLine32" - CMake -G "$global:cmakeGenerator" "-DBUILD_DOCS=No" "-DCMAKE_INSTALL_PREFIX=$build32/install" "-DBoost_COMPILER=$global:cmakeCompiler" "-DBOOST_ROOT=$boost32" $proton32cmake $cppDir -} else { - Write-Host "Skipped 32-bit CMake." +if (! $make) { + exit } +############################# +# run CMake # -# 64-bit X64 -# -if ($make64) { - cd "$build64" - Write-Host "Running 64-bit CMake in $build64" - $global:cmakeCommandLine64 = "CMake -G ""$global:cmakeGenerator Win64"" ""-DBUILD_DOCS=No"" ""-DCMAKE_INSTALL_PREFIX=$build64/install"" ""-DBoost_COMPILER=$global:cmakeCompiler"" ""-DBOOST_ROOT=$boost64"" $proton64cmake $cppDir" - Write-Host $global:cmakeCommandLine64 - Write-Host "" - CMake -G "$global:cmakeGenerator Win64" "-DBUILD_DOCS=No" "-DCMAKE_INSTALL_PREFIX=$build64/install" "-DBoost_COMPILER=$global:cmakeCompiler" "-DBOOST_ROOT=$boost64" $proton64cmake $cppDir -} else { - Write-Host "Skipped 64-bit CMake." +if(!(Test-Path -Path $build)) { + New-Item -ItemType directory -Path $build } +cd "$build" +$global:cmakeCommandLine = "CMake -G ""$global:cmakeGenerator"" " +$global:cmakeCommandLine += """-DBUILD_DOCS=No"" " +$global:cmakeCommandLine += """-DCMAKE_INSTALL_PREFIX=$install"" " +$global:cmakeCommandLine += """-DBoost_COMPILER=$global:cmakeCompiler"" " +$global:cmakeCommandLine += """-DBOOST_ROOT=$global:boostRootPath"" " +$global:cmakeCommandLine += $cppDir +Write-Host "Running CMake in $build : $global:cmakeCommandLine" +& cmd /c "$global:cmakeCommandLine 2>&1" + ############################# # Emit scripts # -# 32-bit scripts -# -if ($defined32) { - - Write-Host "Writing 32-bit scripts..." - - ########### - # Powershell script to launch org.apache.qpid.messaging.sln - # - WriteDotnetBindingSlnLauncherPs1 -slnName "org.apache.qpid.messaging.sln" ` - -boostRoot "$boost32" ` - -buildRoot "$build32" ` - -cppDir "$cppDir" ` - -vsPlatform "x86" ` - -nBits "32" ` - -outfileName "start-devenv-messaging-$global:vsSubdir-x86-32bit.ps1" ` - -studioVersion "$global:vsVersion" ` - -studioSubdir "$global:vsSubdir" ` - -protonRoot "$proton32folder" - - - ########### - # Batch script (that you doubleclick) to launch powershell script - # that launches org.apache.qpid.messaging.sln. - # - WriteDotnetBindingSlnLauncherBat -slnName "org.apache.qpid.messaging.sln" ` - -buildRoot "$build32" ` - -vsPlatform "x86" ` - -nBits "32" ` - -psScriptName "start-devenv-messaging-$global:vsSubdir-x86-32bit.ps1" ` - -outfileName "start-devenv-messaging-$global:vsSubdir-x86-32bit.bat" ` - -studioVersion "$global:vsVersion" ` - -studioSubdir "$global:vsSubdir" - - ########### - # Batch script (that you CALL from a command prompt) - # to establish the org.apache.qpid.messaging.sln build environment. - # - WriteDotnetBindingEnvSetupBat -slnName "org.apache.qpid.messaging.sln" ` - -boostRoot "$boost32" ` - -buildRoot "$build32" ` - -vsPlatform "x86" ` - -nBits "32" ` - -outfileName "setenv-messaging-$global:vsSubdir-x86-32bit.bat" ` +Write-Host "Writing helper scripts..." + +########### +# Powershell script to launch org.apache.qpid.messaging.sln +# +WriteDotnetBindingSlnLauncherPs1 -slnName "org.apache.qpid.messaging.sln" ` + -boostRoot "$global:boostRootPath" ` + -buildRoot "$build" ` + -cppDir "$cppDir" ` + -vsPlatform $global:buildPathSizeId ` + -nBits $global:build32or64 ` + -outfileName "start-devenv-messaging-$global:vsSubdir-$global:buildPathSizeId-$global:build32or64-bit.ps1" ` + -studioVersion "$global:vsVersion" ` + -studioSubdir "$global:vsSubdir" + +########### +# Batch script (that you doubleclick) to launch powershell script +# that launches org.apache.qpid.messaging.sln. +# +WriteDotnetBindingSlnLauncherBat -slnName "org.apache.qpid.messaging.sln" ` + -buildRoot "$build" ` + -vsPlatform $global:buildPathSizeId ` + -nBits $global:build32or64 ` + -psScriptName "start-devenv-messaging-$global:vsSubdir-$global:buildPathSizeId-$global:build32or64-bit.ps1" ` + -outfileName "start-devenv-messaging-$global:vsSubdir-$global:buildPathSizeId-$global:build32or64-bit.bat" ` -studioVersion "$global:vsVersion" ` - -studioSubdir "$global:vsSubdir" ` - -cmakeLine "$global:cmakeCommandLine32" ` - -protonRoot "$proton32folder" - -} else { - Write-Host "Skipped writing 32-bit scripts." -} - -############################# -# 64-bit scripts -# -if ($defined64) { - - Write-Host "Writing 64-bit scripts..." - - ########### - # Powershell script to launch org.apache.qpid.messaging.sln - # - WriteDotnetBindingSlnLauncherPs1 -slnName "org.apache.qpid.messaging.sln" ` - -boostRoot "$boost64" ` - -buildRoot "$build64" ` - -cppDir "$cppDir" ` - -vsPlatform "x64" ` - -nBits "64" ` - -outfileName "start-devenv-messaging-$global:vsSubdir-x64-64bit.ps1" ` - -studioVersion "$global:vsVersion" ` - -studioSubdir "$global:vsSubdir" - - - ########### - # Batch script (that you doubleclick) to launch powershell script - # that launches org.apache.qpid.messaging.sln. - # - WriteDotnetBindingSlnLauncherBat -slnName "org.apache.qpid.messaging.sln" ` - -buildRoot "$build64" ` - -vsPlatform "x64" ` - -nBits "64" ` - -psScriptName "start-devenv-messaging-$global:vsSubdir-x64-64bit.ps1" ` - -outfileName "start-devenv-messaging-$global:vsSubdir-x64-64bit.bat" ` - -studioVersion "$global:vsVersion" ` - -studioSubdir "$global:vsSubdir" ` - -protonRoot "$proton64folder" - - ########### - # Batch script (that you CALL from a command prompt) - # to establish the org.apache.qpid.messaging.sln build environment. - # - WriteDotnetBindingEnvSetupBat -slnName "org.apache.qpid.messaging.sln" ` - -boostRoot "$boost64" ` - -buildRoot "$build64" ` - -vsPlatform "x64" ` - -nBits "64" ` - -outfileName "setenv-messaging-$global:vsSubdir-x64-64bit.bat" ` - -studioVersion "$global:vsVersion" ` - -studioSubdir "$global:vsSubdir" ` - -cmakeLine "$global:cmakeCommandLine64" ` - -protonRoot "$proton64folder" - -} else { - Write-Host "Skipped writing 64-bit scripts." -} - + -studioSubdir "$global:vsSubdir" + +########### +# Batch script (that you CALL from a command prompt) +# to establish the org.apache.qpid.messaging.sln build environment. +# +WriteDotnetBindingEnvSetupBat -slnName "org.apache.qpid.messaging.sln" ` + -boostRoot "$boost" ` + -buildRoot "$build" ` + -vsPlatform $global:buildPathSizeId ` + -nBits $global:build32or64 ` + -outfileName "setenv-messaging-$global:vsSubdir-$global:buildPathSizeId-$global:build32or64-bit.bat" ` + -studioVersion "$global:vsVersion" ` + -studioSubdir "$global:vsSubdir" ` + -cmakeLine "$global:cmakeCommandLine" + +########### +# Batch script to re-run cmake +# +WriteCmakeRerunnerBat -slnName "org.apache.qpid.messaging.sln" ` + -boostRoot "$boost" ` + -buildRoot "$build" ` + -vsPlatform $global:buildPathSizeId ` + -nBits $global:build32or64 ` + -outfileName "run-cmake.bat" ` + -studioVersion "$global:vsVersion" ` + -studioSubdir "$global:vsSubdir" ` + -cmakeLine "$global:cmakeCommandLine" + ############################# # Pause on exit. If user ran this script through a graphical launch and there's # an error then the window closes and the user never sees the error. This pause # gives him a chance to figure it out. # Write-Host "Press any key to continue ..." -$x = $host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown") +[void] $host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown") -- cgit v1.2.1 From 68818478d8c394099456628ad2a930906413c458 Mon Sep 17 00:00:00 2001 From: Alex Rudyy Date: Fri, 21 Mar 2014 09:33:29 +0000 Subject: QPID-5635: Fix 'partitionCount' attribute setting for BoneCP connection pool UI in Web Management console UI git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1579904 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/resources/virtualhost/store/pool/bonecp/add.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html index 0a83bd9f6f..5b053849a3 100644 --- a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html +++ b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html @@ -20,7 +20,7 @@ Partition Count: + name="partitionCount" value="4" smallDelta="1" constraints="{min:1,max:1000,places:0}"/> -- cgit v1.2.1 From cdfa97831a3653390fb11baf69d8015af84311bb Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Fri, 21 Mar 2014 11:18:45 +0000 Subject: QPID-5625 : Fix saving of "createdBy" attribute which is incorrectly saving as an object rather than a string git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1579926 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/qpid/server/model/adapter/AbstractConfiguredObject.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractConfiguredObject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractConfiguredObject.java index ec48aa7936..1bdb638765 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractConfiguredObject.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/AbstractConfiguredObject.java @@ -212,7 +212,7 @@ public abstract class AbstractConfiguredObject> im final AuthenticatedPrincipal currentUser = SecurityManager.getCurrentUser(); if(currentUser != null) { - _attributes.put(CREATED_BY, currentUser); + _attributes.put(CREATED_BY, currentUser.getName()); } } if(!_attributes.containsKey(CREATED_TIME)) -- cgit v1.2.1 From f34e698b3beb0aa5810adff8bc101b37aa6eb2d2 Mon Sep 17 00:00:00 2001 From: Alex Rudyy Date: Fri, 21 Mar 2014 12:44:50 +0000 Subject: QPID-5048: dby profiles, bdb test deps and config for perftests-systests & bdbstore-systests and a fix for clean between test runs Patch supplied by Andrew MacBean git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1579935 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/bdbstore/pom.xml | 14 +++ qpid/java/bdbstore/systests/pom.xml | 61 +++++++++++ .../main/java/org/apache/qpid/server/Broker.java | 19 +++- qpid/java/pom.xml | 111 +++++++++++++++++---- qpid/java/qpid-perftests-systests/pom.xml | 14 +++ 5 files changed, 195 insertions(+), 24 deletions(-) diff --git a/qpid/java/bdbstore/pom.xml b/qpid/java/bdbstore/pom.xml index d7d12f0b33..5d34559a46 100644 --- a/qpid/java/bdbstore/pom.xml +++ b/qpid/java/bdbstore/pom.xml @@ -102,6 +102,20 @@ + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + diff --git a/qpid/java/bdbstore/systests/pom.xml b/qpid/java/bdbstore/systests/pom.xml index e8620d3426..fe718f9dac 100644 --- a/qpid/java/bdbstore/systests/pom.xml +++ b/qpid/java/bdbstore/systests/pom.xml @@ -33,6 +33,7 @@ ${project.basedir}${file.separator}..${file.separator}..${file.separator}test-profiles${file.separator}log4j-test.xml ${basedir}/../.. ${basedir}/../.. + ${basedir}/../../systests @@ -65,6 +66,66 @@ com.sleepycat je + + + org.apache.qpid + qpid-bdbstore + ${project.version} + test-jar + test + + + + + org.apache.maven.plugins + maven-resources-plugin + + + + + copy-bdbstore-bin-resources + generate-resources + + copy-resources + + + ${qpid.home} + + + ${basedir}/.. + + bin/ + + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + + fix-bdb-script-permissions + package + + + + + + + + + + run + + + + + + diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java index ffa1d65ec2..0ec6a31253 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/Broker.java @@ -29,6 +29,7 @@ import java.util.List; import java.util.Properties; import java.util.Set; +import org.apache.log4j.LogManager; import org.apache.log4j.Logger; import org.apache.log4j.PropertyConfigurator; import org.apache.qpid.server.configuration.ConfigurationEntryStore; @@ -41,7 +42,6 @@ import org.apache.qpid.server.logging.messages.BrokerMessages; import org.apache.qpid.server.registry.ApplicationRegistry; import org.apache.qpid.server.registry.IApplicationRegistry; import org.apache.qpid.server.security.SecurityManager; -import org.apache.qpid.server.security.auth.TaskPrincipal; import javax.security.auth.Subject; @@ -52,6 +52,7 @@ public class Broker private volatile Thread _shutdownHookThread; private volatile IApplicationRegistry _applicationRegistry; private EventLogger _eventLogger; + private boolean _configuringOwnLogging = false; protected static class InitException extends RuntimeException { @@ -71,11 +72,20 @@ public class Broker } finally { - if (_applicationRegistry != null) + try { - _applicationRegistry.close(); + if (_applicationRegistry != null) + { + _applicationRegistry.close(); + } + } + finally + { + if (_configuringOwnLogging) + { + LogManager.shutdown(); + } } - } } @@ -166,6 +176,7 @@ public class Broker private void configureLogging(File logConfigFile, int logWatchTime) throws InitException, IOException { + _configuringOwnLogging = true; if (logConfigFile.exists() && logConfigFile.canRead()) { _eventLogger.message(BrokerMessages.LOG_CONFIG(logConfigFile.getAbsolutePath())); diff --git a/qpid/java/pom.xml b/qpid/java/pom.xml index 74042dd0bc..4dddd70851 100644 --- a/qpid/java/pom.xml +++ b/qpid/java/pom.xml @@ -54,7 +54,7 @@ Apache Qpid${line.separator}Copyright ${project.inceptionYear}-2014${line.separator}Apache Software Foundation${line.separator}This product includes software developed at Apache Software Foundation (http://www.apache.org/) - (java-mms.0-9|java-mms.0-9-1|java-mms.0-10|java-bdb.0-9|java-bdb.0-9-1|java-bdb.0-10|java-dby-mem.0-9|java-dby-mem.0-9-1|java-dby-mem.0-10) + (java-mms.0-9|java-mms.0-9-1|java-mms.0-10|java-bdb.0-9|java-bdb.0-9-1|java-bdb.0-10|java-dby.0-9|java-dby.0-9-1|java-dby.0-10|java-dby-mem.0-9|java-dby-mem.0-9-1|java-dby-mem.0-10) ${project.build.directory}/generated-licenses @@ -64,13 +64,22 @@ ${basedir} ${qpid.home}${file.separator}target${file.separator}qbtc-output ${project.build.directory}${file.separator}QPID_WORK + java-mms.0-10 - JavaTransientExcludes Java010Excludes + java + internal + Exception + BRK-1004 + ${qpid.home}${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE + ${qpid.home}${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE + Excludes JavaExcludes ${profile}.excludes ${profile.specific.excludes} + JavaTransientExcludes Java010Excludes v0_10 AMQP_1_0

${QPID_HOME}${file.separator}etc${file.separator}virtualhosts-systests.xml

false org.apache.qpid.server.store.MemoryMessageStore + true @@ -147,7 +156,11 @@ Qpid Test Profile Properties [profile] ${profile} - [profile.excludes] ${profile.excludes} + [profile.broker.language] ${profile.broker.language} + [profile.broker.type] ${profile.broker.type} + [profile.broker.command] ${profile.broker.command} + [profile.specific.excludes] ${profile.specific.excludes} + [profile.test.excludes] ${profile.test.excludes} [profile.broker.version] ${profile.broker.version} [profile.qpid.broker_default_amqp_protocol_excludes] ${profile.qpid.broker_default_amqp_protocol_excludes} [profile.broker.virtualhosts-config] ${profile.broker.virtualhosts-config} @@ -218,21 +231,22 @@ true 512M false - java - internal - Exception - BRK-1004 - ${qpid.home}${file.separator}bin${file.separator}qpid-server -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE - ${qpid.home}${file.separator}bin${file.separator}qpid-server.bat -sp @STORE_PATH -st @STORE_TYPE -l @LOG_CONFIG_FILE - Excludes JavaExcludes ${profile}.excludes ${profile.excludes} + ${profile} + ${profile.broker.language} + ${profile.broker.type} + ${profile.broker.stopped} + ${profile.broker.ready} + ${profile.broker.command} + ${profile.broker.command.windows} + ${profile.test.excludes} ${profile.broker.version} ${profile.qpid.broker_default_amqp_protocol_excludes}

${profile.broker.virtualhosts-config}

${profile.broker.persistent} ${profile.messagestore.class.name} - ${profile} + ${profile.broker.clean.between.tests} ${qpid.home.qbtc.output} @@ -419,7 +433,7 @@ java-mms.0-10 - JavaTransientExcludes Java010Excludes + JavaTransientExcludes Java010Excludes v0_10 AMQP_1_0 ${QPID_HOME}${file.separator}etc${file.separator}virtualhosts-systests.xml @@ -438,7 +452,7 @@ java-mms.0-9-1 - JavaTransientExcludes XAExcludes JavaPre010Excludes + JavaTransientExcludes XAExcludes JavaPre010Excludes v0_9_1 AMQP_1_0,AMQP_0_10 ${QPID_HOME}${file.separator}etc${file.separator}virtualhosts-systests.xml @@ -457,7 +471,7 @@ java-mms.0-9 - JavaTransientExcludes XAExcludes JavaPre010Excludes + JavaTransientExcludes XAExcludes JavaPre010Excludes v0_9 AMQP_1_0,AMQP_0_10,AMQP_0_9_1 ${QPID_HOME}${file.separator}etc${file.separator}virtualhosts-systests.xml @@ -476,7 +490,7 @@ java-bdb.0-10 - JavaPersistentExcludes Java010Excludes JavaBDBExcludes + JavaPersistentExcludes Java010Excludes JavaBDBExcludes v0_10 AMQP_1_0 ${QPID_HOME}${file.separator}etc${file.separator}virtualhosts-systests-bdb.xml @@ -495,7 +509,7 @@ java-bdb.0-9-1 - JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes + JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes v0_9_1 AMQP_1_0,AMQP_0_10 ${QPID_HOME}${file.separator}etc${file.separator}virtualhosts-systests-bdb.xml @@ -514,7 +528,7 @@ java-bdb.0-9 - JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes + JavaPersistentExcludes XAExcludes JavaPre010Excludes JavaBDBExcludes v0_9 AMQP_1_0,AMQP_0_10,AMQP_0_9_1 ${QPID_HOME}${file.separator}etc${file.separator}virtualhosts-systests-bdb.xml @@ -533,7 +547,7 @@ java-dby-mem.0-10 - JavaPersistentExcludes JavaDerbyExcludes Java010Excludes + JavaPersistentExcludes JavaDerbyExcludes Java010Excludes v0_10 AMQP_1_0 ${QPID_HOME}${file.separator}etc${file.separator}virtualhosts-systests-derby-mem.xml @@ -552,7 +566,7 @@ java-dby-mem.0-9-1 - JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes + JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes v0_9_1 AMQP_1_0,AMQP_0_10 ${QPID_HOME}${file.separator}etc${file.separator}virtualhosts-systests-derby-mem.xml @@ -571,7 +585,7 @@ java-dby-mem.0-9 - JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes + JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes v0_9 AMQP_1_0,AMQP_0_10,AMQP_0_9_1 ${QPID_HOME}${file.separator}etc${file.separator}virtualhosts-systests-derby-mem.xml @@ -580,6 +594,63 @@ + + java-dby.0-10 + + + profile + java-dby.0-10 + + + + java-dby.0-10 + JavaPersistentExcludes JavaDerbyExcludes Java010Excludes + v0_10 + AMQP_1_0 + ${QPID_HOME}${file.separator}etc${file.separator}virtualhosts-systests-derby.xml + true + org.apache.qpid.server.store.derby.DerbyMessageStore + + + + + java-dby.0-9-1 + + + profile + java-dby.0-9-1 + + + + java-dby.0-9-1 + JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes + v0_9_1 + AMQP_1_0,AMQP_0_10 + ${QPID_HOME}${file.separator}etc${file.separator}virtualhosts-systests-derby.xml + true + org.apache.qpid.server.store.derby.DerbyMessageStore + + + + + java-dby.0-9 + + + profile + java-dby.0-9 + + + + java-dby.0-9 + JavaPersistentExcludes JavaDerbyExcludes XAExcludes JavaPre010Excludes + v0_9 + AMQP_1_0,AMQP_0_10,AMQP_0_9_1 + ${QPID_HOME}${file.separator}etc${file.separator}virtualhosts-systests-derby.xml + true + org.apache.qpid.server.store.derby.DerbyMessageStore + + + diff --git a/qpid/java/qpid-perftests-systests/pom.xml b/qpid/java/qpid-perftests-systests/pom.xml index 6856fd9d17..4557e903ff 100644 --- a/qpid/java/qpid-perftests-systests/pom.xml +++ b/qpid/java/qpid-perftests-systests/pom.xml @@ -86,6 +86,20 @@ runtime + + org.apache.qpid + qpid-bdbstore + ${project.version} + test + true + + + + com.sleepycat + je + test + true + -- cgit v1.2.1 From f96b8856ba95a9d6d29981b8f41fa9319d9a6813 Mon Sep 17 00:00:00 2001 From: Alex Rudyy Date: Fri, 21 Mar 2014 12:46:13 +0000 Subject: QPID-5048: new maven enforcer plugin rule for checking license files Patch supplied by Andrew MacBean git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1579936 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/java/maven/qpid-enforcer-plugin-rules/pom.xml | 93 +++++++++++++ .../rule/RequireFileContentsAreEquivalent.java | 104 ++++++++++++++ .../rule/TestRequireFileContentsAreEquivalent.java | 149 +++++++++++++++++++++ 3 files changed, 346 insertions(+) create mode 100644 qpid/java/maven/qpid-enforcer-plugin-rules/pom.xml create mode 100644 qpid/java/maven/qpid-enforcer-plugin-rules/src/main/java/org/apache/qpid/maven/enforcer/rule/RequireFileContentsAreEquivalent.java create mode 100644 qpid/java/maven/qpid-enforcer-plugin-rules/src/test/java/org/apache/qpid/maven/enforcer/rule/TestRequireFileContentsAreEquivalent.java diff --git a/qpid/java/maven/qpid-enforcer-plugin-rules/pom.xml b/qpid/java/maven/qpid-enforcer-plugin-rules/pom.xml new file mode 100644 index 0000000000..47a393b888 --- /dev/null +++ b/qpid/java/maven/qpid-enforcer-plugin-rules/pom.xml @@ -0,0 +1,93 @@ + + + + 4.0.0 + + org.apache.qpid.enforcer + qpid-enforcer-plugin-rules + 1.0-SNAPSHOT + Qpid Maven Enforcer Plugin Rules + Custom maven enforcer plugin rules for the Qpid maven build. + + + 1.3.1 + 2.2.1 + 1.5.5 + 4.11 + + + + + org.apache.maven.enforcer + enforcer-rules + ${api.version} + + + org.apache.commons + commons-io + 1.3.2 + + + org.apache.maven.enforcer + enforcer-api + ${api.version} + + + org.apache.maven + maven-project + ${maven.version} + + + org.apache.maven + maven-core + ${maven.version} + + + org.apache.maven + maven-artifact + ${maven.version} + + + org.apache.maven + maven-plugin-api + ${maven.version} + + + org.codehaus.plexus + plexus-container-default + ${plexus.container.version} + + + junit + junit + ${junit.version} + test + + + org.apache.maven.enforcer + enforcer-rules + ${api.version} + test-jar + test + + + + + + + diff --git a/qpid/java/maven/qpid-enforcer-plugin-rules/src/main/java/org/apache/qpid/maven/enforcer/rule/RequireFileContentsAreEquivalent.java b/qpid/java/maven/qpid-enforcer-plugin-rules/src/main/java/org/apache/qpid/maven/enforcer/rule/RequireFileContentsAreEquivalent.java new file mode 100644 index 0000000000..11186a5c7f --- /dev/null +++ b/qpid/java/maven/qpid-enforcer-plugin-rules/src/main/java/org/apache/qpid/maven/enforcer/rule/RequireFileContentsAreEquivalent.java @@ -0,0 +1,104 @@ +/** + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ +package org.apache.qpid.maven.enforcer.rule; + +import java.io.File; +import java.io.IOException; +import java.util.Arrays; + +import org.apache.commons.io.FileUtils; +import org.apache.maven.enforcer.rule.api.EnforcerRule; +import org.apache.maven.enforcer.rule.api.EnforcerRuleException; +import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper; +import org.apache.maven.plugins.enforcer.AbstractStandardEnforcerRule; + +public class RequireFileContentsAreEquivalent extends AbstractStandardEnforcerRule +{ + + final static String WHITESPACE_REGEX = "\\s+"; + final static String EMPTY_STRING = ""; + + File[] files; + + @Override + public void execute(final EnforcerRuleHelper enforcerRuleHelper) throws EnforcerRuleException + { + if (files.length < 2) + { + throw new EnforcerRuleException("The file list must contain at least two files for comparison."); + } + + boolean success = true; + boolean firstTime = true; + String referenceContent = null; + + for (final File file : files) + { + try + { + final String fileContent = FileUtils.readFileToString(file); + if (firstTime) + { + referenceContent = fileContent; + firstTime = false; + } + else if (referenceContent != null && fileContent != null) + { + final String strippedReferenceContent = referenceContent.replaceAll(WHITESPACE_REGEX, EMPTY_STRING); + final String strippedFileContent = fileContent.replaceAll(WHITESPACE_REGEX, EMPTY_STRING); + if (!strippedReferenceContent.equalsIgnoreCase(strippedFileContent)) + { + success = false; + break; + } + } + else + { + throw new EnforcerRuleException("Unable to read file contents"); + } + } + catch (final IOException ioe) + { + throw new EnforcerRuleException("Cannot process file : " + file.getName(), ioe); + } + } + + if (!success) + { + throw new EnforcerRuleException("Files specified are not equal in content"); + } + } + + @Override + public String getCacheId() + { + return Integer.toString(Arrays.hashCode(files)); + } + + @Override + public boolean isCacheable() + { + return true; + } + + @Override + public boolean isResultValid(EnforcerRule arg0) + { + return true; + } + +} diff --git a/qpid/java/maven/qpid-enforcer-plugin-rules/src/test/java/org/apache/qpid/maven/enforcer/rule/TestRequireFileContentsAreEquivalent.java b/qpid/java/maven/qpid-enforcer-plugin-rules/src/test/java/org/apache/qpid/maven/enforcer/rule/TestRequireFileContentsAreEquivalent.java new file mode 100644 index 0000000000..7a5d214972 --- /dev/null +++ b/qpid/java/maven/qpid-enforcer-plugin-rules/src/test/java/org/apache/qpid/maven/enforcer/rule/TestRequireFileContentsAreEquivalent.java @@ -0,0 +1,149 @@ +/** + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + */ +package org.apache.qpid.maven.enforcer.rule; + +import java.io.File; +import java.io.IOException; + +import org.apache.commons.io.FileUtils; +import org.apache.maven.enforcer.rule.api.EnforcerRuleException; +import org.apache.maven.plugins.enforcer.EnforcerTestUtils; +import org.junit.After; +import org.junit.Assert; +import org.junit.Test; + +public class TestRequireFileContentsAreEquivalent +{ + final RequireFileContentsAreEquivalent rule = new RequireFileContentsAreEquivalent(); + + final static String TEST_TEXT = "Lorem ipsum dolor sit amet, consectetur adipiscing elit."; + final static String TEST_TEXT_WHITESPACE = "Lorem ipsum dolor sit amet,\n consectetur adipiscing \t elit. "; + final static String ALTERNATE_TEST_TEXT_WHITESPACE = " Lorem \t ip sum dolor \n sit amet,\n consectetur adipiscing \t elit."; + final static String DIFFERENT_TEST_TEXT = "Donec velit felis, semper dapibus mattis vitae"; + + @Test + public void testDifferentContentFiles() throws Exception + { + final File f1 = createTestFile(1, TEST_TEXT); + final File f2 = createTestFile(2, DIFFERENT_TEST_TEXT); + + rule.files = new File[] + { f1, f2 }; + + try + { + rule.execute(EnforcerTestUtils.getHelper()); + Assert.fail("Files with different content should have failed enforcer rule"); + } + catch (final EnforcerRuleException ere) + { + // do nothing + } + } + + @Test + public void testIdenticalContentFiles() throws Exception + { + final File f1 = createTestFile(1, TEST_TEXT); + final File f2 = createTestFile(2, TEST_TEXT); + + rule.files = new File[] + { f1, f2 }; + + rule.execute(EnforcerTestUtils.getHelper()); + } + + @Test + public void testUsingOneFileTwice() throws Exception + { + final File f1 = createTestFile(1, TEST_TEXT); + + rule.files = new File[] + { f1, f1 }; + + rule.execute(EnforcerTestUtils.getHelper()); + } + + @Test + public void testSimilarFiles() throws Exception + { + final File f1 = createTestFile(1, TEST_TEXT); + final File f2 = createTestFile(2, TEST_TEXT_WHITESPACE); + + rule.files = new File[] + { f1, f2 }; + + rule.execute(EnforcerTestUtils.getHelper()); + } + + @Test + public void testMultipleFilesOneDifferent() throws Exception + { + final File f1 = createTestFile(1, TEST_TEXT); + final File f2 = createTestFile(2, TEST_TEXT_WHITESPACE); + final File f3 = createTestFile(3, ALTERNATE_TEST_TEXT_WHITESPACE); + final File f4 = createTestFile(4, DIFFERENT_TEST_TEXT); + + rule.files = new File[] + { f1, f2, f3, f4 }; + + try + { + rule.execute(EnforcerTestUtils.getHelper()); + Assert.fail("Files with different content should have failed enforcer rule"); + } + catch (final EnforcerRuleException ere) + { + // do nothing + } + } + + @Test + public void testMultipleFilesAllSimilar() throws Exception + { + final File f1 = createTestFile(1, TEST_TEXT); + final File f2 = createTestFile(2, TEST_TEXT); + final File f3 = createTestFile(3, TEST_TEXT_WHITESPACE); + final File f4 = createTestFile(4, ALTERNATE_TEST_TEXT_WHITESPACE); + + rule.files = new File[] + { f1, f2, f3, f4 }; + + rule.execute(EnforcerTestUtils.getHelper()); + } + + @After + public void deleteTestFiles() throws Exception + { + for (File file : rule.files) + { + if (file.exists()) + { + file.delete(); + } + } + } + + private File createTestFile(final int id, final String content) throws IOException + { + final File file = File.createTempFile(TestRequireFileContentsAreEquivalent.class.getName() + + "-testfile" + id, "tmp"); + file.deleteOnExit(); + FileUtils.writeStringToFile(file, content); + return file; + } +} -- cgit v1.2.1 From 801e80d3b2361375c357b2f33feaeae77b3f8a14 Mon Sep 17 00:00:00 2001 From: Kim van der Riet Date: Fri, 21 Mar 2014 15:50:56 +0000 Subject: QPID-5641: [legacystore] Valgrind reports memory leaks on older store tests git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1579963 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/legacystore/CMakeLists.txt | 24 - qpid/cpp/src/tests/legacystore/OrderingTest.cpp | 171 ------ qpid/cpp/src/tests/legacystore/SimpleTest.cpp | 500 --------------- .../src/tests/legacystore/TransactionalTest.cpp | 354 ----------- .../src/tests/legacystore/TwoPhaseCommitTest.cpp | 678 --------------------- 5 files changed, 1727 deletions(-) delete mode 100644 qpid/cpp/src/tests/legacystore/OrderingTest.cpp delete mode 100644 qpid/cpp/src/tests/legacystore/SimpleTest.cpp delete mode 100644 qpid/cpp/src/tests/legacystore/TransactionalTest.cpp delete mode 100644 qpid/cpp/src/tests/legacystore/TwoPhaseCommitTest.cpp diff --git a/qpid/cpp/src/tests/legacystore/CMakeLists.txt b/qpid/cpp/src/tests/legacystore/CMakeLists.txt index 85cc4be5c7..7986464eb5 100644 --- a/qpid/cpp/src/tests/legacystore/CMakeLists.txt +++ b/qpid/cpp/src/tests/legacystore/CMakeLists.txt @@ -36,30 +36,6 @@ if (BUILD_TESTING_UNITTESTS) set (qpid_test_boost_libs ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_SYSTEM_LIBRARY}) -# -# define_legacystore_test -# macro to accept the name of a single source file and to create a -# unit test executable that runs the source. -# -MACRO (define_legacystore_test theSourceFile) -add_executable (legacystore_${theSourceFile} - ${theSourceFile} - unit_test - ${platform_test_additions}) -target_link_libraries (legacystore_${theSourceFile} - ${qpid_test_boost_libs} - qpidmessaging qpidtypes qpidbroker qpidcommon legacystore_shared) -set_target_properties (legacystore_${theSourceFile} PROPERTIES COMPILE_DEFINITIONS _IN_QPID_BROKER) -remember_location(legacystore_${theSourceFile}) - -add_test (legacystore_${theSourceFile} ${test_wrap} --boost-test -- ${legacystore_${theSourceFile}_LOCATION}) -ENDMACRO (define_legacystore_test) - -define_legacystore_test (SimpleTest) -define_legacystore_test (OrderingTest) -define_legacystore_test (TransactionalTest) -define_legacystore_test (TwoPhaseCommitTest) - # Journal tests MACRO (define_journal_test mainSourceFile) if ("${ARGV1}" STREQUAL "LONG") diff --git a/qpid/cpp/src/tests/legacystore/OrderingTest.cpp b/qpid/cpp/src/tests/legacystore/OrderingTest.cpp deleted file mode 100644 index 74a9db1c73..0000000000 --- a/qpid/cpp/src/tests/legacystore/OrderingTest.cpp +++ /dev/null @@ -1,171 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - * - */ - -#include "unit_test.h" -#include "MessageUtils.h" - -#include "qpid/broker/Queue.h" -#include "qpid/broker/RecoveryManagerImpl.h" -#include "qpid/broker/PersistableObject.h" -#include "qpid/framing/AMQHeaderBody.h" -#include "qpid/legacystore/MessageStoreImpl.h" -#include "qpid/log/Logger.h" -#include "qpid/sys/Timer.h" - -#include - -using namespace qpid; -using namespace qpid::broker; -using namespace qpid::framing; -using namespace mrg::msgstore; - -qpid::broker::Broker::Options opts; -qpid::broker::Broker br(opts); - -QPID_AUTO_TEST_SUITE(OrderingTest) - -#define SET_LOG_LEVEL(level) \ - qpid::log::Options opts(""); \ - opts.selectors.clear(); \ - opts.selectors.push_back(level); \ - qpid::log::Logger::instance().configure(opts); - -const std::string test_filename("OrderingTest"); -const char* tdp = getenv("TMP_DATA_DIR"); -const std::string test_dir(tdp && strlen(tdp) > 0 ? tdp : "/var/tmp/OrderingTest"); - -// === Helper fns === - -const std::string name("OrderingQueue"); -std::auto_ptr store; -QueueRegistry queues; -Queue::shared_ptr queue; -std::queue ids; - -class TestConsumer : public Consumer -{ - public: - - TestConsumer(Queue::shared_ptr q, std::queue& i) : Consumer("test", CONSUMER), queue(q), ids(i) {}; - - bool deliver(const QueueCursor& cursor, const Message& message) - { - queue->dequeue(0, cursor); - BOOST_CHECK_EQUAL(ids.front(), MessageUtils::getMessageId(message)); - ids.pop(); - return true; - }; - void notify() {} - void cancel() {} - void acknowledged(const DeliveryRecord&) {} - OwnershipToken* getSession() { return 0; } - private: - Queue::shared_ptr queue; - std::queue& ids; -}; -boost::shared_ptr consumer; - -void setup() -{ - store = std::auto_ptr(new MessageStoreImpl(&br)); - store->init(test_dir, 4, 1, true); // truncate store - - queue = Queue::shared_ptr(new Queue(name, 0, store.get(), 0)); - queue->create(); - consumer = boost::shared_ptr(new TestConsumer(queue, ids)); -} - -void push() -{ - Uuid messageId(true); - ids.push(messageId); - - Message msg = MessageUtils::createMessage("exchange", "routing_key", messageId, true, 0); - - queue->deliver(msg); -} - -bool pop() -{ - return queue->dispatch(consumer); -} - -void restart() -{ - queue.reset(); - store.reset(); - - store = std::auto_ptr(new MessageStoreImpl(&br)); - store->init(test_dir, 4, 1); - ExchangeRegistry exchanges; - LinkRegistry links; - sys::Timer t; - DtxManager mgr(t); - mgr.setStore (store.get()); - RecoveredObjects ro; - RecoveryManagerImpl recoveryMgr(queues, exchanges, links, mgr, br.getProtocolRegistry(), ro); - store->recover(recoveryMgr); - - queue = queues.find(name); - consumer = boost::shared_ptr(new TestConsumer(queue, ids)); -} - -void check() -{ - BOOST_REQUIRE(queue); - BOOST_CHECK_EQUAL((u_int32_t) ids.size(), queue->getMessageCount()); - while (pop()) ;//keeping popping 'till all messages are dequeued - BOOST_CHECK_EQUAL((u_int32_t) 0, queue->getMessageCount()); - BOOST_CHECK_EQUAL((size_t) 0, ids.size()); -} - - -// === Test suite === - -QPID_AUTO_TEST_CASE(Basic) -{ - SET_LOG_LEVEL("error+"); // This only needs to be set once. - - std::cout << test_filename << ".Basic: " << std::flush; - setup(); - //push on 10 messages - for (int i = 0; i < 10; i++) push(); - restart(); - check(); - std::cout << "ok" << std::endl; -} - -QPID_AUTO_TEST_CASE(Cycle) -{ - std::cout << test_filename << ".Cycle: " << std::flush; - setup(); - //push on 10 messages: - for (int i = 0; i < 10; i++) push(); - //pop 5: - for (int i = 0; i < 5; i++) pop(); - //push on another 5: - for (int i = 0; i < 5; i++) push(); - restart(); - check(); - std::cout << "ok" << std::endl; -} - -QPID_AUTO_TEST_SUITE_END() diff --git a/qpid/cpp/src/tests/legacystore/SimpleTest.cpp b/qpid/cpp/src/tests/legacystore/SimpleTest.cpp deleted file mode 100644 index d3f040817f..0000000000 --- a/qpid/cpp/src/tests/legacystore/SimpleTest.cpp +++ /dev/null @@ -1,500 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - * - */ - -#include "unit_test.h" -#include "MessageUtils.h" - -#include "qpid/broker/DirectExchange.h" -#include "qpid/broker/Queue.h" -#include "qpid/broker/QueueSettings.h" -#include "qpid/broker/RecoveryManagerImpl.h" -#include "qpid/broker/PersistableObject.h" -#include "qpid/framing/AMQHeaderBody.h" -#include "qpid/framing/FieldTable.h" -#include "qpid/framing/FieldValue.h" -#include "qpid/legacystore/MessageStoreImpl.h" -#include "qpid/legacystore/StoreException.h" -#include "qpid/log/Logger.h" -#include "qpid/sys/Timer.h" - -#include - -qpid::broker::Broker::Options opts; -qpid::broker::Broker br(opts); - -#define SET_LOG_LEVEL(level) \ - qpid::log::Options opts(""); \ - opts.selectors.clear(); \ - opts.selectors.push_back(level); \ - qpid::log::Logger::instance().configure(opts); - - -using boost::intrusive_ptr; -using boost::static_pointer_cast; -using namespace qpid; -using namespace qpid::broker; -using namespace qpid::framing; -using namespace mrg::msgstore; -using namespace std; - -QPID_AUTO_TEST_SUITE(SimpleTest) - -const string test_filename("SimpleTest"); -const char* tdp = getenv("TMP_DATA_DIR"); -const string test_dir(tdp && strlen(tdp) > 0 ? tdp : "/var/tmp/SimpleTest"); - -// === Helper fns === - -struct DummyHandler : FrameHandler -{ - std::vector frames; - - virtual void handle(AMQFrame& frame){ - frames.push_back(frame); - } -}; - -void recover(MessageStoreImpl& store, QueueRegistry& queues, ExchangeRegistry& exchanges, LinkRegistry& links) -{ - sys::Timer t; - DtxManager mgr(t); - mgr.setStore (&store); - RecoveredObjects ro; - RecoveryManagerImpl recovery(queues, exchanges, links, mgr, br.getProtocolRegistry(), ro); - store.recover(recovery); -} - -void recover(MessageStoreImpl& store, ExchangeRegistry& exchanges) -{ - QueueRegistry queues; - LinkRegistry links; - recover(store, queues, exchanges, links); -} - -void recover(MessageStoreImpl& store, QueueRegistry& queues) -{ - ExchangeRegistry exchanges; - LinkRegistry links; - recover(store, queues, exchanges, links); -} - -void bindAndUnbind(const string& exchangeName, const string& queueName, - const string& key, const FieldTable& args) -{ - { - MessageStoreImpl store(&br); - store.init(test_dir, 4, 1, true); // truncate store - Exchange::shared_ptr exchange(new DirectExchange(exchangeName, true, false, args)); - Queue::shared_ptr queue(new Queue(queueName, 0, &store, 0)); - store.create(*exchange, qpid::framing::FieldTable()); - store.create(*queue, qpid::framing::FieldTable()); - BOOST_REQUIRE(exchange->bind(queue, key, &args)); - store.bind(*exchange, *queue, key, args); - }//db will be closed - { - MessageStoreImpl store(&br); - store.init(test_dir, 4, 1); - ExchangeRegistry exchanges; - QueueRegistry queues; - LinkRegistry links; - - recover(store, queues, exchanges, links); - - Exchange::shared_ptr exchange = exchanges.get(exchangeName); - Queue::shared_ptr queue = queues.find(queueName); - // check exchange args are still set - for (FieldTable::ValueMap::const_iterator i = args.begin(); i!=args.end(); i++) { - BOOST_CHECK(exchange->getArgs().get((*i).first)->getData() == (*i).second->getData()); - } - //check it is bound by unbinding - BOOST_REQUIRE(exchange->unbind(queue, key, &args)); - store.unbind(*exchange, *queue, key, args); - } - { - MessageStoreImpl store(&br); - store.init(test_dir, 4, 1); - ExchangeRegistry exchanges; - QueueRegistry queues; - LinkRegistry links; - - recover(store, queues, exchanges, links); - - Exchange::shared_ptr exchange = exchanges.get(exchangeName); - Queue::shared_ptr queue = queues.find(queueName); - // check exchange args are still set - for (FieldTable::ValueMap::const_iterator i = args.begin(); i!=args.end(); i++) { - BOOST_CHECK(exchange->getArgs().get((*i).first)->getData() == (*i).second->getData()); - } - //make sure it is no longer bound - BOOST_REQUIRE(!exchange->unbind(queue, key, &args)); - } -} - - -// === Test suite === - -QPID_AUTO_TEST_CASE(CreateDelete) -{ - SET_LOG_LEVEL("error+"); // This only needs to be set once. - - cout << test_filename << ".CreateDelete: " << flush; - MessageStoreImpl store(&br); - store.init(test_dir, 4, 1, true); // truncate store - string name("CreateDeleteQueue"); - Queue queue(name, 0, &store, 0); - store.create(queue, qpid::framing::FieldTable()); -// TODO - check dir exists - BOOST_REQUIRE(queue.getPersistenceId()); - store.destroy(queue); -// TODO - check dir is deleted - - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(EmptyRecover) -{ - cout << test_filename << ".EmptyRecover: " << flush; - MessageStoreImpl store(&br); - store.init(test_dir, 4, 1, true); // truncate store - QueueRegistry registry; - registry.setStore (&store); - recover(store, registry); - //nothing to assert, just testing it doesn't blow up - - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(QueueCreate) -{ - cout << test_filename << ".QueueCreate: " << flush; - - uint64_t id(0); - string name("MyDurableQueue"); - { - MessageStoreImpl store(&br); - store.init(test_dir, 4, 1, true); // truncate store - Queue queue(name, 0, &store, 0); - store.create(queue, qpid::framing::FieldTable()); - BOOST_REQUIRE(queue.getPersistenceId()); - id = queue.getPersistenceId(); - }//db will be closed - { - MessageStoreImpl store(&br); - store.init(test_dir, 4, 1); - QueueRegistry registry; - registry.setStore (&store); - recover(store, registry); - Queue::shared_ptr queue = registry.find(name); - BOOST_REQUIRE(queue.get()); - BOOST_CHECK_EQUAL(id, queue->getPersistenceId()); - } - - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(QueueCreateWithSettings) -{ - cout << test_filename << ".QueueCreateWithSettings: " << flush; - - FieldTable arguments; - arguments.setInt("qpid.max_count", 202); - arguments.setInt("qpid.max_size", 1003); - QueueSettings settings; - settings.populate(arguments, settings.storeSettings); - string name("MyDurableQueue"); - { - MessageStoreImpl store(&br); - store.init(test_dir, 4, 1, true); // truncate store - Queue queue(name, settings, &store, 0); - queue.create(); - BOOST_REQUIRE(queue.getPersistenceId()); - }//db will be closed - { - MessageStoreImpl store(&br); - store.init(test_dir, 4, 1); - QueueRegistry registry; - registry.setStore (&store); - recover(store, registry); - Queue::shared_ptr queue = registry.find(name); - BOOST_REQUIRE(queue); - BOOST_CHECK_EQUAL(settings.maxDepth.getCount(), 202u); - BOOST_CHECK_EQUAL(settings.maxDepth.getSize(), 1003u); - BOOST_CHECK_EQUAL(settings.maxDepth.getCount(), queue->getSettings().maxDepth.getCount()); - BOOST_CHECK_EQUAL(settings.maxDepth.getSize(), queue->getSettings().maxDepth.getSize()); - } - - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(QueueDestroy) -{ - cout << test_filename << ".QueueDestroy: " << flush; - - string name("MyDurableQueue"); - { - MessageStoreImpl store(&br); - store.init(test_dir, 4, 1, true); // truncate store - Queue queue(name, 0, &store, 0); - store.create(queue, qpid::framing::FieldTable()); - store.destroy(queue); - }//db will be closed - { - MessageStoreImpl store(&br); - store.init(test_dir, 4, 1); - QueueRegistry registry; - registry.setStore (&store); - recover(store, registry); - BOOST_REQUIRE(!registry.find(name)); - } - - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(Enqueue) -{ - cout << test_filename << ".Enqueue: " << flush; - - //TODO: this is largely copy & paste'd from MessageTest in - //qpid tree. ideally need some helper routines for reducing - //this to a simpler less duplicated form - - string name("MyDurableQueue"); - string exchange("MyExchange"); - string routingKey("MyRoutingKey"); - Uuid messageId(true); - string data1("abcdefg"); - string data2("hijklmn"); - { - MessageStoreImpl store(&br); - store.init(test_dir, 4, 1, true); // truncate store - Queue::shared_ptr queue(new Queue(name, 0, &store, 0)); - queue->create(); - - Message msg = MessageUtils::createMessage(exchange, routingKey, messageId, true, 14); - MessageUtils::addContent(msg, data1); - MessageUtils::addContent(msg, data2); - - msg.addAnnotation("abc", "xyz"); - - queue->deliver(msg); - }//db will be closed - { - MessageStoreImpl store(&br); - store.init(test_dir, 4, 1); - QueueRegistry registry; - registry.setStore (&store); - recover(store, registry); - Queue::shared_ptr queue = registry.find(name); - BOOST_REQUIRE(queue); - BOOST_CHECK_EQUAL((u_int32_t) 1, queue->getMessageCount()); - Message msg = MessageUtils::get(*queue); - - BOOST_CHECK_EQUAL(routingKey, msg.getRoutingKey()); - BOOST_CHECK_EQUAL(messageId, MessageUtils::getMessageId(msg)); - BOOST_CHECK_EQUAL(std::string("xyz"), msg.getAnnotation("abc")); - BOOST_CHECK_EQUAL((u_int64_t) 14, msg.getContent().size()); - - DummyHandler handler; - MessageUtils::deliver(msg, handler, 100); - BOOST_CHECK_EQUAL((size_t) 2, handler.frames.size()); - AMQContentBody* contentBody(dynamic_cast(handler.frames[1].getBody())); - BOOST_REQUIRE(contentBody); - BOOST_CHECK_EQUAL(data1.size() + data2.size(), contentBody->getData().size()); - BOOST_CHECK_EQUAL(data1 + data2, contentBody->getData()); - } - - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(Dequeue) -{ - cout << test_filename << ".Dequeue: " << flush; - - //TODO: reduce the duplication in these tests - string name("MyDurableQueue"); - { - string exchange("MyExchange"); - string routingKey("MyRoutingKey"); - Uuid messageId(true); - string data("abcdefg"); - MessageStoreImpl store(&br); - store.init(test_dir, 4, 1, true); // truncate store - Queue::shared_ptr queue(new Queue(name, 0, &store, 0)); - queue->create(); - - Message msg = MessageUtils::createMessage(exchange, routingKey, messageId, true, 7); - MessageUtils::addContent(msg, data); - - queue->deliver(msg); - - QueueCursor cursor; - MessageUtils::get(*queue, &cursor); - queue->dequeue(0, cursor); - }//db will be closed - { - MessageStoreImpl store(&br); - store.init(test_dir, 4, 1); - QueueRegistry registry; - registry.setStore (&store); - recover(store, registry); - Queue::shared_ptr queue = registry.find(name); - BOOST_REQUIRE(queue); - BOOST_CHECK_EQUAL((u_int32_t) 0, queue->getMessageCount()); - } - - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(ExchangeCreateAndDestroy) -{ - cout << test_filename << ".ExchangeCreateAndDestroy: " << flush; - - uint64_t id(0); - string name("MyDurableExchange"); - string type("direct"); - FieldTable args; - args.setString("a", "A"); - { - MessageStoreImpl store(&br); - store.init(test_dir, 4, 1, true); // truncate store - ExchangeRegistry registry; - Exchange::shared_ptr exchange = registry.declare(name, type, true, false, args).first; - store.create(*exchange, qpid::framing::FieldTable()); - id = exchange->getPersistenceId(); - BOOST_REQUIRE(id); - }//db will be closed - { - MessageStoreImpl store(&br); - store.init(test_dir, 4, 1); - ExchangeRegistry registry; - - recover(store, registry); - - Exchange::shared_ptr exchange = registry.get(name); - BOOST_CHECK_EQUAL(id, exchange->getPersistenceId()); - BOOST_CHECK_EQUAL(type, exchange->getType()); - BOOST_REQUIRE(exchange->isDurable()); - BOOST_CHECK_EQUAL(*args.get("a"), *exchange->getArgs().get("a")); - store.destroy(*exchange); - } - { - MessageStoreImpl store(&br); - store.init(test_dir, 4, 1); - ExchangeRegistry registry; - - recover(store, registry); - - try { - Exchange::shared_ptr exchange = registry.get(name); - BOOST_FAIL("Expected exchange not to be found"); - } catch (const SessionException& e) { - BOOST_CHECK_EQUAL((framing::ReplyCode) 404, e.code); - } - } - - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(ExchangeBindAndUnbind) -{ - cout << test_filename << ".ExchangeBindAndUnbind: " << flush; - - bindAndUnbind("MyDurableExchange", "MyDurableQueue", "my-routing-key", FieldTable()); - - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(ExchangeBindAndUnbindWithArgs) -{ - cout << test_filename << ".ExchangeBindAndUnbindWithArgs: " << flush; - - FieldTable args; - args.setString("a", "A"); - args.setString("b", "B"); - bindAndUnbind("MyDurableExchange", "MyDurableQueue", "my-routing-key", args); - - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(ExchangeImplicitUnbind) -{ - cout << test_filename << ".ExchangeImplicitUnbind: " << flush; - - string exchangeName("MyDurableExchange"); - string queueName1("MyDurableQueue1"); - string queueName2("MyDurableQueue2"); - string key("my-routing-key"); - FieldTable args; - { - MessageStoreImpl store(&br); - store.init(test_dir, 4, 1, true); // truncate store - Exchange::shared_ptr exchange(new DirectExchange(exchangeName, true, false, args)); - Queue::shared_ptr queue1(new Queue(queueName1, 0, &store, 0)); - Queue::shared_ptr queue2(new Queue(queueName2, 0, &store, 0)); - store.create(*exchange, qpid::framing::FieldTable()); - store.create(*queue1, qpid::framing::FieldTable()); - store.create(*queue2, qpid::framing::FieldTable()); - store.bind(*exchange, *queue1, key, args); - store.bind(*exchange, *queue2, key, args); - //delete queue1: - store.destroy(*queue1); - }//db will be closed - { - MessageStoreImpl store(&br); - store.init(test_dir, 4, 1); - ExchangeRegistry exchanges; - QueueRegistry queues; - LinkRegistry links; - - //ensure recovery works ok: - recover(store, queues, exchanges, links); - - Exchange::shared_ptr exchange = exchanges.get(exchangeName); - BOOST_REQUIRE(!queues.find(queueName1).get()); - BOOST_REQUIRE(queues.find(queueName2).get()); - - //delete exchange: - store.destroy(*exchange); - } - { - MessageStoreImpl store(&br); - store.init(test_dir, 4, 1); - ExchangeRegistry exchanges; - QueueRegistry queues; - LinkRegistry links; - - //ensure recovery works ok: - recover(store, queues, exchanges, links); - - try { - Exchange::shared_ptr exchange = exchanges.get(exchangeName); - BOOST_FAIL("Expected exchange not to be found"); - } catch (const SessionException& e) { - BOOST_CHECK_EQUAL((framing::ReplyCode) 404, e.code); - } - Queue::shared_ptr queue = queues.find(queueName2); - store.destroy(*queue); - } - - cout << "ok" << endl; -} - -QPID_AUTO_TEST_SUITE_END() diff --git a/qpid/cpp/src/tests/legacystore/TransactionalTest.cpp b/qpid/cpp/src/tests/legacystore/TransactionalTest.cpp deleted file mode 100644 index d1bc34d5a7..0000000000 --- a/qpid/cpp/src/tests/legacystore/TransactionalTest.cpp +++ /dev/null @@ -1,354 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - * - */ - -#include "unit_test.h" -#include "MessageUtils.h" - -#include "qpid/broker/Queue.h" -#include "qpid/broker/RecoveryManagerImpl.h" -#include "qpid/broker/PersistableObject.h" -#include "qpid/framing/AMQHeaderBody.h" -#include "qpid/legacystore/MessageStoreImpl.h" -#include "qpid/legacystore/StoreException.h" -#include "qpid/log/Statement.h" -#include "qpid/log/Logger.h" -#include "qpid/sys/Timer.h" - -#include - -using namespace mrg::msgstore; -using namespace qpid; -using namespace qpid::broker; -using namespace qpid::framing; -using namespace std; - -namespace { -qpid::broker::Broker::Options opts; -qpid::broker::Broker br(opts); -} - -QPID_AUTO_TEST_SUITE(TransactionalTest) - -#define SET_LOG_LEVEL(level) \ - qpid::log::Options opts(""); \ - opts.selectors.clear(); \ - opts.selectors.push_back(level); \ - qpid::log::Logger::instance().configure(opts); - -const string test_filename("TransactionalTest"); -const char* tdp = getenv("TMP_DATA_DIR"); -const string test_dir(tdp && strlen(tdp) > 0 ? tdp : "/var/tmp/TransactionalTest"); - -// Test txn context which has special setCompleteFailure() method which prevents entire "txn complete" process from hapenning -class TestTxnCtxt : public TxnCtxt -{ - public: - TestTxnCtxt(IdSequence* _loggedtx) : TxnCtxt(_loggedtx) {} - void setCompleteFailure(const unsigned num_queues_rem) { - // Remove queue members from back of impactedQueues until queues_rem reamin. - // to end to simulate multi-queue txn complete failure. - while (impactedQueues.size() > num_queues_rem) impactedQueues.erase(impactedQueues.begin()); - } - void resetPreparedXidStorePtr() { preparedXidStorePtr = 0; } -}; - -// Test store which has special begin() which returns a TestTPCTxnCtxt, and a method to check for -// remaining open transactions. -// begin(), commit(), and abort() all hide functions in MessageStoreImpl. To avoid the compiler -// warnings/errors these are renamed with a 'TMS' prefix. -class TestMessageStore: public MessageStoreImpl -{ - public: - TestMessageStore(qpid::broker::Broker* br, const char* envpath = 0) : MessageStoreImpl(br, envpath) {} - std::auto_ptr TMSbegin() { - checkInit(); - // pass sequence number for c/a - return auto_ptr(new TestTxnCtxt(&messageIdSequence)); - } - void TMScommit(TransactionContext& ctxt, const bool complete_prepared_list) { - checkInit(); - TxnCtxt* txn(check(&ctxt)); - if (!txn->isTPC()) { - localPrepare(dynamic_cast(txn)); - if (!complete_prepared_list) dynamic_cast(txn)->resetPreparedXidStorePtr(); - } - completed(*dynamic_cast(txn), true); - } - void TMSabort(TransactionContext& ctxt, const bool complete_prepared_list) - { - checkInit(); - TxnCtxt* txn(check(&ctxt)); - if (!txn->isTPC()) { - localPrepare(dynamic_cast(txn)); - if (!complete_prepared_list) dynamic_cast(txn)->resetPreparedXidStorePtr(); - } - completed(*dynamic_cast(txn), false); - } -}; - -// === Helper fns === - -const string nameA("queueA"); -const string nameB("queueB"); -//const Uuid messageId(true); -std::auto_ptr store; -std::auto_ptr queues; -Queue::shared_ptr queueA; -Queue::shared_ptr queueB; - -template -void setup() -{ - store = std::auto_ptr(new T(&br)); - store->init(test_dir, 4, 1, true); // truncate store - - //create two queues: - queueA = Queue::shared_ptr(new Queue(nameA, 0, store.get(), 0)); - queueA->create(); - queueB = Queue::shared_ptr(new Queue(nameB, 0, store.get(), 0)); - queueB->create(); -} - -template -void restart() -{ - queueA.reset(); - queueB.reset(); - queues.reset(); - store.reset(); - - store = std::auto_ptr(new T(&br)); - store->init(test_dir, 4, 1); - queues = std::auto_ptr(new QueueRegistry); - ExchangeRegistry exchanges; - LinkRegistry links; - sys::Timer t; - DtxManager mgr(t); - mgr.setStore (store.get()); - RecoveredObjects ro; - RecoveryManagerImpl recovery(*queues, exchanges, links, mgr, br.getProtocolRegistry(), ro); - store->recover(recovery); - - queueA = queues->find(nameA); - queueB = queues->find(nameB); -} - -Message createMessage(const string& id, const string& exchange="exchange", const string& key="routing_key") -{ - return MessageUtils::createMessage(exchange, key, Uuid(), true, 0, id); -} - -void checkMsg(Queue::shared_ptr& queue, u_int32_t size, const string& msgid = "") -{ - BOOST_REQUIRE(queue); - BOOST_CHECK_EQUAL(size, queue->getMessageCount()); - if (size > 0) { - Message msg = MessageUtils::get(*queue); - BOOST_REQUIRE(msg); - BOOST_CHECK_EQUAL(msgid, MessageUtils::getCorrelationId(msg)); - } -} - -void swap(bool commit) -{ - setup(); - - //create message and enqueue it onto first queue: - Message msgA = createMessage("Message", "exchange", "routing_key"); - queueA->deliver(msgA); - - QueueCursor cursorB; - Message msgB = MessageUtils::get(*queueA, &cursorB); - BOOST_REQUIRE(msgB); - //move the message from one queue to the other as a transaction - std::auto_ptr txn = store->begin(); - TxBuffer tx; - queueB->deliver(msgB, &tx);//note: need to enqueue it first to avoid message being deleted - - queueA->dequeue(txn.get(), cursorB); - tx.prepare(txn.get()); - if (commit) { - store->commit(*txn); - } else { - store->abort(*txn); - } - - restart(); - - // Check outcome - BOOST_REQUIRE(queueA); - BOOST_REQUIRE(queueB); - - Queue::shared_ptr x;//the queue from which the message was swapped - Queue::shared_ptr y;//the queue on which the message is expected to be - - if (commit) { - x = queueA; - y = queueB; - } else { - x = queueB; - y = queueA; - } - - checkMsg(x, 0); - checkMsg(y, 1, "Message"); - checkMsg(y, 0); -} - -void testMultiQueueTxn(const unsigned num_queues_rem, const bool complete_prepared_list, const bool commit) -{ - setup(); - TestMessageStore* tmsp = static_cast(store.get()); - std::auto_ptr txn(tmsp->TMSbegin()); - TxBuffer tx; - - //create two messages and enqueue them onto both queues: - Message msgA = createMessage("MessageA", "exchange", "routing_key"); - queueA->deliver(msgA, &tx); - queueB->deliver(msgA, &tx); - Message msgB = createMessage("MessageB", "exchange", "routing_key"); - queueA->deliver(msgB, &tx); - queueB->deliver(msgB, &tx); - - tx.prepare(txn.get()); - static_cast(txn.get())->setCompleteFailure(num_queues_rem); - if (commit) - tmsp->TMScommit(*txn, complete_prepared_list); - else - tmsp->TMSabort(*txn, complete_prepared_list); - restart(); - - // Check outcome - if (commit) - { - checkMsg(queueA, 2, "MessageA"); - checkMsg(queueB, 2, "MessageA"); - checkMsg(queueA, 1, "MessageB"); - checkMsg(queueB, 1, "MessageB"); - } - checkMsg(queueA, 0); - checkMsg(queueB, 0); -} - -// === Test suite === - -QPID_AUTO_TEST_CASE(Commit) -{ - SET_LOG_LEVEL("error+"); // This only needs to be set once. - - cout << test_filename << ".Commit: " << flush; - swap(true); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(Abort) -{ - cout << test_filename << ".Abort: " << flush; - swap(false); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(MultiQueueCommit) -{ - cout << test_filename << ".MultiQueueCommit: " << flush; - testMultiQueueTxn(2, true, true); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(MultiQueueAbort) -{ - cout << test_filename << ".MultiQueueAbort: " << flush; - testMultiQueueTxn(2, true, false); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(MultiQueueNoQueueCommitRecover) -{ - cout << test_filename << ".MultiQueueNoQueueCommitRecover: " << flush; - testMultiQueueTxn(0, false, true); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(MultiQueueNoQueueAbortRecover) -{ - cout << test_filename << ".MultiQueueNoQueueAbortRecover: " << flush; - testMultiQueueTxn(0, false, false); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(MultiQueueSomeQueueCommitRecover) -{ - cout << test_filename << ".MultiQueueSomeQueueCommitRecover: " << flush; - testMultiQueueTxn(1, false, true); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(MultiQueueSomeQueueAbortRecover) -{ - cout << test_filename << ".MultiQueueSomeQueueAbortRecover: " << flush; - testMultiQueueTxn(1, false, false); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(MultiQueueAllQueueCommitRecover) -{ - cout << test_filename << ".MultiQueueAllQueueCommitRecover: " << flush; - testMultiQueueTxn(2, false, true); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(MultiQueueAllQueueAbortRecover) -{ - cout << test_filename << ".MultiQueueAllQueueAbortRecover: " << flush; - testMultiQueueTxn(2, false, false); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(LockedRecordTest) -{ - cout << test_filename << ".LockedRecordTest: " << flush; - - setup(); - queueA->deliver(createMessage("Message", "exchange", "routingKey")); - std::auto_ptr txn = store->begin(); - - QueueCursor cursor; - Message msg = MessageUtils::get(*queueA, &cursor); - queueA->dequeue(txn.get(), cursor); - - try { - store->dequeue(0, msg.getPersistentContext(), *queueA); - BOOST_ERROR("Did not throw JERR_MAP_LOCKED exception as expected."); - } - catch (const mrg::msgstore::StoreException& e) { - if (std::strstr(e.what(), "JERR_MAP_LOCKED") == 0) - BOOST_ERROR("Unexpected StoreException: " << e.what()); - } - catch (const std::exception& e) { - BOOST_ERROR("Unexpected exception: " << e.what()); - } - store->commit(*txn); - checkMsg(queueA, 0); - - cout << "ok" << endl; -} - -QPID_AUTO_TEST_SUITE_END() diff --git a/qpid/cpp/src/tests/legacystore/TwoPhaseCommitTest.cpp b/qpid/cpp/src/tests/legacystore/TwoPhaseCommitTest.cpp deleted file mode 100644 index 25bb9dc607..0000000000 --- a/qpid/cpp/src/tests/legacystore/TwoPhaseCommitTest.cpp +++ /dev/null @@ -1,678 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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. - * - */ - -#include "unit_test.h" -#include "MessageUtils.h" - -#include "qpid/broker/Queue.h" -#include "qpid/broker/RecoveryManagerImpl.h" -#include "qpid/broker/PersistableObject.h" -#include "qpid/framing/AMQHeaderBody.h" -#include "qpid/legacystore/MessageStoreImpl.h" -#include "qpid/legacystore/TxnCtxt.h" -#include "qpid/log/Logger.h" -#include "qpid/log/Statement.h" -#include "qpid/sys/Timer.h" - -#include - -using namespace mrg::msgstore; -using namespace qpid; -using namespace qpid::broker; -using namespace qpid::framing; -using namespace std; - - -qpid::broker::Broker::Options opts; -qpid::broker::Broker br(opts); - - -QPID_AUTO_TEST_SUITE(TwoPhaseCommitTest) - -#define SET_LOG_LEVEL(level) \ - qpid::log::Options opts(""); \ - opts.selectors.clear(); \ - opts.selectors.push_back(level); \ - qpid::log::Logger::instance().configure(opts); - - -const string test_filename("TwoPhaseCommitTest"); -const char* tdp = getenv("TMP_DATA_DIR"); -string test_dir(tdp && strlen(tdp) > 0 ? tdp : "/var/tmp/TwoPhaseCommitTest"); - -// === Helper fns === - -class TwoPhaseCommitTest -{ - - class Strategy - { - public: - virtual void init() = 0; - virtual void run(TPCTransactionContext* txn) = 0; - virtual void check(bool committed) = 0; - virtual ~Strategy(){} - }; - - class Swap : public Strategy - { - TwoPhaseCommitTest* const test; - const string messageId; - Message msg; - public: - Swap(TwoPhaseCommitTest* const test_, const string& messageId_): test(test_), messageId(messageId_) {} - void init(){ msg = test->deliver(messageId, test->queueA); } - void run(TPCTransactionContext* txn) { test->swap(txn, test->queueA, test->queueB); } - void check(bool committed) { test->swapCheck(committed, messageId, test->queueA, test->queueB); } - }; - - class Enqueue : public Strategy - { - TwoPhaseCommitTest* const test; - Message msg1; - Message msg2; - Message msg3; - public: - Enqueue(TwoPhaseCommitTest* const test_): test(test_) {} - void init() {} - void run(TPCTransactionContext* txn) { - msg1 = test->enqueue(txn, "Enqueue1", test->queueA); - msg2 = test->enqueue(txn, "Enqueue2", test->queueA); - msg3 = test->enqueue(txn, "Enqueue3", test->queueA); - } - void check(bool committed) { - if (committed) { - test->checkMsg(test->queueA, 3, "Enqueue1"); - test->checkMsg(test->queueA, 2, "Enqueue2"); - test->checkMsg(test->queueA, 1, "Enqueue3"); - } - test->checkMsg(test->queueA, 0); - } - }; - - class Dequeue : public Strategy - { - TwoPhaseCommitTest* const test; - Message msg1; - Message msg2; - Message msg3; - public: - Dequeue(TwoPhaseCommitTest* const test_): test(test_) {} - void init() { - msg1 = test->deliver("Dequeue1", test->queueA); - msg2 = test->deliver("Dequeue2", test->queueA); - msg3 = test->deliver("Dequeue3", test->queueA); - } - void run(TPCTransactionContext* txn) { - test->dequeue(txn, test->queueA); - test->dequeue(txn, test->queueA); - test->dequeue(txn, test->queueA); - } - void check(bool committed) { - if (!committed) { - test->checkMsg(test->queueA, 3, "Dequeue1"); - test->checkMsg(test->queueA, 2, "Dequeue2"); - test->checkMsg(test->queueA, 1, "Dequeue3"); - } - test->checkMsg(test->queueA, 0); - } - }; - - class MultiQueueTxn : public Strategy - { - TwoPhaseCommitTest* const test; - Message msg1; - Message msg2; - std::set queueset; - public: - MultiQueueTxn(TwoPhaseCommitTest* const test_): test(test_) {} - virtual void init() {} - virtual void run(TPCTransactionContext* txn) { - queueset.insert(test->queueA); - queueset.insert(test->queueB); - msg1 = test->enqueue(txn, "Message1", queueset); - msg2 = test->enqueue(txn, "Message2", queueset); - queueset.clear(); - } - virtual void check(bool committed) { - TestMessageStore* sptr = static_cast(test->store.get()); - if (committed) - { - test->checkMsg(test->queueA, 2, "Message1"); - test->checkMsg(test->queueB, 2, "Message1"); - test->checkMsg(test->queueA, 1, "Message2"); - test->checkMsg(test->queueB, 1, "Message2"); - } - test->checkMsg(test->queueA, 0); - test->checkMsg(test->queueB, 0); - // Check there are no remaining open txns in store - BOOST_CHECK_EQUAL(u_int32_t(0), sptr->getRemainingTxns(*(test->queueA))); - BOOST_CHECK_EQUAL(u_int32_t(0), sptr->getRemainingTxns(*(test->queueB))); - BOOST_CHECK_EQUAL(u_int32_t(0), sptr->getRemainingPreparedListTxns()); - } - }; - - // Test txn context which has special setCompleteFailure() method which prevents entire "txn complete" process from hapenning - class TestTPCTxnCtxt : public TPCTxnCtxt - { - public: - TestTPCTxnCtxt(const std::string& _xid, IdSequence* _loggedtx) : TPCTxnCtxt(_xid, _loggedtx) {} - void setCompleteFailure(const unsigned num_queues_rem, const bool complete_prepared_list) { - // Remove queue members from back of impactedQueues until queues_rem reamin. - // to end to simulate multi-queue txn complete failure. - while (impactedQueues.size() > num_queues_rem) impactedQueues.erase(impactedQueues.begin()); - // If prepared list is not to be committed, set pointer to 0 - if (!complete_prepared_list) preparedXidStorePtr = 0; - } - }; - - // Test store which has sepcial begin() which returns a TestTPCTxnCtxt, and a method to check for - // reamining open transactions - class TestMessageStore: public MessageStoreImpl - { - public: - TestMessageStore(qpid::broker::Broker* br, const char* envpath = 0) : MessageStoreImpl(br, envpath) {} - std::auto_ptr TMSbegin(const std::string& xid) { - checkInit(); - IdSequence* jtx = &messageIdSequence; - // pass sequence number for c/a - return auto_ptr(new TestTPCTxnCtxt(xid, jtx)); - } - u_int32_t getRemainingTxns(const PersistableQueue& queue) { - return static_cast(queue.getExternalQueueStore())->get_open_txn_cnt(); - } - u_int32_t getRemainingPreparedListTxns() { - return tplStorePtr->get_open_txn_cnt(); - } - }; - - const string nameA; - const string nameB; - std::auto_ptr store; - std::auto_ptr dtxmgr; - std::auto_ptr queues; - std::auto_ptr links; - Queue::shared_ptr queueA; - Queue::shared_ptr queueB; - Message msg1; - Message msg2; - Message msg4; - std::auto_ptr tx; - - void recoverPrepared(bool commit) - { - setup(); - - Swap swap(this, "RecoverPrepared"); - swap.init(); - std::auto_ptr txn(store->begin("my-xid")); - swap.run(txn.get()); - if (tx.get()) { - tx->prepare(txn.get()); - tx.reset(); - } - - store->prepare(*txn); - restart(); - - //check that the message is not available from either queue - BOOST_CHECK_EQUAL((u_int32_t) 0, queueA->getMessageCount()); - BOOST_CHECK_EQUAL((u_int32_t) 0, queueB->getMessageCount()); - - //commit/abort the txn - through the dtx manager, not directly on the store - if (commit) { - dtxmgr->commit("my-xid", false); - } else { - dtxmgr->rollback("my-xid"); - } - - swap.check(commit); - restart(); - swap.check(commit); - } - - void testMultiQueueTxn(const unsigned num_queues_rem, const bool complete_prepared_list, const bool commit) - { - setup(); - MultiQueueTxn mqtTest(this); - mqtTest.init(); - std::auto_ptr txn(static_cast(store.get())->begin("my-xid")); - mqtTest.run(txn.get()); - if (tx.get()) { - tx->prepare(txn.get()); - tx.reset(); - } - store->prepare(*txn); - - // As the commits and aborts should happen through DtxManager, and it is too complex to - // pass all these test params through, we bypass DtxManager and use the store directly. - // This will prevent the queues from seeing committed txns, however. To test the success - // or failure of - static_cast(txn.get())->setCompleteFailure(num_queues_rem, complete_prepared_list); - if (commit) - store->commit(*txn); - else - store->abort(*txn); - restart(); - mqtTest.check(commit); - } - - void commit(Strategy& strategy) - { - setup(); - strategy.init(); - - std::auto_ptr txn(store->begin("my-xid")); - strategy.run(txn.get()); - if (tx.get()) { - tx->prepare(txn.get()); - tx.reset(); - } - store->prepare(*txn); - store->commit(*txn); - restart(); - strategy.check(true); - } - - void abort(Strategy& strategy, bool prepare) - { - setup(); - strategy.init(); - - std::auto_ptr txn(store->begin("my-xid")); - strategy.run(txn.get()); - if (tx.get()) { - tx->prepare(txn.get()); - tx.reset(); - } - if (prepare) store->prepare(*txn); - store->abort(*txn); - restart(); - strategy.check(false); - } - - void swap(TPCTransactionContext* txn, Queue::shared_ptr& from, Queue::shared_ptr& to) - { - QueueCursor c; - Message msg1 = MessageUtils::get(*from, &c);//just dequeues in memory - //move the message from one queue to the other as part of a - //distributed transaction - if (!tx.get()) tx = std::auto_ptr(new TxBuffer); - to->deliver(msg1, tx.get());//note: need to enqueue it first to avoid message being deleted - from->dequeue(txn, c); - } - - void dequeue(TPCTransactionContext* txn, Queue::shared_ptr& queue) - { - QueueCursor c; - Message msg2 = MessageUtils::get(*queue, &c);//just dequeues in memory - queue->dequeue(txn, c); - } - - Message enqueue(TPCTransactionContext* /*txn*/, const string& msgid, Queue::shared_ptr& queue) - { - Message msg = createMessage(msgid); - if (!tx.get()) tx = std::auto_ptr(new TxBuffer); - queue->deliver(msg, tx.get()); - return msg; - } - - Message enqueue(TPCTransactionContext* /*txn*/, const string& msgid, std::set& queueset) - { - if (!tx.get()) tx = std::auto_ptr(new TxBuffer); - Message msg = createMessage(msgid); - for (std::set::iterator i = queueset.begin(); i != queueset.end(); i++) { - (*i)->deliver(msg, tx.get()); - } - return msg; - } - - Message deliver(const string& msgid, Queue::shared_ptr& queue) - { - Message m = createMessage(msgid); - queue->deliver(m); - return m; - } - - template - void setup() - { - store = std::auto_ptr(new T(&br)); - store->init(test_dir, 4, 1, true); // truncate store - - //create two queues: - queueA = Queue::shared_ptr(new Queue(nameA, 0, store.get(), 0)); - queueA->create(); - queueB = Queue::shared_ptr(new Queue(nameB, 0, store.get(), 0)); - queueB->create(); - } - - Message createMessage(const string& id, const string& exchange="exchange", const string& key="routing_key") - { - Message msg = MessageUtils::createMessage(exchange, key, Uuid(), true, 0, id); - return msg; - } - - template - void restart() - { - queueA.reset(); - queueB.reset(); - store.reset(); - queues.reset(); - links.reset(); - - store = std::auto_ptr(new T(&br)); - store->init(test_dir, 4, 1); - sys::Timer t; - ExchangeRegistry exchanges; - queues = std::auto_ptr(new QueueRegistry); - links = std::auto_ptr(new LinkRegistry); - dtxmgr = std::auto_ptr(new DtxManager(t)); - dtxmgr->setStore (store.get()); - RecoveredObjects ro; - RecoveryManagerImpl recovery(*queues, exchanges, *links, *dtxmgr, br.getProtocolRegistry(), ro); - store->recover(recovery); - - queueA = queues->find(nameA); - queueB = queues->find(nameB); - } - - void checkMsg(Queue::shared_ptr& queue, u_int32_t size, const string& msgid = "") - { - BOOST_REQUIRE(queue); - BOOST_CHECK_EQUAL(size, queue->getMessageCount()); - if (size > 0) { - Message msg = MessageUtils::get(*queue); - BOOST_REQUIRE(msg); - BOOST_CHECK_EQUAL(msgid, MessageUtils::getCorrelationId(msg)); - } - } - - void swapCheck(bool swapped, const string& msgid, Queue::shared_ptr& from, Queue::shared_ptr& to) - { - BOOST_REQUIRE(from); - BOOST_REQUIRE(to); - - Queue::shared_ptr x; //the queue from which the message was swapped - Queue::shared_ptr y; //the queue on which the message is expected to be - - if (swapped) { - x = from; - y = to; - } else { - x = to; - y = from; - } - - checkMsg(x, 0); - checkMsg(y, 1, msgid); - checkMsg(y, 0); - } - -public: - TwoPhaseCommitTest() : nameA("queueA"), nameB("queueB") {} - - void testCommitEnqueue() - { - Enqueue enqueue(this); - commit(enqueue); - } - - void testCommitDequeue() - { - Dequeue dequeue(this); - commit(dequeue); - } - - void testCommitSwap() - { - Swap swap(this, "SwapMessageId"); - commit(swap); - } - - void testPrepareAndAbortEnqueue() - { - Enqueue enqueue(this); - abort(enqueue, true); - } - - void testPrepareAndAbortDequeue() - { - Dequeue dequeue(this); - abort(dequeue, true); - } - - void testPrepareAndAbortSwap() - { - Swap swap(this, "SwapMessageId"); - abort(swap, true); - } - - void testAbortNoPrepareEnqueue() - { - Enqueue enqueue(this); - abort(enqueue, false); - } - - void testAbortNoPrepareDequeue() - { - Dequeue dequeue(this); - abort(dequeue, false); - } - - void testAbortNoPrepareSwap() - { - Swap swap(this, "SwapMessageId"); - abort(swap, false); - } - - void testRecoverPreparedThenCommitted() - { - recoverPrepared(true); - } - - void testRecoverPreparedThenAborted() - { - recoverPrepared(false); - } - - void testMultiQueueCommit() - { - testMultiQueueTxn(2, true, true); - } - - void testMultiQueueAbort() - { - testMultiQueueTxn(2, true, false); - } - - void testMultiQueueNoQueueCommitRecover() - { - testMultiQueueTxn(0, false, true); - } - - void testMultiQueueNoQueueAbortRecover() - { - testMultiQueueTxn(0, false, false); - } - - void testMultiQueueSomeQueueCommitRecover() - { - testMultiQueueTxn(1, false, true); - } - - void testMultiQueueSomeQueueAbortRecover() - { - testMultiQueueTxn(1, false, false); - } - - void testMultiQueueAllQueueCommitRecover() - { - testMultiQueueTxn(2, false, true); - } - - void testMultiQueueAllQueueAbortRecover() - { - testMultiQueueTxn(2, false, false); - } -}; - -TwoPhaseCommitTest tpct; - -// === Test suite === - -QPID_AUTO_TEST_CASE(CommitEnqueue) -{ - SET_LOG_LEVEL("error+"); // This only needs to be set once. - - cout << test_filename << ".CommitEnqueue: " << flush; - tpct.testCommitEnqueue(); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(CommitDequeue) -{ - cout << test_filename << ".CommitDequeue: " << flush; - tpct.testCommitDequeue(); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(CommitSwap) -{ - cout << test_filename << ".CommitSwap: " << flush; - tpct.testCommitSwap(); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(PrepareAndAbortEnqueue) -{ - cout << test_filename << ".PrepareAndAbortEnqueue: " << flush; - tpct.testPrepareAndAbortEnqueue(); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(PrepareAndAbortDequeue) -{ - cout << test_filename << ".PrepareAndAbortDequeue: " << flush; - tpct.testPrepareAndAbortDequeue(); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(PrepareAndAbortSwap) -{ - cout << test_filename << ".PrepareAndAbortSwap: " << flush; - tpct.testPrepareAndAbortSwap(); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(AbortNoPrepareEnqueue) -{ - cout << test_filename << ".AbortNoPrepareEnqueue: " << flush; - tpct.testAbortNoPrepareEnqueue(); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(AbortNoPrepareDequeue) -{ - cout << test_filename << ".AbortNoPrepareDequeue: " << flush; - tpct.testAbortNoPrepareDequeue(); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(AbortNoPrepareSwap) -{ - cout << test_filename << ".AbortNoPrepareSwap: " << flush; - tpct.testAbortNoPrepareSwap(); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(RecoverPreparedThenCommitted) -{ - cout << test_filename << ".RecoverPreparedThenCommitted: " << flush; - tpct.testRecoverPreparedThenCommitted(); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(RecoverPreparedThenAborted) -{ - cout << test_filename << ".RecoverPreparedThenAborted: " << flush; - tpct.testRecoverPreparedThenAborted(); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(MultiQueueCommit) -{ - cout << test_filename << ".MultiQueueCommit: " << flush; - tpct.testMultiQueueCommit(); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(MultiQueueAbort) -{ - cout << test_filename << ".MultiQueueAbort: " << flush; - tpct.testMultiQueueAbort(); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(MultiQueueNoQueueCommitRecover) -{ - cout << test_filename << ".MultiQueueNoQueueCommitRecover: " << flush; - tpct.testMultiQueueNoQueueCommitRecover(); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(MultiQueueNoQueueAbortRecover) -{ - cout << test_filename << ".MultiQueueNoQueueAbortRecover: " << flush; - tpct.testMultiQueueNoQueueAbortRecover(); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(MultiQueueSomeQueueCommitRecover) -{ - cout << test_filename << ".MultiQueueSomeQueueCommitRecover: " << flush; - tpct.testMultiQueueSomeQueueCommitRecover(); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(MultiQueueSomeQueueAbortRecover) -{ - cout << test_filename << ".MultiQueueSomeQueueAbortRecover: " << flush; - tpct.testMultiQueueSomeQueueAbortRecover(); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(MultiQueueAllQueueCommitRecover) -{ - cout << test_filename << ".MultiQueueAllQueueCommitRecover: " << flush; - tpct.testMultiQueueAllQueueCommitRecover(); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_CASE(MultiQueueAllQueueAbortRecover) -{ - cout << test_filename << ".MultiQueueAllQueueAbortRecover: " << flush; - tpct.testMultiQueueAllQueueAbortRecover(); - cout << "ok" << endl; -} - -QPID_AUTO_TEST_SUITE_END() -- cgit v1.2.1 From d77447d7230dd29d7dc9ee0575caf1997ec3a7a6 Mon Sep 17 00:00:00 2001 From: Keith Wall Date: Fri, 21 Mar 2014 17:16:34 +0000 Subject: QPID-5634: [Java Broker] Remove support for AccessPlugins at the level of the virtualhost. Introduce supports for ACLs rules that include virtualhost predicate. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1579986 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/server/exchange/AbstractExchange.java | 2 +- .../org/apache/qpid/server/model/VirtualHost.java | 7 - .../server/model/adapter/VirtualHostAdapter.java | 7 - .../qpid/server/security/SecurityManager.java | 366 ++++++------- .../server/security/access/ObjectProperties.java | 64 +-- .../security/access/OperationLoggingDetails.java | 36 ++ .../server/virtualhost/AbstractVirtualHost.java | 2 +- .../qpid/server/security/SecurityManagerTest.java | 571 +++++++++++++++++++++ .../AbstractDurableConfigurationStoreTestCase.java | 1 - .../access/plugins/DefaultAccessControlTest.java | 16 +- .../security/access/plugins/RuleSetTest.java | 105 +++- .../protocol/v0_10/ServerSessionDelegate.java | 2 +- .../qpid/server/protocol/v0_8/AMQChannel.java | 5 +- .../v0_8/handler/ConnectionOpenMethodHandler.java | 3 +- .../plugin/servlet/rest/MessageServlet.java | 6 +- .../server/jmx/MBeanInvocationHandlerImpl.java | 25 +- .../server/logging/AccessControlLoggingTest.java | 3 +- .../server/security/acl/AbstractACLTestCase.java | 36 +- .../server/security/acl/ExhaustiveACLTest.java | 53 +- .../server/security/acl/ExternalACLJMXTest.java | 78 ++- .../qpid/server/security/acl/ExternalACLTest.java | 214 +++++--- .../qpid/systest/rest/acl/BrokerACLTest.java | 3 +- .../qpid/systest/rest/acl/ExchangeRestACLTest.java | 3 +- .../qpid/systest/rest/acl/GroupRestACLTest.java | 12 +- .../qpid/systest/rest/acl/LogViewerACLTest.java | 3 +- .../qpid/systest/rest/acl/QueueRestACLTest.java | 3 +- .../rest/acl/UserPreferencesRestACLTest.java | 2 +- .../qpid/systest/rest/acl/UserRestACLTest.java | 9 +- 28 files changed, 1122 insertions(+), 515 deletions(-) create mode 100644 qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/SecurityManagerTest.java diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java index a30806d810..25f20ba1ee 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java @@ -612,7 +612,7 @@ public abstract class AbstractExchange> } // Check access - _virtualHost.getSecurityManager().authoriseUnbind(this, bindingKey, queue); + _virtualHost.getSecurityManager().authoriseUnbind(binding); BindingImpl b = _bindingsMap.remove(new BindingIdentifier(bindingKey,queue)); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java index 4aec9b38a0..ee10ecfc8b 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java @@ -22,7 +22,6 @@ package org.apache.qpid.server.model; import org.apache.qpid.server.configuration.updater.TaskExecutor; import org.apache.qpid.server.message.MessageInstance; -import org.apache.qpid.server.security.SecurityManager; import org.apache.qpid.server.store.MessageStore; import java.security.AccessControlException; @@ -179,12 +178,6 @@ public interface VirtualHost> extends ConfiguredObject< void executeTransaction(TransactionalOperation op); - /** - * A temporary hack to expose host security manager. - * TODO We need to add and implement an authorization provider configured object instead - */ - SecurityManager getSecurityManager(); - // TODO - remove this TaskExecutor getTaskExecutor(); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java index 72b316c784..6dbc2eea85 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java @@ -49,7 +49,6 @@ import org.apache.qpid.server.plugin.ExchangeType; import org.apache.qpid.server.protocol.AMQConnectionModel; import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.queue.ConflationQueue; -import org.apache.qpid.server.security.SecurityManager; import org.apache.qpid.server.security.access.Operation; import org.apache.qpid.server.stats.StatisticsGatherer; import org.apache.qpid.server.store.MessageStore; @@ -1125,12 +1124,6 @@ public final class VirtualHostAdapter extends AbstractConfiguredObject _plugins = new ConcurrentHashMap(); + private final boolean _managementMode; + private final Broker _broker; - private ConcurrentHashMap _globalPlugins = new ConcurrentHashMap(); - private ConcurrentHashMap _hostPlugins = new ConcurrentHashMap(); - - private boolean _managementMode; - - private Broker _broker; + private final ConcurrentHashMap _publishAccessCheckCache = new ConcurrentHashMap(); - /* - * Used by the Broker. - */ - public SecurityManager(Broker broker, boolean managementMode) + public SecurityManager(Broker broker, boolean managementMode) { _managementMode = managementMode; _broker = broker; } - /* - * Used by the VirtualHost to allow deferring to the broker level security plugins if required. - */ - public SecurityManager(SecurityManager parent, String aclFile, String vhostName) - { - _managementMode = parent._managementMode; - _broker = parent._broker; - if(!_managementMode) - { - configureVirtualHostAclPlugin(aclFile, vhostName); - - // our global plugins are the parent's host plugins - _globalPlugins = parent._hostPlugins; - } - } - public static Subject getSubjectWithAddedSystemRights() { Subject subject = Subject.getSubject(AccessController.getContext()); @@ -135,50 +108,11 @@ public class SecurityManager implements ConfigurationChangeListener return subject; } - private void configureVirtualHostAclPlugin(String aclFile, String vhostName) - { - if(aclFile != null) - { - Map attributes = new HashMap(); - - attributes.put(AccessControlProvider.TYPE, FileAccessControlProviderConstants.ACL_FILE_PROVIDER_TYPE); - attributes.put(FileAccessControlProviderConstants.PATH, aclFile); - - for (AccessControlFactory provider : (new QpidServiceLoader()).instancesOf(AccessControlFactory.class)) - { - AccessControl accessControl = provider.createInstance(attributes, _broker); - accessControl.open(); - if(accessControl != null) - { - String pluginTypeName = getPluginTypeName(accessControl); - _hostPlugins.put(pluginTypeName, accessControl); - - if(_logger.isDebugEnabled()) - { - _logger.debug("Added access control to host plugins with name: " + vhostName); - } - - break; - } - } - } - - if(_logger.isDebugEnabled()) - { - _logger.debug("Configured " + _hostPlugins.size() + " access control plugins"); - } - } - private String getPluginTypeName(AccessControl accessControl) { return accessControl.getClass().getName(); } - public static Logger getLogger() - { - return _logger; - } - public static boolean isSystemProcess() { Subject subject = Subject.getSubject(AccessController.getContext()); @@ -234,71 +168,14 @@ public class SecurityManager implements ConfigurationChangeListener return true; } - Map remainingPlugins = _globalPlugins.isEmpty() - ? Collections.emptyMap() - : _hostPlugins.isEmpty() ? _globalPlugins : new HashMap(_globalPlugins); - - if(!_hostPlugins.isEmpty()) - { - for (Entry hostEntry : _hostPlugins.entrySet()) - { - // Create set of global only plugins - AccessControl globalPlugin = remainingPlugins.get(hostEntry.getKey()); - if (globalPlugin != null) - { - remainingPlugins.remove(hostEntry.getKey()); - } - - Result host = checker.allowed(hostEntry.getValue()); - - if (host == Result.DENIED) - { - // Something vetoed the access, we're done - return false; - } - - // host allow overrides global allow, so only check global on abstain or defer - if (host != Result.ALLOWED) - { - if (globalPlugin == null) - { - if (host == Result.DEFER) - { - host = hostEntry.getValue().getDefault(); - } - if (host == Result.DENIED) - { - return false; - } - } - else - { - Result global = checker.allowed(globalPlugin); - if (global == Result.DEFER) - { - global = globalPlugin.getDefault(); - } - if (global == Result.ABSTAIN && host == Result.DEFER) - { - global = hostEntry.getValue().getDefault(); - } - if (global == Result.DENIED) - { - return false; - } - } - } - } - } - - for (AccessControl plugin : remainingPlugins.values()) + for (AccessControl plugin : _plugins.values()) { Result remaining = checker.allowed(plugin); - if (remaining == Result.DEFER) + if (remaining == Result.DEFER) { remaining = plugin.getDefault(); } - if (remaining == Result.DENIED) + if (remaining == Result.DENIED) { return false; } @@ -308,28 +185,23 @@ public class SecurityManager implements ConfigurationChangeListener return true; } - public void authoriseCreateBinding(BindingImpl binding) + public void authoriseCreateBinding(final BindingImpl binding) { - final ExchangeImpl exch = binding.getExchange(); - final AMQQueue queue = binding.getAMQQueue(); - final String bindingKey = binding.getBindingKey(); - - boolean allowed = - checkAllPlugins(new AccessCheck() + boolean allowed = checkAllPlugins(new AccessCheck() { Result allowed(AccessControl plugin) { - return plugin.authorise(BIND, EXCHANGE, new ObjectProperties(exch, queue, bindingKey)); + return plugin.authorise(BIND, EXCHANGE, new ObjectProperties(binding)); } }); if(!allowed) { - throw new AccessControlException("Permission denied: binding " + bindingKey); + throw new AccessControlException("Permission denied: binding " + binding.getBindingKey()); } } - public void authoriseMethod(final Operation operation, final String componentName, final String methodName) + public void authoriseMethod(final Operation operation, final String componentName, final String methodName, final String virtualHostName) { boolean allowed = checkAllPlugins(new AccessCheck() { @@ -339,8 +211,11 @@ public class SecurityManager implements ConfigurationChangeListener properties.setName(methodName); if (componentName != null) { - // Only set the property if there is a component name - properties.put(ObjectProperties.Property.COMPONENT, componentName); + properties.put(ObjectProperties.Property.COMPONENT, componentName); + } + if (virtualHostName != null) + { + properties.put(ObjectProperties.Property.VIRTUALHOST_NAME, virtualHostName); } return plugin.authorise(operation, METHOD, properties); } @@ -367,15 +242,19 @@ public class SecurityManager implements ConfigurationChangeListener public void authoriseCreateConnection(final AMQConnectionModel connection) { + final String virtualHostName = connection.getVirtualHostName(); if(!checkAllPlugins(new AccessCheck() { Result allowed(AccessControl plugin) { - return plugin.authorise(Operation.ACCESS, VIRTUALHOST, ObjectProperties.EMPTY); + // We put the name into the properties under both name and virtualhost_name so the user may express predicates using either. + ObjectProperties properties = new ObjectProperties(virtualHostName); + properties.put(Property.VIRTUALHOST_NAME, virtualHostName); + return plugin.authorise(Operation.ACCESS, VIRTUALHOST, properties); } })) { - throw new AccessControlException("Permission denied: " + connection.getVirtualHostName()); + throw new AccessControlException("Permission denied: " + virtualHostName); } } @@ -403,10 +282,7 @@ public class SecurityManager implements ConfigurationChangeListener { Result allowed(AccessControl plugin) { - return plugin.authorise(CREATE, EXCHANGE, new ObjectProperties(exchange.isAutoDelete(), - exchange.isDurable(), - exchangeName, - exchange.getTypeName())); + return plugin.authorise(CREATE, EXCHANGE, new ObjectProperties(exchange)); } })) { @@ -421,11 +297,7 @@ public class SecurityManager implements ConfigurationChangeListener { Result allowed(AccessControl plugin) { - return plugin.authorise(CREATE, QUEUE, new ObjectProperties(queue.getAttribute(Queue.LIFETIME_POLICY) != LifetimePolicy.PERMANENT, - Boolean.TRUE.equals(queue.getAttribute(Queue.DURABLE)), - queue.getAttribute(Queue.EXCLUSIVE) != ExclusivityPolicy.NONE, - queueName, - queue.getOwner())); + return plugin.authorise(CREATE, QUEUE, new ObjectProperties(queue)); } })) { @@ -470,7 +342,7 @@ public class SecurityManager implements ConfigurationChangeListener { Result allowed(AccessControl plugin) { - return plugin.authorise(UPDATE, EXCHANGE, new ObjectProperties(exchange.getName())); + return plugin.authorise(UPDATE, EXCHANGE, new ObjectProperties(exchange)); } })) { @@ -484,7 +356,7 @@ public class SecurityManager implements ConfigurationChangeListener { Result allowed(AccessControl plugin) { - return plugin.authorise(DELETE, EXCHANGE, new ObjectProperties(exchange.getName())); + return plugin.authorise(DELETE, EXCHANGE, new ObjectProperties(exchange)); } })) { @@ -522,39 +394,15 @@ public class SecurityManager implements ConfigurationChangeListener } } - private ConcurrentHashMap> _immediatePublishPropsCache - = new ConcurrentHashMap>(); - private ConcurrentHashMap> _publishPropsCache - = new ConcurrentHashMap>(); - - public void authorisePublish(final boolean immediate, String routingKey, String exchangeName) + public void authorisePublish(final boolean immediate, String routingKey, String exchangeName, String virtualHostName) { - if(routingKey == null) + PublishAccessCheckCacheEntry key = new PublishAccessCheckCacheEntry(immediate, routingKey, exchangeName, virtualHostName); + PublishAccessCheck check = _publishAccessCheckCache.get(key); + if (check == null) { - routingKey = ""; + check = new PublishAccessCheck(new ObjectProperties(virtualHostName, exchangeName, routingKey, immediate)); + _publishAccessCheckCache.putIfAbsent(key, check); } - if(exchangeName == null) - { - exchangeName = ""; - } - PublishAccessCheck check; - ConcurrentHashMap> cache = - immediate ? _immediatePublishPropsCache : _publishPropsCache; - - ConcurrentHashMap exchangeMap = cache.get(exchangeName); - if(exchangeMap == null) - { - cache.putIfAbsent(exchangeName, new ConcurrentHashMap()); - exchangeMap = cache.get(exchangeName); - } - - check = exchangeMap.get(routingKey); - if(check == null) - { - check = new PublishAccessCheck(new ObjectProperties(exchangeName, routingKey, immediate)); - exchangeMap.put(routingKey, check); - } - if(!checkAllPlugins(check)) { throw new AccessControlException("Permission denied, publish to: exchange-name '" + exchangeName + "'"); @@ -575,17 +423,17 @@ public class SecurityManager implements ConfigurationChangeListener } } - public void authoriseUnbind(final ExchangeImpl exch, final String routingKey, final AMQQueue queue) + public void authoriseUnbind(final BindingImpl binding) { if(! checkAllPlugins(new AccessCheck() { Result allowed(AccessControl plugin) { - return plugin.authorise(UNBIND, EXCHANGE, new ObjectProperties(exch, queue, routingKey)); + return plugin.authorise(UNBIND, EXCHANGE, new ObjectProperties(binding)); } })) { - throw new AccessControlException("Permission denied: unbinding " + routingKey); + throw new AccessControlException("Permission denied: unbinding " + binding.getBindingKey()); } } @@ -618,29 +466,29 @@ public class SecurityManager implements ConfigurationChangeListener { if(newState == State.ACTIVE) { - synchronized (_hostPlugins) + synchronized (_plugins) { AccessControl accessControl = ((AccessControlProvider)object).getAccessControl(); String pluginTypeName = getPluginTypeName(accessControl); - _hostPlugins.put(pluginTypeName, accessControl); + _plugins.put(pluginTypeName, accessControl); } } else if(newState == State.DELETED) { - synchronized (_hostPlugins) + synchronized (_plugins) { AccessControl control = ((AccessControlProvider)object).getAccessControl(); String pluginTypeName = getPluginTypeName(control); // Remove the type->control mapping for this type key only if the // given control is actually referred to. - if(_hostPlugins.containsValue(control)) + if(_plugins.containsValue(control)) { // If we are removing this control, check if another of the same // type already exists on the broker and use it in instead. AccessControl other = null; - Collection providers = _broker.getAccessControlProviders(); + Collection> providers = _broker.getAccessControlProviders(); for(AccessControlProvider p : providers) { if(p == object || p.getState() != State.ACTIVE) @@ -660,12 +508,12 @@ public class SecurityManager implements ConfigurationChangeListener if(other != null) { //Another control of this type was found, use it instead - _hostPlugins.replace(pluginTypeName, control, other); + _plugins.replace(pluginTypeName, control, other); } else { //No other was found, remove the type entirely - _hostPlugins.remove(pluginTypeName); + _plugins.remove(pluginTypeName); } } } @@ -718,4 +566,90 @@ public class SecurityManager implements ConfigurationChangeListener }); } + public static class PublishAccessCheckCacheEntry + { + private final boolean _immediate; + private final String _routingKey; + private final String _exchangeName; + private final String _virtualHostName; + + public PublishAccessCheckCacheEntry(boolean immediate, String routingKey, String exchangeName, String virtualHostName) + { + super(); + _immediate = immediate; + _routingKey = routingKey; + _exchangeName = exchangeName; + _virtualHostName = virtualHostName; + } + + @Override + public int hashCode() + { + final int prime = 31; + int result = 1; + result = prime * result + ((_exchangeName == null) ? 0 : _exchangeName.hashCode()); + result = prime * result + (_immediate ? 1231 : 1237); + result = prime * result + ((_routingKey == null) ? 0 : _routingKey.hashCode()); + result = prime * result + ((_virtualHostName == null) ? 0 : _virtualHostName.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) + { + if (this == obj) + { + return true; + } + if (obj == null) + { + return false; + } + if (getClass() != obj.getClass()) + { + return false; + } + PublishAccessCheckCacheEntry other = (PublishAccessCheckCacheEntry) obj; + if (_exchangeName == null) + { + if (other._exchangeName != null) + { + return false; + } + } + else if (!_exchangeName.equals(other._exchangeName)) + { + return false; + } + if (_immediate != other._immediate) + { + return false; + } + if (_routingKey == null) + { + if (other._routingKey != null) + { + return false; + } + } + else if (!_routingKey.equals(other._routingKey)) + { + return false; + } + if (_virtualHostName == null) + { + if (other._virtualHostName != null) + { + return false; + } + } + else if (!_virtualHostName.equals(other._virtualHostName)) + { + return false; + } + return true; + } + + + } } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java index ae0241314f..6122cef5c1 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java @@ -26,8 +26,10 @@ import java.util.Map; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.qpid.server.binding.BindingImpl; import org.apache.qpid.server.exchange.ExchangeImpl; import org.apache.qpid.server.model.LifetimePolicy; +import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.queue.AMQQueue; /** @@ -39,7 +41,7 @@ import org.apache.qpid.server.queue.AMQQueue; */ public class ObjectProperties { - public static final String STAR= "*"; + public static final String WILD_CARD = "*"; public static final ObjectProperties EMPTY = new ObjectProperties(); @@ -65,7 +67,8 @@ public class ObjectProperties PACKAGE, CLASS, FROM_NETWORK, - FROM_HOSTNAME; + FROM_HOSTNAME, + VIRTUALHOST_NAME; private static final Map _canonicalNameToPropertyMap = new HashMap(); @@ -152,60 +155,49 @@ public class ObjectProperties { put(Property.OWNER, queue.getOwner()); } - + put(Property.VIRTUALHOST_NAME, queue.getParent(VirtualHost.class).getName()); } - public ObjectProperties(ExchangeImpl exch, AMQQueue queue, String routingKey) + public ObjectProperties(BindingImpl binding) { - this(queue); + ExchangeImpl exch = binding.getExchange(); + AMQQueue queue = binding.getAMQQueue(); + String routingKey = binding.getBindingKey(); setName(exch.getName()); - put(Property.QUEUE_NAME, queue.getName()); + put(Property.QUEUE_NAME, queue.getName()); put(Property.ROUTING_KEY, routingKey); - } - - public ObjectProperties(String exchangeName, String routingKey, Boolean immediate) - { - this(exchangeName, routingKey); + put(Property.VIRTUALHOST_NAME, queue.getParent(VirtualHost.class).getName()); - put(Property.IMMEDIATE, immediate); + // The temporary attribute (inherited from the binding's queue) seems to exist to allow the user to + // express rules about the binding of temporary queues (whose names cannot be predicted). + put(Property.TEMPORARY, queue.getLifetimePolicy() != LifetimePolicy.PERMANENT); + put(Property.DURABLE, queue.isDurable()); } - public ObjectProperties(String exchangeName, String routingKey) + public ObjectProperties(String virtualHostName, String exchangeName, String routingKey, Boolean immediate) { super(); setName(exchangeName); put(Property.ROUTING_KEY, routingKey); + put(Property.IMMEDIATE, immediate); + put(Property.VIRTUALHOST_NAME, virtualHostName); } - public ObjectProperties(Boolean autoDelete, Boolean durable, String exchangeName, - String exchangeType) - { - super(); - - setName(exchangeName); - - put(Property.AUTO_DELETE, autoDelete); - put(Property.TEMPORARY, autoDelete); - put(Property.DURABLE, durable); - put(Property.TYPE, exchangeType); - } - - public ObjectProperties(Boolean autoDelete, Boolean durable, Boolean exclusive, - String queueName, String owner) + public ObjectProperties(ExchangeImpl exchange) { super(); - setName(queueName); + setName(exchange.getName()); - put(Property.AUTO_DELETE, autoDelete); - put(Property.TEMPORARY, autoDelete); - put(Property.DURABLE, durable); - put(Property.EXCLUSIVE, exclusive); - put(Property.OWNER, owner); + put(Property.AUTO_DELETE, exchange.isAutoDelete()); + put(Property.TEMPORARY, exchange.getLifetimePolicy() != LifetimePolicy.PERMANENT); + put(Property.DURABLE, exchange.isDurable()); + put(Property.TYPE, exchange.getTypeName()); + put(Property.VIRTUALHOST_NAME, exchange.getParent(VirtualHost.class).getName()); } public ObjectProperties(Boolean exclusive, Boolean noAck, Boolean noLocal, Boolean nowait, AMQQueue queue) @@ -283,8 +275,8 @@ public class ObjectProperties { return (StringUtils.isEmpty(ruleValue) || StringUtils.equals(thisValue, ruleValue)) - || ruleValue.equals(STAR) - || (ruleValue.endsWith(STAR) + || ruleValue.equals(WILD_CARD) + || (ruleValue.endsWith(WILD_CARD) && thisValue != null && thisValue.length() >= ruleValue.length() - 1 && thisValue.startsWith(ruleValue.substring(0, ruleValue.length() - 1))); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/access/OperationLoggingDetails.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/access/OperationLoggingDetails.java index a683199abc..f36695cb86 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/access/OperationLoggingDetails.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/access/OperationLoggingDetails.java @@ -31,6 +31,42 @@ public class OperationLoggingDetails extends ObjectProperties _description = description; } + @Override + public int hashCode() + { + return super.hashCode() + ((_description == null) ? 0 : _description.hashCode()); + } + + @Override + public boolean equals(Object obj) + { + if (this == obj) + { + return true; + } + if (!super.equals(obj)) + { + return false; + } + if (getClass() != obj.getClass()) + { + return false; + } + OperationLoggingDetails other = (OperationLoggingDetails) obj; + if (_description == null) + { + if (other._description != null) + { + return false; + } + } + else if (!_description.equals(other._description)) + { + return false; + } + return true; + } + @Override public String toString() { diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java index a4719f6058..2f1939be39 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java @@ -156,7 +156,7 @@ public abstract class AbstractVirtualHost implements VirtualHost, IConnectionReg _eventLogger.message(VirtualHostMessages.CREATED(_name)); - _securityManager = new SecurityManager(parentSecurityManager, _vhostConfig.getConfig().getString("security.acl"), _name); + _securityManager = parentSecurityManager; _connectionRegistry = new ConnectionRegistry(); _connectionRegistry.addRegistryChangeListener(this); diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/SecurityManagerTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/SecurityManagerTest.java new file mode 100644 index 0000000000..e27981d22c --- /dev/null +++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/SecurityManagerTest.java @@ -0,0 +1,571 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +package org.apache.qpid.server.security; + +import static org.apache.qpid.server.security.access.ObjectType.BROKER; +import static org.apache.qpid.server.security.access.ObjectType.EXCHANGE; +import static org.apache.qpid.server.security.access.Operation.ACCESS_LOGS; +import static org.apache.qpid.server.security.access.Operation.PUBLISH; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.security.AccessControlException; + +import org.apache.qpid.server.binding.BindingImpl; +import org.apache.qpid.server.consumer.ConsumerImpl; +import org.apache.qpid.server.exchange.ExchangeImpl; +import org.apache.qpid.server.model.AccessControlProvider; +import org.apache.qpid.server.model.Broker; +import org.apache.qpid.server.model.LifetimePolicy; +import org.apache.qpid.server.model.State; +import org.apache.qpid.server.model.VirtualHost; +import org.apache.qpid.server.protocol.AMQConnectionModel; +import org.apache.qpid.server.queue.AMQQueue; +import org.apache.qpid.server.security.access.ObjectProperties; +import org.apache.qpid.server.security.access.ObjectProperties.Property; +import org.apache.qpid.server.security.access.ObjectType; +import org.apache.qpid.server.security.access.Operation; +import org.apache.qpid.server.security.access.OperationLoggingDetails; +import org.apache.qpid.test.utils.QpidTestCase; + +public class SecurityManagerTest extends QpidTestCase +{ + private static final String TEST_EXCHANGE_TYPE = "testExchangeType"; + private static final String TEST_VIRTUAL_HOST = "testVirtualHost"; + private static final String TEST_EXCHANGE = "testExchange"; + private static final String TEST_QUEUE = "testQueue"; + + private AccessControl _accessControl; + private SecurityManager _securityManager; + private VirtualHost _virtualHost; + + @Override + public void setUp() throws Exception + { + super.setUp(); + _accessControl = mock(AccessControl.class); + _virtualHost = mock(VirtualHost.class); + + AccessControlProvider aclProvider = mock(AccessControlProvider.class); + when(aclProvider.getAccessControl()).thenReturn(_accessControl); + + when(_virtualHost.getName()).thenReturn(TEST_VIRTUAL_HOST); + + _securityManager = new SecurityManager(mock(Broker.class), false); + _securityManager.stateChanged(aclProvider, State.INITIALISING, State.ACTIVE); + } + + public void testAuthoriseCreateBinding() + { + ExchangeImpl exchange = mock(ExchangeImpl.class); + when(exchange.getParent(VirtualHost.class)).thenReturn(_virtualHost); + when(exchange.getName()).thenReturn(TEST_EXCHANGE); + + AMQQueue queue = mock(AMQQueue.class); + when(queue.getParent(VirtualHost.class)).thenReturn(_virtualHost); + when(queue.getName()).thenReturn(TEST_QUEUE); + when(queue.isDurable()).thenReturn(true); + when(queue.getLifetimePolicy()).thenReturn(LifetimePolicy.PERMANENT); + + BindingImpl binding = mock(BindingImpl.class); + when(binding.getExchange()).thenReturn(exchange); + when(binding.getAMQQueue()).thenReturn(queue); + when(binding.getBindingKey()).thenReturn("bindingKey"); + + ObjectProperties properties = new ObjectProperties(); + properties.put(Property.NAME, TEST_EXCHANGE); + properties.put(Property.VIRTUALHOST_NAME, TEST_VIRTUAL_HOST); + properties.put(Property.QUEUE_NAME, TEST_QUEUE); + properties.put(Property.ROUTING_KEY, "bindingKey"); + properties.put(Property.TEMPORARY, false); + properties.put(Property.DURABLE, true); + + + configureAccessPlugin(Result.ALLOWED); + _securityManager.authoriseCreateBinding(binding); + verify(_accessControl).authorise(eq(Operation.BIND), eq(ObjectType.EXCHANGE), eq(properties)); + + configureAccessPlugin(Result.DENIED); + try + { + _securityManager.authoriseCreateBinding(binding); + fail("AccessControlException is expected"); + } + catch(AccessControlException e) + { + // pass + } + verify(_accessControl, times(2)).authorise(eq(Operation.BIND), eq(ObjectType.EXCHANGE), eq(properties)); + } + + + public void testAuthoriseMethod() + { + ObjectProperties properties = new ObjectProperties("testMethod"); + properties.put(ObjectProperties.Property.COMPONENT, "testComponent"); + properties.put(ObjectProperties.Property.VIRTUALHOST_NAME, TEST_VIRTUAL_HOST); + + configureAccessPlugin(Result.ALLOWED); + _securityManager.authoriseMethod(Operation.UPDATE, "testComponent", "testMethod", TEST_VIRTUAL_HOST); + verify(_accessControl).authorise(eq(Operation.UPDATE), eq(ObjectType.METHOD), eq(properties)); + + configureAccessPlugin(Result.DENIED); + try + { + _securityManager.authoriseMethod(Operation.UPDATE, "testComponent", "testMethod", TEST_VIRTUAL_HOST); + fail("AccessControlException is expected"); + } + catch(AccessControlException e) + { + // pass + } + verify(_accessControl, times(2)).authorise(eq(Operation.UPDATE), eq(ObjectType.METHOD), eq(properties)); + } + + public void testAccessManagement() + { + configureAccessPlugin(Result.ALLOWED); + _securityManager.accessManagement(); + verify(_accessControl).authorise(Operation.ACCESS, ObjectType.MANAGEMENT, ObjectProperties.EMPTY); + + configureAccessPlugin(Result.DENIED); + try + { + _securityManager.accessManagement(); + fail("AccessControlException is expected"); + } + catch(AccessControlException e) + { + // pass + } + verify(_accessControl, times(2)).authorise(Operation.ACCESS, ObjectType.MANAGEMENT, ObjectProperties.EMPTY); + } + + public void testAuthoriseCreateConnection() + { + AMQConnectionModel connection = mock(AMQConnectionModel.class); + when(connection.getVirtualHostName()).thenReturn(TEST_VIRTUAL_HOST); + + ObjectProperties properties = new ObjectProperties(); + properties.put(Property.NAME, TEST_VIRTUAL_HOST); + properties.put(Property.VIRTUALHOST_NAME, TEST_VIRTUAL_HOST); + + configureAccessPlugin(Result.ALLOWED); + _securityManager.authoriseCreateConnection(connection); + verify(_accessControl).authorise(eq(Operation.ACCESS), eq(ObjectType.VIRTUALHOST), eq(properties)); + + configureAccessPlugin(Result.DENIED); + try + { + _securityManager.authoriseCreateConnection(connection); + fail("AccessControlException is expected"); + } + catch(AccessControlException e) + { + // pass + } + verify(_accessControl, times(2)).authorise(eq(Operation.ACCESS), eq(ObjectType.VIRTUALHOST), eq(properties)); + } + + public void testAuthoriseCreateConsumer() + { + AMQQueue queue = mock(AMQQueue.class); + when(queue.getParent(VirtualHost.class)).thenReturn(_virtualHost); + when(queue.getName()).thenReturn(TEST_QUEUE); + when(queue.isDurable()).thenReturn(true); + when(queue.getLifetimePolicy()).thenReturn(LifetimePolicy.PERMANENT); + + ConsumerImpl consumer = mock(ConsumerImpl.class); + when(consumer.getMessageSource()).thenReturn(queue); + + ObjectProperties properties = new ObjectProperties(); + properties.put(Property.NAME, TEST_QUEUE); + properties.put(Property.VIRTUALHOST_NAME, TEST_VIRTUAL_HOST); + properties.put(Property.AUTO_DELETE, false); + properties.put(Property.TEMPORARY, false); + properties.put(Property.DURABLE, true); + properties.put(Property.EXCLUSIVE, false); + + configureAccessPlugin(Result.ALLOWED); + _securityManager.authoriseCreateConsumer(consumer); + verify(_accessControl).authorise(eq(Operation.CONSUME), eq(ObjectType.QUEUE), eq(properties)); + + configureAccessPlugin(Result.DENIED); + try + { + _securityManager.authoriseCreateConsumer(consumer); + fail("AccessControlException is expected"); + } + catch(AccessControlException e) + { + // pass + } + verify(_accessControl, times(2)).authorise(eq(Operation.CONSUME), eq(ObjectType.QUEUE), eq(properties)); + } + + public void testAuthoriseCreateExchange() + { + ExchangeImpl exchange = mock(ExchangeImpl.class); + when(exchange.getParent(VirtualHost.class)).thenReturn(_virtualHost); + when(exchange.getName()).thenReturn(TEST_EXCHANGE); + when(exchange.getTypeName()).thenReturn(TEST_EXCHANGE_TYPE); + + ObjectProperties properties = createExpectedExchangeObjectProperties(); + + configureAccessPlugin(Result.ALLOWED); + _securityManager.authoriseCreateExchange(exchange); + verify(_accessControl).authorise(eq(Operation.CREATE), eq(ObjectType.EXCHANGE), eq(properties)); + + configureAccessPlugin(Result.DENIED); + try + { + _securityManager.authoriseCreateExchange(exchange); + fail("AccessControlException is expected"); + } + catch(AccessControlException e) + { + // pass + } + verify(_accessControl, times(2)).authorise(eq(Operation.CREATE), eq(ObjectType.EXCHANGE), eq(properties)); + } + + public void testAuthoriseCreateQueue() + { + AMQQueue queue = mock(AMQQueue.class); + when(queue.getParent(VirtualHost.class)).thenReturn(_virtualHost); + when(queue.getName()).thenReturn(TEST_QUEUE); + + ObjectProperties properties = createExpectedQueueObjectProperties(); + + configureAccessPlugin(Result.ALLOWED); + _securityManager.authoriseCreateQueue(queue); + verify(_accessControl).authorise(eq(Operation.CREATE), eq(ObjectType.QUEUE), eq(properties)); + + configureAccessPlugin(Result.DENIED); + try + { + _securityManager.authoriseCreateQueue(queue); + fail("AccessControlException is expected"); + } + catch(AccessControlException e) + { + // pass + } + verify(_accessControl, times(2)).authorise(eq(Operation.CREATE), eq(ObjectType.QUEUE), eq(properties)); + } + + public void testAuthoriseDeleteQueue() + { + AMQQueue queue = mock(AMQQueue.class); + when(queue.getParent(VirtualHost.class)).thenReturn(_virtualHost); + when(queue.getName()).thenReturn(TEST_QUEUE); + + ObjectProperties properties = createExpectedQueueObjectProperties(); + + configureAccessPlugin(Result.ALLOWED); + _securityManager.authoriseDelete(queue); + verify(_accessControl).authorise(eq(Operation.DELETE), eq(ObjectType.QUEUE), eq(properties)); + + configureAccessPlugin(Result.DENIED); + try + { + _securityManager.authoriseDelete(queue); + fail("AccessControlException is expected"); + } + catch(AccessControlException e) + { + // pass + } + verify(_accessControl, times(2)).authorise(eq(Operation.DELETE), eq(ObjectType.QUEUE), eq(properties)); + } + + public void testAuthoriseUpdateQueue() + { + AMQQueue queue = mock(AMQQueue.class); + when(queue.getParent(VirtualHost.class)).thenReturn(_virtualHost); + when(queue.getName()).thenReturn(TEST_QUEUE); + + ObjectProperties properties = createExpectedQueueObjectProperties(); + + configureAccessPlugin(Result.ALLOWED); + _securityManager.authoriseUpdate(queue); + verify(_accessControl).authorise(eq(Operation.UPDATE), eq(ObjectType.QUEUE), eq(properties)); + + configureAccessPlugin(Result.DENIED); + try + { + _securityManager.authoriseUpdate(queue); + fail("AccessControlException is expected"); + } + catch(AccessControlException e) + { + // pass + } + verify(_accessControl, times(2)).authorise(eq(Operation.UPDATE), eq(ObjectType.QUEUE), eq(properties)); + } + + public void testAuthoriseUpdateExchange() + { + ExchangeImpl exchange = mock(ExchangeImpl.class); + when(exchange.getParent(VirtualHost.class)).thenReturn(_virtualHost); + when(exchange.getName()).thenReturn(TEST_EXCHANGE); + when(exchange.getTypeName()).thenReturn(TEST_EXCHANGE_TYPE); + + ObjectProperties properties = createExpectedExchangeObjectProperties(); + + configureAccessPlugin(Result.ALLOWED); + _securityManager.authoriseUpdate(exchange); + verify(_accessControl).authorise(eq(Operation.UPDATE), eq(ObjectType.EXCHANGE), eq(properties)); + + configureAccessPlugin(Result.DENIED); + try + { + _securityManager.authoriseUpdate(exchange); + fail("AccessControlException is expected"); + } + catch(AccessControlException e) + { + // pass + } + verify(_accessControl, times(2)).authorise(eq(Operation.UPDATE), eq(ObjectType.EXCHANGE), eq(properties)); + } + + public void testAuthoriseDeleteExchange() + { + ExchangeImpl exchange = mock(ExchangeImpl.class); + when(exchange.getParent(VirtualHost.class)).thenReturn(_virtualHost); + when(exchange.getName()).thenReturn(TEST_EXCHANGE); + when(exchange.getTypeName()).thenReturn(TEST_EXCHANGE_TYPE); + + ObjectProperties properties = createExpectedExchangeObjectProperties(); + + configureAccessPlugin(Result.ALLOWED); + _securityManager.authoriseDelete(exchange); + verify(_accessControl).authorise(eq(Operation.DELETE), eq(ObjectType.EXCHANGE), eq(properties)); + + configureAccessPlugin(Result.DENIED); + try + { + _securityManager.authoriseDelete(exchange); + fail("AccessControlException is expected"); + } + catch(AccessControlException e) + { + // pass + } + verify(_accessControl, times(2)).authorise(eq(Operation.DELETE), eq(ObjectType.EXCHANGE), eq(properties)); + } + + public void testAuthoriseGroupOperation() + { + ObjectProperties properties = new ObjectProperties("testGroup"); + + configureAccessPlugin(Result.ALLOWED); + _securityManager.authoriseGroupOperation(Operation.CREATE, "testGroup"); + verify(_accessControl).authorise(eq(Operation.CREATE), eq(ObjectType.GROUP), eq(properties)); + + configureAccessPlugin(Result.DENIED); + try + { + _securityManager.authoriseGroupOperation(Operation.CREATE, "testGroup"); + fail("AccessControlException is expected"); + } + catch(AccessControlException e) + { + // pass + } + verify(_accessControl, times(2)).authorise(eq(Operation.CREATE), eq(ObjectType.GROUP), eq(properties)); + } + + public void testAuthoriseUserOperation() + { + ObjectProperties properties = new ObjectProperties("testUser"); + + configureAccessPlugin(Result.ALLOWED); + _securityManager.authoriseUserOperation(Operation.CREATE, "testUser"); + verify(_accessControl).authorise(eq(Operation.CREATE), eq(ObjectType.USER), eq(properties)); + + configureAccessPlugin(Result.DENIED); + try + { + _securityManager.authoriseUserOperation(Operation.CREATE, "testUser"); + fail("AccessControlException is expected"); + } + catch(AccessControlException e) + { + // pass + } + verify(_accessControl, times(2)).authorise(eq(Operation.CREATE), eq(ObjectType.USER), eq(properties)); + } + + public void testAuthorisePublish() + { + String routingKey = "routingKey"; + String exchangeName = "exchangeName"; + boolean immediate = true; + ObjectProperties properties = new ObjectProperties(TEST_VIRTUAL_HOST, exchangeName, routingKey, immediate); + + configureAccessPlugin(Result.ALLOWED); + _securityManager.authorisePublish(immediate, routingKey, exchangeName, TEST_VIRTUAL_HOST); + verify(_accessControl).authorise(eq(Operation.PUBLISH), eq(ObjectType.EXCHANGE), eq(properties)); + + configureAccessPlugin(Result.DENIED); + try + { + _securityManager.authorisePublish(immediate, routingKey, exchangeName, TEST_VIRTUAL_HOST); + fail("AccessControlException is expected"); + } + catch(AccessControlException e) + { + // pass + } + verify(_accessControl, times(2)).authorise(eq(Operation.PUBLISH), eq(ObjectType.EXCHANGE), eq(properties)); + } + + public void testAuthorisePurge() + { + AMQQueue queue = mock(AMQQueue.class); + when(queue.getParent(VirtualHost.class)).thenReturn(_virtualHost); + when(queue.getName()).thenReturn(TEST_QUEUE); + + ObjectProperties properties = createExpectedQueueObjectProperties(); + + configureAccessPlugin(Result.ALLOWED); + _securityManager.authorisePurge(queue); + verify(_accessControl).authorise(eq(Operation.PURGE), eq(ObjectType.QUEUE), eq(properties)); + + configureAccessPlugin(Result.DENIED); + try + { + _securityManager.authorisePurge(queue); + fail("AccessControlException is expected"); + } + catch(AccessControlException e) + { + // pass + } + verify(_accessControl, times(2)).authorise(eq(Operation.PURGE), eq(ObjectType.QUEUE), eq(properties)); + } + + + public void testAuthoriseUnbind() + { + ExchangeImpl exchange = mock(ExchangeImpl.class); + when(exchange.getParent(VirtualHost.class)).thenReturn(_virtualHost); + when(exchange.getName()).thenReturn(TEST_EXCHANGE); + + AMQQueue queue = mock(AMQQueue.class); + when(queue.getParent(VirtualHost.class)).thenReturn(_virtualHost); + when(queue.getName()).thenReturn(TEST_QUEUE); + when(queue.isDurable()).thenReturn(true); + when(queue.getLifetimePolicy()).thenReturn(LifetimePolicy.PERMANENT); + + BindingImpl binding = mock(BindingImpl.class); + when(binding.getExchange()).thenReturn(exchange); + when(binding.getAMQQueue()).thenReturn(queue); + when(binding.getBindingKey()).thenReturn("bindingKey"); + + ObjectProperties properties = new ObjectProperties(); + properties.put(Property.NAME, TEST_EXCHANGE); + properties.put(Property.VIRTUALHOST_NAME, TEST_VIRTUAL_HOST); + properties.put(Property.QUEUE_NAME, TEST_QUEUE); + properties.put(Property.ROUTING_KEY, "bindingKey"); + properties.put(Property.TEMPORARY, false); + properties.put(Property.DURABLE, true); + + + configureAccessPlugin(Result.ALLOWED); + _securityManager.authoriseUnbind(binding); + verify(_accessControl).authorise(eq(Operation.UNBIND), eq(ObjectType.EXCHANGE), eq(properties)); + + configureAccessPlugin(Result.DENIED); + try + { + _securityManager.authoriseUnbind(binding); + fail("AccessControlException is expected"); + } + catch(AccessControlException e) + { + // pass + } + verify(_accessControl, times(2)).authorise(eq(Operation.UNBIND), eq(ObjectType.EXCHANGE), eq(properties)); + } + + public void testAuthoriseConfiguringBroker() + { + OperationLoggingDetails properties = new OperationLoggingDetails("create virtualhost 'test'"); + + configureAccessPlugin(Result.ALLOWED); + assertTrue(_securityManager.authoriseConfiguringBroker("test", VirtualHost.class, Operation.CREATE)); + verify(_accessControl).authorise(eq(Operation.CONFIGURE), eq(ObjectType.BROKER), eq(properties)); + + configureAccessPlugin(Result.DENIED); + assertFalse(_securityManager.authoriseConfiguringBroker("test", VirtualHost.class, Operation.CREATE)); + verify(_accessControl, times(2)).authorise(eq(Operation.CONFIGURE), eq(ObjectType.BROKER), eq(properties)); + } + + public void testAuthoriseLogsAccess() + { + configureAccessPlugin(Result.ALLOWED); + assertTrue(_securityManager.authoriseLogsAccess()); + verify(_accessControl).authorise(ACCESS_LOGS, BROKER, ObjectProperties.EMPTY); + + configureAccessPlugin(Result.DENIED); + assertFalse(_securityManager.authoriseLogsAccess()); + verify(_accessControl, times(2)).authorise(ACCESS_LOGS, BROKER, ObjectProperties.EMPTY); + } + + private void configureAccessPlugin(Result result) + { + when(_accessControl.authorise(any(Operation.class), any(ObjectType.class), any(ObjectProperties.class))).thenReturn(result); + } + + private ObjectProperties createExpectedExchangeObjectProperties() + { + ObjectProperties properties = new ObjectProperties(); + properties.put(Property.NAME, TEST_EXCHANGE); + properties.put(Property.VIRTUALHOST_NAME, TEST_VIRTUAL_HOST); + properties.put(Property.AUTO_DELETE, false); + properties.put(Property.TEMPORARY, true); + properties.put(Property.DURABLE, false); + properties.put(Property.TYPE, TEST_EXCHANGE_TYPE); + return properties; + } + + private ObjectProperties createExpectedQueueObjectProperties() + { + ObjectProperties properties = new ObjectProperties(); + properties.put(Property.NAME, TEST_QUEUE); + properties.put(Property.VIRTUALHOST_NAME, TEST_VIRTUAL_HOST); + properties.put(Property.AUTO_DELETE, true); + properties.put(Property.TEMPORARY, true); + properties.put(Property.DURABLE, false); + properties.put(Property.EXCLUSIVE, false); + return properties; + } + + + +} diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java index 650b22ff51..04c2f974c9 100644 --- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java +++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java @@ -108,7 +108,6 @@ public abstract class AbstractDurableConfigurationStoreTestCase extends QpidTest _queueEntryRecoveryHandler = mock(TransactionLogRecoveryHandler.QueueEntryRecoveryHandler.class); _dtxRecordRecoveryHandler = mock(TransactionLogRecoveryHandler.DtxRecordRecoveryHandler.class); _virtualHost = mock(VirtualHost.class); - when(_virtualHost.getSecurityManager()).thenReturn(mock(org.apache.qpid.server.security.SecurityManager.class)); when(_messageStoreRecoveryHandler.begin()).thenReturn(_storedMessageRecoveryHandler); when(_logRecoveryHandler.begin(any(MessageStore.class))).thenReturn(_queueEntryRecoveryHandler); diff --git a/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlTest.java b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlTest.java index 74ea7639ff..72dadb736f 100644 --- a/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlTest.java +++ b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlTest.java @@ -20,7 +20,9 @@ */ package org.apache.qpid.server.security.access.plugins; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -182,7 +184,7 @@ public class DefaultAccessControlTest extends TestCase final RuleSet rs = new RuleSet(mock(EventLoggerProvider.class)); // grant user4 access right on any method in any component - rs.grant(1, "user4", Permission.ALLOW, Operation.ACCESS, ObjectType.METHOD, new ObjectProperties(ObjectProperties.STAR)); + rs.grant(1, "user4", Permission.ALLOW, Operation.ACCESS, ObjectType.METHOD, new ObjectProperties(ObjectProperties.WILD_CARD)); configureAccessControl(rs); Subject.doAs(TestPrincipalUtils.createTestSubject("user4"), new PrivilegedAction